sourcegraph · caugustus-sourcegraph · Apr 7, 2022 · Apr 5, 2022 · Apr 6, 2022 · Apr 7, 2022
diff --git a/charts/sourcegraph/README.md b/charts/sourcegraph/README.md
diff --git a/charts/sourcegraph/templates/_helpers.tpl b/charts/sourcegraph/templates/_helpers.tpl
@@ -41,7 +41,7 @@ Create the name of the service account to use
 {{- define "sourcegraph.serviceAccountName" -}}
 {{- $top := index . 0 }}
 {{- $service := index . 1 }}
-{{- $defaultServiceAccountName := ((snakecase $service) | replace "_" "-") }}
+{{- $defaultServiceAccountName := (index $top.Values $service "name") }}
 {{- default $defaultServiceAccountName (index $top.Values $service "serviceAccount" "name") }}
 {{- end }}
 

diff --git a/charts/sourcegraph/templates/cadvisor/cadvisor.ClusterRole.yaml b/charts/sourcegraph/templates/cadvisor/cadvisor.ClusterRole.yaml
@@ -7,11 +7,11 @@ metadata:
     category: rbac
     deploy: sourcegraph
     app.kubernetes.io/component: cadvisor
-  name: cadvisor
+  name: {{ .Values.cadvisor.name }}
 rules:
   - apiGroups: ['policy']
     resources: ['podsecuritypolicies']
     verbs:     ['use']
     resourceNames:
-    - {{ default "cadvisor" .Values.cadvisor.name }}
+    - {{ .Values.cadvisor.name }}
 {{- end }}
diff --git a/charts/sourcegraph/templates/cadvisor/cadvisor.ClusterRoleBinding.yaml b/charts/sourcegraph/templates/cadvisor/cadvisor.ClusterRoleBinding.yaml
@@ -7,11 +7,11 @@ metadata:
     category: rbac
     deploy: sourcegraph
     app.kubernetes.io/component: cadvisor
