Merge pull request #61 from superstreamlabs/0.4.2

add version 0.4.2

Author: valeraBr

charts/superstream/Chart.yaml

@@ -25,7 +25,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.4.1
+version: 0.4.2
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.

charts/superstream/charts/telegraf/templates/configmap.yaml

@@ -47,7 +47,7 @@ data:
         "https://superstream-monitoring.mgmt.memphis-gcp.dev"
       ]
       [outputs.influxdb_v2.http_headers]
-        Authorization = {{ .Values.global.activationToken | quote }}
+        Authorization = "<< $TOKEN >>"
     [[outputs.influxdb_v2]]
       bucket = "metrics"
       content_encoding = "gzip"
@@ -60,7 +60,7 @@ data:
         "https://superstream-monitoring.mgmt.memphis-gcp.dev"
       ]
       [outputs.influxdb_v2.http_headers]
-        Authorization = {{ .Values.global.activationToken | quote }}
+        Authorization = "<< $TOKEN >>"
     [[inputs.syslog]]
       server = "udp://:6514"
       [inputs.syslog.tags]

charts/superstream/charts/telegraf/values.yaml

@@ -21,6 +21,11 @@ fullnameOverride: telegraf
 env:
 - name: HOSTNAME
   value: "telegraf-polling-service"
+- name: TOKEN
+  valueFrom:
+    secretKeyRef:
+      name: superstream-creds
+      key: ACTIVATION_TOKEN
 # An older "volumeMounts" key was previously added which will likely
 # NOT WORK as you expect. Please use this newer configuration.
 

charts/superstream/templates/_helpers.tpl

@@ -55,6 +55,7 @@ app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
 
 {{- define "superstream.secret" -}}
+{{- if not .Values.superstreamEngine.secret.useExisting -}}
 {{- $secret := lookup "v1" "Secret" .Release.Namespace .Values.superstreamEngine.secret.name -}}
 {{- if $secret -}}
 {{ toYaml $secret.data }}
@@ -63,6 +64,7 @@ ENCRYPTION_SECRET_KEY: {{ randAlphaNum 32 | b64enc | quote }}
 ACTIVATION_TOKEN: {{ .Values.global.activationToken | toString | b64enc | quote }}
 {{- end -}}
 {{- end -}}
+{{- end -}}
 
 {{/*
 Create the name of the service account to use

charts/superstream/templates/secret-data-plane.yaml

@@ -1,4 +1,4 @@
-{{- if not .Values.superstreamEngine.secret.existingSecret -}}
+{{- if not .Values.superstreamEngine.secret.useExisting -}}
 apiVersion: v1
 kind: Secret
 metadata:

charts/superstream/values.yaml

@@ -62,6 +62,7 @@ superstreamEngine:
     name: superstream-creds
     encryptionSecretKey: ""
     activationToken: ""
+    useExisting: false
   podAnnotations:
     prometheus.io/path: "/monitoring/metrics"
     prometheus.io/scrape: 'true'