Inverting createKubernetesSecrets -> disableKubernetesSecrets

Author: marcleblanc2

charts/sourcegraph/templates/_helpers.tpl

@@ -45,7 +45,7 @@ For top-level services, pass in the top-level values:
 {{ include "sourcegraph.serviceAccountName" (list . "frontend") }}
 
 frontend:
-  serivceAccount:
+  serviceAccount:
     create: false
 
 For nested services, pass in the nested values:
@@ -249,7 +249,12 @@ app.kubernetes.io/name: jaeger
 {{- end }}
 
 {{- define "sourcegraph.redisConnection" -}}
-{{- if .Values.sourcegraph.createKubernetesSecrets -}}
+{{- if .Values.sourcegraph.disableKubernetesSecrets -}}
+- name: REDIS_CACHE_ENDPOINT
+  value: {{ .Values.sourcegraph.redisCacheEndpoint }}
+- name: REDIS_STORE_ENDPOINT
+  value: {{ .Values.sourcegraph.redisStoreEndpoint }}
+{{- else -}}
 - name: REDIS_CACHE_ENDPOINT
   valueFrom:
     secretKeyRef:
@@ -260,11 +265,6 @@ app.kubernetes.io/name: jaeger
     secretKeyRef:
       key: endpoint
       name: {{ default .Values.redisStore.name .Values.redisStore.connection.existingSecret }}
-{{- else -}}
-- name: REDIS_CACHE_ENDPOINT
-  value: {{ .Values.sourcegraph.redisCacheEndpoint }}
-- name: REDIS_STORE_ENDPOINT
-  value: {{ .Values.sourcegraph.redisStoreEndpoint }}
 {{- end -}}
 {{- end -}}
 

charts/sourcegraph/templates/codeinsights-db/codeinsights-db.Secret.yaml

@@ -1,4 +1,4 @@
-{{- if and .Values.sourcegraph.createKubernetesSecrets (not .Values.codeInsightsDB.auth.existingSecret) -}}
+{{- if and (not .Values.sourcegraph.disableKubernetesSecrets) (not .Values.codeInsightsDB.auth.existingSecret) -}}
 apiVersion: v1
 kind: Secret
 metadata:

charts/sourcegraph/templates/codeintel-db/codeintel-db.Secret.yaml

@@ -1,4 +1,4 @@
-{{- if and .Values.sourcegraph.createKubernetesSecrets (not .Values.codeIntelDB.auth.existingSecret) -}}
+{{- if and (not .Values.sourcegraph.disableKubernetesSecrets) (not .Values.codeIntelDB.auth.existingSecret) -}}
 apiVersion: v1
 kind: Secret
 metadata:

charts/sourcegraph/templates/frontend/sourcegraph-frontend.Deployment.yaml

@@ -54,7 +54,7 @@ spec:
         imagePullPolicy: {{ .Values.sourcegraph.image.pullPolicy }}
         args: {{- default (list "up") .Values.migrator.args | toYaml | nindent 8 }}
         env:
-        {{- if not .Values.migrator.databaseAuthOverrideEnvVars }}
+        {{- if and (not .Values.migrator.databaseAuthOverrideEnvVars) (not .Values.sourcegraph.disableKubernetesSecrets) }}
         {{- include "sourcegraph.databaseAuth" (list . "pgsql" "PG") | nindent 8 }}
         {{- include "sourcegraph.databaseAuth" (list . "codeIntelDB" "CODEINTEL_PG") | nindent 8 }}
         {{- include "sourcegraph.databaseAuth" (list . "codeInsightsDB" "CODEINSIGHTS_PG") | nindent 8 }}
@@ -80,9 +80,11 @@ spec:
         imagePullPolicy: {{ .Values.sourcegraph.image.pullPolicy }}
         args: {{- default (list "serve") .Values.frontend.args | toYaml | nindent 8 }}
         env:
+        {{- if not .Values.sourcegraph.disableKubernetesSecrets }}
         {{- include "sourcegraph.databaseAuth" (list . "pgsql" "PG") | nindent 8 }}
         {{- include "sourcegraph.databaseAuth" (list . "codeIntelDB" "CODEINTEL_PG") | nindent 8 }}
         {{- include "sourcegraph.databaseAuth" (list . "codeInsightsDB" "CODEINSIGHTS_PG") | nindent 8 }}
+        {{- end }}
         {{- range $name, $item := .Values.frontend.env}}
         - name: {{ $name }}
           {{- $item | toYaml | nindent 10 }}

charts/sourcegraph/templates/grafana/grafana.StatefulSet.yaml

@@ -52,7 +52,9 @@ spec:
         {{- end }}
         terminationMessagePolicy: FallbackToLogsOnError
         env:
+        {{- if not .Values.sourcegraph.disableKubernetesSecrets -}}
         {{- include "sourcegraph.databaseAuth" (list . "grafana" "GRAFANA_PGSQL_") | nindent 8 }}
+        {{- end -}}
         {{- range $name, $item := .Values.grafana.env}}
         - name: {{ $name }}
           {{- $item | toYaml | nindent 10 }}

charts/sourcegraph/templates/grafana/grafana.pgsql.Secret.yaml

@@ -1,4 +1,4 @@
-{{- if and .Values.sourcegraph.createKubernetesSecrets .Values.grafana.auth (not .Values.grafana.auth.existingSecret) -}}
+{{- if and (not .Values.sourcegraph.disableKubernetesSecrets) .Values.grafana.auth (not .Values.grafana.auth.existingSecret) -}}
 apiVersion: v1
 kind: Secret
 metadata:

charts/sourcegraph/templates/pgsql/pgsql.Secret.yaml

@@ -1,4 +1,4 @@
-{{- if and .Values.sourcegraph.createKubernetesSecrets (not .Values.pgsql.auth.existingSecret) -}}
+{{- if and (not .Values.sourcegraph.disableKubernetesSecrets) (not .Values.pgsql.auth.existingSecret) -}}
 apiVersion: v1
 kind: Secret
 metadata:

charts/sourcegraph/templates/redis/redis-cache.Secret.yaml

@@ -1,4 +1,4 @@
-{{- if and .Values.sourcegraph.createKubernetesSecrets (not .Values.redisCache.connection.existingSecret) -}}
+{{- if and (not .Values.sourcegraph.disableKubernetesSecrets) (not .Values.redisCache.connection.existingSecret) -}}
 apiVersion: v1
 kind: Secret
 metadata:

charts/sourcegraph/templates/redis/redis-store.Secret.yaml

@@ -1,4 +1,4 @@
-{{- if and .Values.sourcegraph.createKubernetesSecrets (not .Values.redisStore.connection.existingSecret) -}}
+{{- if and (not .Values.sourcegraph.disableKubernetesSecrets) (not .Values.redisStore.connection.existingSecret) -}}
 apiVersion: v1
 kind: Secret
 metadata:

charts/sourcegraph/values.yaml

@@ -38,8 +38,8 @@ sourcegraph:
   revisionHistoryLimit: 10
   # -- Add extra labels to all services
   serviceLabels: {}
-  # -- Create Kubernetes secrets objects
-  createKubernetesSecrets: true
+  # -- Disable the creation of Kubernetes secrets objects
+  disableKubernetesSecrets: false
 
 # Generic application configuration options, used by most applications below
 # app: # Generally matches directory name