Extend persistent volume configuration options

charts/sourcegraph/templates/blobstore/blobstore.Deployment.yaml

@@ -80,6 +80,9 @@ spec:
         volumeMounts:
         - name: blobstore-data
           mountPath: /data
+          {{- if .Values.blobstore.storageSubPath }}
+          subPath: {{ .Values.blobstore.storageSubPath }}
+          {{- end }}
         - name: blobstore
           mountPath: /blobstore
         {{- if .Values.blobstore.extraVolumeMounts }}

charts/sourcegraph/templates/blobstore/blobstore.PersistentVolumeClaim.yaml

@@ -5,6 +5,10 @@ metadata:
   labels:
     deploy: sourcegraph
     app.kubernetes.io/component: blobstore
+  {{- if .Values.blobstore.storageAnnotations }}
+  annotations:
+    {{- toYaml .Values.blobstore.storageAnnotations | nindent 4 }}
+  {{- end }}
   name: blobstore
 spec:
   accessModes:

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

@@ -5,6 +5,10 @@ metadata:
   labels:
     app.kubernetes.io/component: codeinsights-db
     deploy: sourcegraph
+  {{- if .Values.codeInsightsDB.storageAnnotations }}
+  annotations:
+    {{- toYaml .Values.codeInsightsDB.storageAnnotations | nindent 4 }}
+  {{- end }}
   name: codeinsights-db
 spec:
   accessModes:

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

@@ -51,6 +51,9 @@ spec:
         volumeMounts:
         - mountPath: /var/lib/postgresql/data/
           name: disk
+          {{- if .Values.codeInsightsDB.storageSubPath }}
+          subPath: {{ .Values.codeInsightsDB.storageSubPath }}
+          {{- end }}
         securityContext:
         {{- toYaml .Values.codeInsightsDB.init.containerSecurityContext | nindent 10 }}
         {{- if not .Values.sourcegraph.localDevMode }}
@@ -90,6 +93,9 @@ spec:
         volumeMounts:
         - mountPath: /var/lib/postgresql/data/
           name: disk
+          {{- if .Values.codeInsightsDB.storageSubPath }}
+          subPath: {{ .Values.codeInsightsDB.storageSubPath }}
+          {{- end }}
         - mountPath: /conf
           name: codeinsights-conf
         - mountPath: /var/run/postgresql

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

@@ -5,6 +5,10 @@ metadata:
   labels:
     app.kubernetes.io/component: codeintel-db
     deploy: sourcegraph
+  {{- if .Values.codeIntelDB.storageAnnotations }}
+  annotations:
+    {{- toYaml .Values.codeIntelDB.storageAnnotations | nindent 4 }}
+  {{- end }}
   name: {{ default "codeintel-db" .Values.codeIntelDB.name }}
 spec:
   accessModes:

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

@@ -51,6 +51,9 @@ spec:
         volumeMounts:
         - mountPath: /data
           name: disk
+          {{- if .Values.codeIntelDB.storageSubPath }}
+          subPath: {{ .Values.codeIntelDB.storageSubPath }}
+          {{- end }}
         securityContext:
         {{- toYaml .Values.alpine.containerSecurityContext | nindent 10 }}
         {{- if not .Values.sourcegraph.localDevMode }}
@@ -101,6 +104,9 @@ spec:
         volumeMounts:
         - mountPath: /data
           name: disk
+          {{- if .Values.codeIntelDB.storageSubPath }}
+          subPath: {{ .Values.codeIntelDB.storageSubPath }}
+          {{- end }}
         - mountPath: /conf
           name: pgsql-conf
         - mountPath: /var/run/postgresql

charts/sourcegraph/templates/gitserver/gitserver.StatefulSet.yaml

@@ -85,6 +85,9 @@ spec:
           name: tmpdir
         - mountPath: /data/repos
           name: repos
+          {{- if .Values.gitserver.storageSubPath }}
+          subPath: {{ .Values.gitserver.storageSubPath }}
+          {{- end }}
         {{- if .Values.gitserver.sshSecret }}
         - mountPath: /home/sourcegraph/.ssh
           name: ssh
