Merge pull request #53 from jujaga/bugfix/scoped-helm-releases

Helm: Force basicAuth secrets to always be release scoped

Author: TimCsaky

charts/coms/Chart.yaml

@@ -3,7 +3,7 @@ name: common-object-management-service
 # 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.0.3
+version: 0.0.4
 kubeVersion: ">= 1.13.0"
 description: A microservice for managing access control to S3 Objects
 # A chart can be either an 'application' or a 'library' chart.

charts/coms/templates/configmap.yaml

@@ -4,14 +4,9 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ include "coms.configname" . }}-config
-  labels:
-    {{- include "coms.labels" . | nindent 4 }}
-  {{- with .Values.route.annotations }}
+  {{- if not .Values.config.releaseScoped }}
   annotations:
-    {{- if not .Values.config.releaseScoped }}
     "helm.sh/resource-policy": keep
-    {{- end }}
-    {{- toYaml . | nindent 4 }}
   {{- end }}
 data: {{ toYaml .Values.config.configMap | nindent 2 }}
 {{- end }}

charts/coms/templates/secret.yaml

@@ -1,7 +1,7 @@
 {{- $password := (randAlphaNum 32) | b64enc }}
 {{- $username := (randAlphaNum 32) | b64enc }}
 
-{{- $secretName := printf "%s-%s" (include "coms.configname" .) "basicauth" }}
+{{- $secretName := printf "%s-%s" (include "coms.fullname" .) "basicauth" }}
 {{- $secret := (lookup "v1" "Secret" .Release.Namespace $secretName ) }}
 {{- if not $secret }}
 ---