add-additional-values (#40)

add existing argocd secret
include disablePlaintext value
fix secret.yaml template conditions

charts/chart/Chart.yaml

@@ -3,5 +3,5 @@ name: firefly-k8s-collector
 home: https://github.com/gofireflyio/k8s-collector
 description: Firefly's Kubernetes Collector
 type: application
-version: 1.4.7
-appVersion: "1.4.7"
+version: 1.4.8
+appVersion: "1.4.8"

charts/chart/templates/cronjob.yaml

@@ -68,6 +68,8 @@ spec:
                   value: {{ .Values.argocd.domain }}
                 - name: IACATHON_ARGOCD_INSECURE
                   value: {{ quote .Values.argocd.insecure }}
+                - name: IACATHON_ARGOCD_DISABLE_PLAINTEXT
+                  value: {{ quote .Values.argocd.disablePlaintext }}                  
                 - name: REMOTE_BUCKET
                   value: {{ quote .Values.argocd.saveToRemoteBucket}}
               envFrom:

charts/chart/templates/secret.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.argocd.enabled -}}
+{{- if and (.Values.argocd.enabled) (not .Values.existingFireFlyArgocdCredentialsSecret) -}}
 apiVersion: v1
 kind: Secret
 metadata:
@@ -17,4 +17,4 @@ type: Opaque
 data:
   accessKey: {{ .Values.accessKey | b64enc }}
   secretKey: {{ .Values.secretKey | b64enc }}
-{{- end }}
+{{- end }}

charts/chart/values.yaml

@@ -16,7 +16,7 @@ secretKey: null
 # the existing secret should have accessKey and secretKey keys
 # accessKey and secretKey values are ignored if this is set
 existingFireFlyCredentialsSecret: ""
-
+existingFireFlyArgocdCredentialsSecret: ""
 # incase the integration does not exist in firefly, the collector will create it
 # if you would like to mark as a production cluster set this to true
 isProduction: false
@@ -36,6 +36,7 @@ offBoarderImage:
 argocd:
   enabled: false
   insecure: true
+  disablePlaintext: true
   image:
     repository: infralightio/self-hosted-redactor
     pullPolicy: Always
@@ -102,4 +103,4 @@ addTypes: [ ]
 # DEPRECATED: collectSecrets is a boolean value indicating whether the collector
 # should collect secrets from the cluster. This value is deprecated in favor of
 # the addTypes value.
-collectSecrets: false
+collectSecrets: false