@@ -124,6 +127,10 @@ spec:
   volumeClaimTemplates:
   - metadata:
       name: repos
+      {{- if .Values.gitserver.storageAnnotations }}
+      annotations:
+        {{- toYaml .Values.gitserver.storageAnnotations | nindent 8 }}
+      {{- end }}
     spec:
       accessModes:
       - ReadWriteOnce

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

@@ -65,6 +65,9 @@ spec:
         volumeMounts:
         - mountPath: /var/lib/grafana
           name: grafana-data
+          {{- if .Values.grafana.storageSubPath }}
+          subPath: {{ .Values.grafana.storageSubPath }}
+          {{- end }}
         - mountPath: /sg_config_grafana/provisioning/datasources
           name: config
         # Grafana is relied upon to send alerts to site admins when something is wrong with
@@ -105,6 +108,10 @@ spec:
   volumeClaimTemplates:
   - metadata:
       name: grafana-data
+      {{- if .Values.grafana.storageAnnotations }}
+      annotations:
+        {{- toYaml .Values.grafana.storageAnnotations | nindent 8 }}
+      {{- end }}
     spec:
       accessModes: [ "ReadWriteOnce"]
       resources:

charts/sourcegraph/templates/indexed-search/indexed-search.StatefulSet.yaml

@@ -89,6 +89,9 @@ spec:
         volumeMounts:
         - mountPath: /data
           name: data
+          {{- if .Values.indexedSearch.storageSubPath }}
+          subPath: {{ .Values.indexedSearch.storageSubPath }}
+          {{- end }}
         {{- if .Values.indexedSearch.extraVolumeMounts }}
         {{- toYaml .Values.indexedSearch.extraVolumeMounts | nindent 8 }}
         {{- end }}
@@ -118,6 +121,9 @@ spec:
         volumeMounts:
         - mountPath: /data
           name: data
+          {{- if .Values.indexedSearch.storageSubPath }}
+          subPath: {{ .Values.indexedSearch.storageSubPath }}
+          {{- end }}
         {{- if .Values.indexedSearchIndexer.extraVolumeMounts }}
         {{- toYaml .Values.indexedSearchIndexer.extraVolumeMounts | nindent 8 }}
         {{- end }}
@@ -147,6 +153,10 @@ spec:
       labels:
         deploy: sourcegraph
       name: data
+      {{- if .Values.indexedSearch.storageAnnotations }}
+      annotations:
+        {{- toYaml .Values.indexedSearch.storageAnnotations | nindent 8 }}
+      {{- end }}
     spec:
       accessModes:
       - ReadWriteOnce

charts/sourcegraph/templates/pgsql/pgsql.PersistentVolumeClaim.yaml

@@ -5,6 +5,10 @@ metadata:
   labels:
     deploy: sourcegraph
     app.kubernetes.io/component: pgsql
+  {{- if .Values.pgsql.storageAnnotations }}
+  annotations:
+    {{- toYaml .Values.pgsql.storageAnnotations | nindent 4 }}
+  {{- end }}
   name: pgsql
 spec:
   accessModes:

charts/sourcegraph/templates/pgsql/pgsql.StatefulSet.yaml

@@ -51,6 +51,9 @@ spec:
         volumeMounts:
         - mountPath: /data
           name: disk
+          {{- if .Values.pgsql.storageSubPath }}
+          subPath: {{ .Values.pgsql.storageSubPath }}
+          {{- end }}
         securityContext:
         {{- toYaml .Values.alpine.containerSecurityContext | nindent 10 }}
         {{- if not .Values.sourcegraph.localDevMode }}
@@ -101,6 +104,9 @@ spec:
         volumeMounts:
         - mountPath: /data
           name: disk
+          {{- if .Values.pgsql.storageSubPath }}
+          subPath: {{ .Values.pgsql.storageSubPath }}
+          {{- end }}
         - mountPath: /conf
           name: pgsql-conf
         - mountPath: /dev/shm

charts/sourcegraph/templates/prometheus/prometheus.Deployment.yaml

@@ -70,6 +70,9 @@ spec:
         volumeMounts:
         - mountPath: /prometheus
           name: data
+          {{- if .Values.prometheus.storageSubPath }}
+          subPath: {{ .Values.prometheus.storageSubPath }}
+          {{- end }}
         - mountPath: /sg_prometheus_add_ons
           name: config
         {{- if .Values.prometheus.extraVolumeMounts }}

charts/sourcegraph/templates/prometheus/prometheus.PersistentVolumeClaim.yaml

@@ -5,6 +5,10 @@ metadata:
   labels:
     deploy: sourcegraph
     app.kubernetes.io/component: prometheus
+  {{- if .Values.prometheus.storageAnnotations }}
+  annotations:
+    {{- toYaml .Values.prometheus.storageAnnotations | nindent 4 }}
+  {{- end }}
   name: prometheus
 spec:
   accessModes:

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

@@ -97,6 +97,9 @@ spec:
         volumeMounts:
         - mountPath: /redis-data
           name: redis-data
+          {{- if .Values.redisCache.storageSubPath }}
+          subPath: {{ .Values.redisCache.storageSubPath }}
+          {{- end }}
         {{- if .Values.redisCache.extraVolumeMounts }}
         {{- toYaml .Values.redisCache.extraVolumeMounts | nindent 8 }}
         {{- end }}

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

@@ -5,6 +5,10 @@ metadata:
   labels:
     deploy: sourcegraph
     app.kubernetes.io/component: redis
+  {{- if .Values.redisCache.storageAnnotations }}
+  annotations:
+    {{- toYaml .Values.redisCache.storageAnnotations | nindent 4 }}
+  {{- end }}
   name: redis-cache
 spec:
   accessModes:

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

@@ -96,6 +96,9 @@ spec:
         volumeMounts:
         - mountPath: /redis-data
           name: redis-data
+          {{- if .Values.redisStore.storageSubPath }}
+          subPath: {{ .Values.redisStore.storageSubPath }}
+          {{- end }}
         {{- if .Values.redisStore.extraVolumeMounts }}
         {{- toYaml .Values.redisStore.extraVolumeMounts | nindent 8 }}
         {{- end }}

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

@@ -5,6 +5,10 @@ metadata:
   labels:
     deploy: sourcegraph
     app.kubernetes.io/component: redis
+  {{- if .Values.redisStore.storageAnnotations }}
+  annotations:
+    {{- toYaml .Values.redisStore.storageAnnotations | nindent 4 }}
+  {{- end }}
   name: redis-store
 spec:
   accessModes:

charts/sourcegraph/templates/searcher/searcher.StatefulSet.yaml

@@ -99,6 +99,9 @@ spec:
         volumeMounts:
         - mountPath: /mnt/cache
           name: cache
+          {{- if .Values.searcher.storageSubPath }}
+          subPath: {{ .Values.searcher.storageSubPath }}
+          {{- end }}
         - mountPath: /tmp
           name: tmpdir
         {{- if .Values.searcher.extraVolumeMounts }}
@@ -135,6 +138,10 @@ spec:
   volumeClaimTemplates:
   - metadata:
       name: cache
+      {{- if .Values.searcher.storageAnnotations }}
+      annotations:
+        {{- toYaml .Values.searcher.storageAnnotations | nindent 8 }}
+      {{- end }}
     spec:
       accessModes:
       - ReadWriteOnce

charts/sourcegraph/values.yaml

@@ -225,6 +225,10 @@ codeInsightsDB:
     name: ""
   # -- PVC Storage Request for `codeinsights-db` data volume
   storageSize: 200Gi
+  # -- Optional subPath for the `codeinsights-db` primary data volume mount
+  storageSubPath: ""
+  # -- Optional annotations to add to the `codeinsights-db` PVC
+  storageAnnotations: {}
 
 codeIntelDB:
   # -- Enable `codeintel-db` PostgreSQL server
@@ -290,6 +294,10 @@ codeIntelDB:
     name: ""
   # -- PVC Storage Request for `codeintel-db` data volume
   storageSize: 200Gi
+  # -- Optional subPath for the `codeintel-db` primary data volume mount
+  storageSubPath: ""
+  # -- Optional annotations to add to the `codeintel-db` PVC
+  storageAnnotations: {}
 
 frontend:
   # -- Environment variables for the `frontend` container
@@ -446,6 +454,10 @@ gitserver:
     name: ""
   # -- PVC Storage Request for `gitserver` data volume
   storageSize: 200Gi
+  # -- Optional subPath for the `gitserver` primary data volume mount
+  storageSubPath: ""
+  # -- Optional annotations to add to the `gitserver` PVC
+  storageAnnotations: {}
 
 grafana:
   # -- Enable `grafana` dashboard (recommended)
@@ -508,6 +520,10 @@ grafana:
     name: grafana
   # -- PVC Storage Request for `grafana` data volume
   storageSize: 2Gi
+  # -- Optional subPath for the `grafana` primary data volume mount
+  storageSubPath: ""
+  # -- Optional annotations to add to the `grafana` PVC
+  storageAnnotations: {}
 
 indexedSearch:
   image:
@@ -549,6 +565,10 @@ indexedSearch:
   # The size of disk to used for search indexes.
   # This should typically be gitserver disk size multipled by the number of gitserver shards.
   storageSize: 200Gi
+  # -- Optional subPath for the `indexed-search` primary data volume mount
+  storageSubPath: ""
+  # -- Optional annotations to add to the `indexed-search` PVC
+  storageAnnotations: {}
 
 indexedSearchIndexer:
   image:
@@ -614,6 +634,10 @@ blobstore:
     name: ""
   # -- PVC Storage Request for `blobstore` data volume
   storageSize: 100Gi
+  # -- Optional subPath for the `blobstore` primary data volume mount
+  storageSubPath: ""
+  # -- Optional annotations to add to the `blobstore` PVC
+  storageAnnotations: {}
 
 openTelemetry:
   enabled: true
@@ -800,6 +824,10 @@ pgsql:
     name: ""
   # -- PVC Storage Request for `pgsql` data volume
   storageSize: 200Gi
+  # -- Optional subPath for the `pgsql` primary data volume mount
+  storageSubPath: ""
+  # -- Optional annotations to add to the `pgsql` PVC
+  storageAnnotations: {}
 
 postgresExporter:
   image:
@@ -948,6 +976,10 @@ prometheus:
     name: prometheus
   # -- PVC Storage Request for `prometheus` data volume
   storageSize: 200Gi
+  # -- Optional subPath for the `prometheus` primary data volume mount
+  storageSubPath: ""
+  # -- Optional annotations to add to the `prometheus` PVC
+  storageAnnotations: {}
 
 redisCache:
   # -- Enable `redis-cache` Redis server
@@ -994,6 +1026,10 @@ redisCache:
     name: ""
   # -- PVC Storage Request for `redis-cache` data volume
   storageSize: 100Gi
+  # -- Optional subPath for the `redis-cache` primary data volume mount
+  storageSubPath: ""
+  # -- Optional annotations to add to the `redis-cache` PVC
+  storageAnnotations: {}
 
 redisExporter:
   image:
@@ -1063,6 +1099,10 @@ redisStore:
     name: ""
   # -- PVC Storage Request for `redis-store` data volume
   storageSize: 100Gi
+  # -- Optional subPath for the `redis-store` primary data volume mount
+  storageSubPath: ""
+  # -- Optional annotations to add to the `redis-store` PVC
+  storageAnnotations: {}
 
 searcher:
   image:
@@ -1103,6 +1143,10 @@ searcher:
     name: ""
   # -- Size of the PVC for searcher pods to store cache data
   storageSize: 26Gi
+  # -- Optional subPath for the `searcher` primary data volume mount
+  storageSubPath: ""
+  # -- Optional annotations to add to the `searcher` PVC
+  storageAnnotations: {}
 
 storageClass:
   # -- Enable creation of storageClass.