-  name: cadvisor
+  name: {{ .Values.cadvisor.name }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: cadvisor
+  name: {{ .Values.cadvisor.name }}
 subjects:
 - kind: ServiceAccount
   name: {{ include "sourcegraph.serviceAccountName" (list . "cadvisor") }}

diff --git a/charts/sourcegraph/templates/cadvisor/cadvisor.DaemonSet.yaml b/charts/sourcegraph/templates/cadvisor/cadvisor.DaemonSet.yaml
@@ -12,7 +12,7 @@ metadata:
     {{- end }}
     deploy: sourcegraph
     app.kubernetes.io/component: cadvisor
-  name: {{ default "cadvisor" .Values.cadvisor.name }}
+  name: {{ .Values.cadvisor.name }}
 spec:
   selector:
     matchLabels:

diff --git a/charts/sourcegraph/templates/cadvisor/cadvisor.PodSecurityPolicy.yaml b/charts/sourcegraph/templates/cadvisor/cadvisor.PodSecurityPolicy.yaml
@@ -6,7 +6,7 @@ metadata:
     app: cadvisor
     deploy: sourcegraph
     app.kubernetes.io/component: cadvisor
-  name: cadvisor
+  name: {{ .Values.cadvisor.name }}
 spec:
   seLinux:
     rule: RunAsAny

diff --git a/charts/sourcegraph/templates/codeinsights-db/codeinsights-db.ConfigMap.yaml b/charts/sourcegraph/templates/codeinsights-db/codeinsights-db.ConfigMap.yaml
@@ -10,7 +10,7 @@ metadata:
   labels:
     app.kubernetes.io/component: codeinsights-db
     deploy: sourcegraph
-  name: codeinsights-db-conf
+  name: {{ .Values.codeInsightsDB.name }}-conf
 data:
   postgresql.conf: |
     # -----------------------------

diff --git a/charts/sourcegraph/templates/codeinsights-db/codeinsights-db.StatefulSet.yaml b/charts/sourcegraph/templates/codeinsights-db/codeinsights-db.StatefulSet.yaml
@@ -11,7 +11,7 @@ metadata:
     {{- end }}
     app.kubernetes.io/component: codeinsights-db
     deploy: sourcegraph
-  name: {{ default "codeinsights-db" .Values.codeInsightsDB.name }}
+  name: {{ .Values.codeInsightsDB.name }}
 spec:
   replicas: 1
   revisionHistoryLimit: {{ .Values.sourcegraph.revisionHistoryLimit }}
@@ -100,7 +100,7 @@ spec:
       - name: codeinsights-conf
         configMap:
           defaultMode: 0777
-          name: {{ default "codeinsights-db-conf" .Values.codeInsightsDB.existingConfig }}
+          name: {{ default (print .Values.codeInsightsDB.name "-conf") .Values.codeInsightsDB.existingConfig }}
       - name: lockdir
         emptyDir: {}
       {{- if .Values.codeInsightsDB.extraVolumes }}

diff --git a/charts/sourcegraph/templates/codeintel-db/codeintel-db.ConfigMap.yaml b/charts/sourcegraph/templates/codeintel-db/codeintel-db.ConfigMap.yaml
@@ -10,7 +10,7 @@ metadata:
   labels:
     app.kubernetes.io/component: codeintel-db
     deploy: sourcegraph
-  name: codeintel-db-conf
+  name: {{ .Values.codeIntelDB.name }}-conf
 data:
   postgresql.conf: |
     # -----------------------------

diff --git a/charts/sourcegraph/templates/codeintel-db/codeintel-db.StatefulSet.yaml b/charts/sourcegraph/templates/codeintel-db/codeintel-db.StatefulSet.yaml
@@ -11,7 +11,7 @@ metadata:
     {{- end }}
     app.kubernetes.io/component: codeintel-db
     deploy: sourcegraph
-  name: {{ default "codeintel-db" .Values.codeIntelDB.name }}
+  name: {{ .Values.codeIntelDB.name }}
 spec:
   replicas: 1
   revisionHistoryLimit: {{ .Values.sourcegraph.revisionHistoryLimit }}
@@ -133,7 +133,7 @@ spec:
       - name: pgsql-conf
         configMap:
           defaultMode: 0777
-          name: {{ default "codeintel-db-conf" .Values.codeIntelDB.existingConfig .Values.codeIntelDB.name }}
+          name: {{ default (print .Values.codeIntelDB.name "-conf") .Values.codeIntelDB.existingConfig }}
       - name: lockdir
         emptyDir: {}
       {{- if .Values.codeIntelDB.extraVolumes }}

diff --git a/charts/sourcegraph/templates/frontend/sourcegraph-frontend.Deployment.yaml b/charts/sourcegraph/templates/frontend/sourcegraph-frontend.Deployment.yaml
@@ -10,7 +10,7 @@ metadata:
     {{- end }}
     deploy: sourcegraph
     app.kubernetes.io/component: frontend
-  name: {{ default "sourcegraph-frontend" .Values.frontend.name }}
+  name: {{ .Values.frontend.name }}
 spec:
   minReadySeconds: 10
   replicas: {{ .Values.frontend.replicaCount }}
@@ -90,12 +90,12 @@ spec:
           valueFrom:
             secretKeyRef:
               key: user
-              name: {{ default "minio-auth" .Values.minio.auth.existingSecret }}
+              name: {{ default (print .Values.minio.name "-auth") .Values.minio.auth.existingSecret }}
         - name: PRECISE_CODE_INTEL_UPLOAD_AWS_SECRET_ACCESS_KEY
           valueFrom:
             secretKeyRef:
               key: password
-              name: {{ default "minio-auth" .Values.minio.auth.existingSecret }}
+              name: {{ default (print .Values.minio.name "-auth") .Values.minio.auth.existingSecret }}
         {{- end }}
         terminationMessagePolicy: FallbackToLogsOnError
         livenessProbe:

diff --git a/charts/sourcegraph/templates/frontend/sourcegraph-frontend.Ingress.yaml b/charts/sourcegraph/templates/frontend/sourcegraph-frontend.Ingress.yaml
@@ -13,7 +13,7 @@ metadata:
     {{- if .Values.frontend.ingress.labels}}
       {{- toYaml .Values.frontend.ingress.labels | nindent 4 }}
     {{- end }}
-  name: sourcegraph-frontend
+  name: {{ .Values.frontend.name }}
 spec:
   {{- if and .Values.frontend.ingress.host .Values.frontend.ingress.tlsSecret }}
   tls:

diff --git a/charts/sourcegraph/templates/frontend/sourcegraph-frontend.Role.yaml b/charts/sourcegraph/templates/frontend/sourcegraph-frontend.Role.yaml
@@ -7,7 +7,7 @@ metadata:
     category: rbac
     deploy: sourcegraph
     app.kubernetes.io/component: frontend
-  name: sourcegraph-frontend
+  name: {{ .Values.frontend.name }}
 rules:
 - apiGroups:
   - ""

diff --git a/charts/sourcegraph/templates/frontend/sourcegraph-frontend.RoleBinding.yaml b/charts/sourcegraph/templates/frontend/sourcegraph-frontend.RoleBinding.yaml
@@ -6,12 +6,12 @@ metadata:
     category: rbac
     deploy: sourcegraph
     app.kubernetes.io/component: frontend
-  name: sourcegraph-frontend
+  name: {{ .Values.frontend.name }}
 roleRef:
 {{- if .Values.frontend.privileged }}
   apiGroup: "rbac.authorization.k8s.io"
   kind: Role
-  name: sourcegraph-frontend
+  name: {{ .Values.frontend.name }}
 {{- else }}
   apiGroup: ""
   kind: ClusterRole

diff --git a/charts/sourcegraph/templates/github-proxy/github-proxy.Deployment.yaml b/charts/sourcegraph/templates/github-proxy/github-proxy.Deployment.yaml
@@ -10,7 +10,7 @@ metadata:
     {{- end }}
     deploy: sourcegraph
     app.kubernetes.io/component: github-proxy
-  name: {{ default "github-proxy" .Values.githubProxy.name }}
+  name: {{ .Values.githubProxy.name }}
 spec:
   minReadySeconds: 10
   replicas: 1

diff --git a/charts/sourcegraph/templates/gitserver/gitserver.StatefulSet.yaml b/charts/sourcegraph/templates/gitserver/gitserver.StatefulSet.yaml
@@ -10,7 +10,7 @@ metadata:
     {{- end }}
     deploy: sourcegraph
     app.kubernetes.io/component: gitserver
-  name: {{ default "gitserver" .Values.gitserver.name }}
+  name: {{ .Values.gitserver.name }}
 spec:
   replicas: {{ .Values.gitserver.replicaCount }}
   revisionHistoryLimit: {{ .Values.sourcegraph.revisionHistoryLimit }}

diff --git a/charts/sourcegraph/templates/grafana/grafana.ConfigMap.yaml b/charts/sourcegraph/templates/grafana/grafana.ConfigMap.yaml
@@ -20,5 +20,5 @@ metadata:
   labels:
     deploy: sourcegraph
     app.kubernetes.io/component: grafana
-  name: grafana
+  name: {{ .Values.grafana.name }}
 {{- end }}
diff --git a/charts/sourcegraph/templates/grafana/grafana.StatefulSet.yaml b/charts/sourcegraph/templates/grafana/grafana.StatefulSet.yaml
@@ -11,7 +11,7 @@ metadata:
     {{- end }}
     deploy: sourcegraph
     app.kubernetes.io/component: grafana
-  name: {{ default "grafana" .Values.grafana.name }}
+  name: {{ .Values.grafana.name }}
 spec:
   replicas: {{ .Values.grafana.replicaCount }}
   revisionHistoryLimit: {{ .Values.sourcegraph.revisionHistoryLimit }}
@@ -94,7 +94,7 @@ spec:
       - name: config
         configMap:
           defaultMode: 0777
-          name: {{ default "grafana" .Values.grafana.existingConfig }}
+          name: {{ default .Values.grafana.name .Values.grafana.existingConfig }}
       {{- if .Values.grafana.extraVolumes }}
       {{- toYaml .Values.grafana.extraVolumes | nindent 6 }}
       {{- end }}

diff --git a/charts/sourcegraph/templates/indexed-search/indexed-search.StatefulSet.yaml b/charts/sourcegraph/templates/indexed-search/indexed-search.StatefulSet.yaml
@@ -10,7 +10,7 @@ metadata:
     {{- if .Values.indexedSearch.labels }}
       {{- toYaml .Values.indexedSearch.labels | nindent 4 }}
     {{- end }}
-  name: {{ default "indexed-search" .Values.indexedSearch.name }}
+  name: {{ .Values.indexedSearch.name }}
 spec:
   replicas: {{ .Values.indexedSearch.replicaCount }}
   revisionHistoryLimit: {{ .Values.sourcegraph.revisionHistoryLimit }}

diff --git a/charts/sourcegraph/templates/jaeger/jaeger.Deployment.yaml b/charts/sourcegraph/templates/jaeger/jaeger.Deployment.yaml
@@ -2,7 +2,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ default "jaeger" .Values.tracing.name }}
+  name: {{ .Values.tracing.name }}
   labels:
     {{- include "sourcegraph.jaeger.labels" . | nindent 4 }}
     {{- if .Values.tracing.labels }}

diff --git a/charts/sourcegraph/templates/minio/minio.Deployment.yaml b/charts/sourcegraph/templates/minio/minio.Deployment.yaml
@@ -11,7 +11,7 @@ metadata:
     {{- end }}
     deploy: sourcegraph
     app.kubernetes.io/component: minio
-  name: {{ default "minio" .Values.minio.name }}
+  name: {{ .Values.minio.name }}
 spec:
   minReadySeconds: 10
   replicas: 1
@@ -51,12 +51,12 @@ spec:
           valueFrom:
             secretKeyRef:
               key: user
-              name: {{ default "minio-auth" .Values.minio.auth.existingSecret }}
+              name: {{ default (print .Values.minio.name "-auth") .Values.minio.auth.existingSecret }}
         - name: MINIO_ROOT_PASSWORD
           valueFrom:
             secretKeyRef:
               key: password
-              name: {{ default "minio-auth" .Values.minio.auth.existingSecret }}
+              name: {{ default (print .Values.minio.name "-auth") .Values.minio.auth.existingSecret }}
         {{- range $name, $item := .Values.minio.env}}
         - name: {{ $name }}
           {{- $item | toYaml | nindent 10 }}

diff --git a/charts/sourcegraph/templates/minio/minio.Secret.yaml b/charts/sourcegraph/templates/minio/minio.Secret.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: minio-auth
+  name: {{ .Values.minio.name }}-auth
   labels:
     app: minio
     deploy: sourcegraph

diff --git a/charts/sourcegraph/templates/pgsql/pgsql.ConfigMap.yaml b/charts/sourcegraph/templates/pgsql/pgsql.ConfigMap.yaml
@@ -10,7 +10,7 @@ metadata:
   labels:
     deploy: sourcegraph
     app.kubernetes.io/component: pgsql
-  name: pgsql-conf
+  name: {{ .Values.pgsql.name }}-conf
 data:
   postgresql.conf: |
     # -----------------------------

diff --git a/charts/sourcegraph/templates/pgsql/pgsql.StatefulSet.yaml b/charts/sourcegraph/templates/pgsql/pgsql.StatefulSet.yaml
@@ -11,7 +11,7 @@ metadata:
     {{- if .Values.pgsql.labels }}
       {{- toYaml .Values.pgsql.labels | nindent 4 }}
     {{- end }}
-  name: {{ default "pgsql" .Values.pgsql.name }}
+  name: {{ .Values.pgsql.name }}
 spec:
   replicas: 1
   revisionHistoryLimit: {{ .Values.sourcegraph.revisionHistoryLimit }}
@@ -137,7 +137,7 @@ spec:
       - name: pgsql-conf
         configMap:
           defaultMode: 0777
-          name: {{ default "pgsql-conf" .Values.pgsql.existingConfig }}
+          name: {{ default (print .Values.pgsql.name "-conf") .Values.pgsql.existingConfig }}
       - name: dshm # Allocate shared memory to match the shared_buffers value
         emptyDir:
           medium: Memory

diff --git a/charts/sourcegraph/templates/precise-code-intel/worker.Deployment.yaml b/charts/sourcegraph/templates/precise-code-intel/worker.Deployment.yaml
@@ -10,7 +10,7 @@ metadata:
     {{- end }}
     deploy: sourcegraph
     app.kubernetes.io/component: precise-code-intel
-  name: {{ default "precise-code-intel-worker" .Values.preciseCodeIntel.name }}
+  name: {{ .Values.preciseCodeIntel.name }}
 spec:
   minReadySeconds: 10
   replicas: {{ .Values.preciseCodeIntel.replicaCount }}

diff --git a/charts/sourcegraph/templates/prometheus/prometheus.ClusterRole.yaml b/charts/sourcegraph/templates/prometheus/prometheus.ClusterRole.yaml
@@ -6,7 +6,7 @@ metadata:
     category: rbac
     deploy: sourcegraph
     app.kubernetes.io/component: prometheus
-  name: prometheus
+  name: {{ .Values.prometheus.name }}
 rules:
 - apiGroups:
   - ""

diff --git a/charts/sourcegraph/templates/prometheus/prometheus.ClusterRoleBinding.yaml b/charts/sourcegraph/templates/prometheus/prometheus.ClusterRoleBinding.yaml
@@ -6,11 +6,11 @@ metadata:
     category: rbac
     deploy: sourcegraph
     app.kubernetes.io/component: prometheus
-  name: prometheus
+  name: {{ .Values.prometheus.name }}
 roleRef:
   apiGroup: "rbac.authorization.k8s.io"
   kind: ClusterRole
-  name: prometheus
+  name: {{ .Values.prometheus.name }}
 subjects:
 - kind: ServiceAccount
   name: {{ include "sourcegraph.serviceAccountName" (list . "prometheus") }}

diff --git a/charts/sourcegraph/templates/prometheus/prometheus.ConfigMap.yaml b/charts/sourcegraph/templates/prometheus/prometheus.ConfigMap.yaml
@@ -281,5 +281,5 @@ metadata:
   labels:
     deploy: sourcegraph
     app.kubernetes.io/component: prometheus
-  name: prometheus
+  name: {{ .Values.prometheus.name }}
 {{- end }}
diff --git a/charts/sourcegraph/templates/prometheus/prometheus.Deployment.yaml b/charts/sourcegraph/templates/prometheus/prometheus.Deployment.yaml
@@ -11,7 +11,7 @@ metadata:
     {{- end }}
     deploy: sourcegraph
     app.kubernetes.io/component: prometheus
-  name: {{ default "prometheus" .Values.prometheus.name }}
+  name: {{ .Values.prometheus.name }}
 spec:
   minReadySeconds: 10
   replicas: {{ .Values.prometheus.replicaCount }}
@@ -101,7 +101,7 @@ spec:
           claimName: prometheus
       - configMap:
           defaultMode: 0777
-          name: {{ default "prometheus" .Values.prometheus.existingConfig }}
+          name: {{ default .Values.prometheus.name .Values.prometheus.existingConfig }}
         name: config
       {{- if .Values.prometheus.extraVolumes }}
       {{- toYaml .Values.prometheus.extraVolumes | nindent 6 }}

diff --git a/charts/sourcegraph/templates/prometheus/prometheus.RoleBinding.yaml b/charts/sourcegraph/templates/prometheus/prometheus.RoleBinding.yaml
@@ -6,7 +6,7 @@ metadata:
     category: rbac
     deploy: sourcegraph
     app.kubernetes.io/component: prometheus
-  name: prometheus
+  name: {{ .Values.prometheus.name }}
 roleRef:
   apiGroup: ""
   kind: ClusterRole

diff --git a/charts/sourcegraph/templates/redis/redis-cache.Deployment.yaml b/charts/sourcegraph/templates/redis/redis-cache.Deployment.yaml
@@ -11,7 +11,7 @@ metadata:
     {{- end }}
     deploy: sourcegraph
     app.kubernetes.io/component: redis
-  name: {{ default "redis-cache" .Values.redisCache.name }}
+  name: {{ .Values.redisCache.name }}
 spec:
   minReadySeconds: 10
   replicas: 1

diff --git a/charts/sourcegraph/templates/redis/redis-store.Deployment.yaml b/charts/sourcegraph/templates/redis/redis-store.Deployment.yaml
@@ -11,7 +11,7 @@ metadata:
     {{- end }}
     deploy: sourcegraph
     app.kubernetes.io/component: redis
-  name: {{ default "redis-store" .Values.redisStore.name }}
+  name: {{ .Values.redisStore.name }}
 spec:
   minReadySeconds: 10
   replicas: 1

diff --git a/charts/sourcegraph/templates/repo-updater/repo-updater.Deployment.yaml b/charts/sourcegraph/templates/repo-updater/repo-updater.Deployment.yaml
@@ -11,7 +11,7 @@ metadata:
     {{- end }}
     deploy: sourcegraph
     app.kubernetes.io/component: repo-updater
-  name: {{ default "repo-updater" .Values.repoUpdater.name }}
+  name: {{ .Values.repoUpdater.name }}
 spec:
   minReadySeconds: 10
   replicas: 1

diff --git a/charts/sourcegraph/templates/searcher/searcher.Deployment.yaml b/charts/sourcegraph/templates/searcher/searcher.Deployment.yaml
@@ -10,7 +10,7 @@ metadata:
     {{- end }}
     deploy: sourcegraph
     app.kubernetes.io/component: searcher
-  name: {{ default "searcher" .Values.searcher.name }}
+  name: {{ .Values.searcher.name }}
 spec:
   minReadySeconds: 10
   replicas: {{ .Values.searcher.replicaCount }}

diff --git a/charts/sourcegraph/templates/symbols/symbols.Deployment.yaml b/charts/sourcegraph/templates/symbols/symbols.Deployment.yaml
@@ -10,7 +10,7 @@ metadata:
     {{- end }}
     deploy: sourcegraph
     app.kubernetes.io/component: symbols
-  name: {{ default "symbols" .Values.symbols.name }}
+  name: {{ .Values.symbols.name }}
 spec:
   minReadySeconds: 10
   replicas: {{ .Values.symbols.replicaCount }}