Fix support for existing plugin secret (#3409) (#3467)

* fix support for custom plugin secret



* fix spacing



* simplify logic



* remove extra end block



---------

Signed-off-by: Sean Pomeroy <[email protected]>
Co-authored-by: Sean Pomeroy <[email protected]>
Co-authored-by: Thomas Nguyen <[email protected]>

Author: 3 people

cost-analyzer/templates/aggregator-cloud-cost-deployment.yaml

@@ -101,12 +101,22 @@ spec:
         {{- end }}
         - name: plugins-dir
           emptyDir: {}
+        {{- if and (not .Values.kubecostModel.plugins.existingCustomSecret.enabled) .Values.kubecostModel.plugins.secretName }}
         - name: plugins-config
           secret:
-            secretName: {{ .Values.kubecostModel.plugins.configSecret }}
+            secretName: {{ .Values.kubecostModel.plugins.secretName }}
             items:
               - key: datadog_config.json
                 path: datadog_config.json
+        {{- end }}
+        {{- if .Values.kubecostModel.plugins.existingCustomSecret.enabled }}
+        - name: plugins-config
+          secret:
+            secretName: {{ .Values.kubecostModel.plugins.existingCustomSecret.name }}
+            items:
+              - key: datadog_config.json
+                path: datadog_config.json
+        {{- end }}
         - name: tmp
           emptyDir: {}
         {{- end }}

cost-analyzer/templates/cost-analyzer-deployment-template.yaml

@@ -74,12 +74,22 @@ spec:
         {{- if .Values.kubecostModel.plugins.enabled }}
         - name: plugins-dir
           emptyDir: {}
+        {{- if and (not .Values.kubecostModel.plugins.existingCustomSecret.enabled) .Values.kubecostModel.plugins.secretName }}
         - name: plugins-config
           secret:
-            secretName: {{ .Values.kubecostModel.plugins.configSecret }}
+            secretName: {{ .Values.kubecostModel.plugins.secretName }}
             items:
               - key: datadog_config.json
                 path: datadog_config.json
+        {{- end }}        
+        {{- if .Values.kubecostModel.plugins.existingCustomSecret.enabled }}
+        - name: plugins-config
+          secret:
+            secretName: {{ .Values.kubecostModel.plugins.existingCustomSecret.name }}
+            items:
+              - key: datadog_config.json
+                path: datadog_config.json
+        {{- end }}
         {{- if .Values.kubecostModel.plugins.install.enabled}}
         - name: install-script
           configMap:

cost-analyzer/templates/plugins-config.yaml

@@ -1,8 +1,8 @@
-{{- if .Values.kubecostModel.plugins.enabled }}
+{{- if and (not .Values.kubecostModel.plugins.existingCustomSecret.enabled) .Values.kubecostModel.plugins.enabled }}
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ .Values.kubecostModel.plugins.configSecret }}
+  name: {{ .Values.kubecostModel.plugins.secretName }}
   labels:
      {{ include "cost-analyzer.commonLabels" . | nindent 4 }}
 data:
@@ -11,4 +11,3 @@ data:
     {{ $config | b64enc | indent 4}}
   {{- end }}
 {{- end }}
-

cost-analyzer/values.yaml

@@ -611,7 +611,11 @@ kubecostModel:
       # - datadog
 
     # pre-existing secret for plugin configuration
-    configSecret: kubecost-plugin-secret
+    existingCustomSecret:
+      enabled: false
+      name: ""  # name of the secret containing plugin config
+
+    secretName: kubecost-plugin-secret
 
     # uncomment this to define plugin configuration via the values file
     # configs: