Remove symbols statefulset

charts/sourcegraph/CHANGELOG.md

@@ -11,6 +11,7 @@ Use `**BREAKING**:` to denote a breaking change
 - Fix Pod Disruption Budget for sourcegraph-frontend
 - Added a startup probe to the gitserver statefulset to give it time to run the on-disk migration from repo names to repo IDs
 - The repo-updater service is no longer needed and has been removed from the chart.
+- The symbols service is no longer needed and has been removed from the chart. Consider merging env vars and resource overrides given to symbols into searcher before upgrading.
 
 ## 5.10.0
 

charts/sourcegraph/README.md

@@ -298,7 +298,7 @@ In addition to the documented values, all services also support the following va
 | searcher.resources | object | `{"limits":{"cpu":"2","memory":"2G"},"requests":{"cpu":"500m","memory":"500M"}}` | Resource requests & limits for the `searcher` container, learn more from the [Kubernetes documentation](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) |
 | searcher.serviceAccount.create | bool | `false` | Enable creation of ServiceAccount for `searcher` |
 | searcher.serviceAccount.name | string | `""` | Name of the ServiceAccount to be created or an existing ServiceAccount |
-| searcher.storageSize | string | `"26Gi"` | Size of the PVC for searcher pods to store cache data |
+| searcher.storageSize | string | `"52Gi"` | Size of the PVC for searcher pods to store cache data |
 | sourcegraph.affinity | object | `{}` | Global Affinity, learn more from the [Kubernetes documentation](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity) |
 | sourcegraph.image.defaultTag | string | `"{{ .Chart.AppVersion }}"` | Global docker image tag |
 | sourcegraph.image.pullPolicy | string | `"IfNotPresent"` | Global docker image pull policy |
@@ -320,16 +320,6 @@ In addition to the documented values, all services also support the following va
 | storageClass.parameters | object | `{}` | Extra parameters of storageClass, consult your cloud provider persistent storage documentation |
 | storageClass.provisioner | string | `"kubernetes.io/gce-pd"` | Name of the storageClass provisioner, learn more from the [Kubernetes documentation](https://kubernetes.io/docs/concepts/storage/storage-classes/#provisioner) and consult your cloud provider persistent storage documentation |
 | storageClass.type | string | `"pd-ssd"` | Value of `type` key in storageClass `parameters`, consult your cloud provider persistent storage documentation |
-| symbols.containerSecurityContext | object | `{"allowPrivilegeEscalation":false,"readOnlyRootFilesystem":true,"runAsGroup":101,"runAsUser":100}` | Security context for the `symbols` container, learn more from the [Kubernetes documentation](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container) |
-| symbols.image.defaultTag | string | `"6.0.0@sha256:7f91048d1966add54b199755c77a5c3ca84b7f57bb5d2ffb65113da7f100b051"` | Docker image tag for the `symbols` image |
-| symbols.image.name | string | `"symbols"` | Docker image name for the `symbols` image |
-| symbols.name | string | `"symbols"` | Name used by resources. Does not affect service names or PVCs. |
-| symbols.podSecurityContext | object | `{"fsGroup":101,"fsGroupChangePolicy":"OnRootMismatch","runAsUser":100}` | Security context for the `symbols` pod, learn more from the [Kubernetes documentation](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod) |
-| symbols.replicaCount | int | `1` | Number of `symbols` pod |
-| symbols.resources | object | `{"limits":{"cpu":"2","memory":"2G"},"requests":{"cpu":"500m","memory":"500M"}}` | Resource requests & limits for the `symbols` container, learn more from the [Kubernetes documentation](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) |
-| symbols.serviceAccount.create | bool | `false` | Enable creation of ServiceAccount for `symbols` |
-| symbols.serviceAccount.name | string | `""` | Name of the ServiceAccount to be created or an existing ServiceAccount |
-| symbols.storageSize | string | `"12Gi"` | Size of the PVC for symbols pods to store cache data |
 | syntacticCodeIntel.containerSecurityContext | object | `{"allowPrivilegeEscalation":false,"readOnlyRootFilesystem":true,"runAsGroup":101,"runAsUser":100}` | Security context for the `syntactic-code-intel-worker` container, learn more from the [Kubernetes documentation](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container) |
 | syntacticCodeIntel.enabled | bool | `false` |  |
 | syntacticCodeIntel.image.defaultTag | string | `"6.0.0@sha256:50bdeb38b196f0fc21404969016bf8263f78144292e905867e93480f66c8251c"` | Docker image tag for the `syntactic-code-intel-worker` image |

charts/sourcegraph/examples/advanced-scheduling/override.yaml

@@ -93,19 +93,6 @@ searcher:
                 app: searcher
           weight: 100
 
-symbols:
-  replicaCount: 3
-  affinity:
-    podAntiAffinity:
-      preferredDuringSchedulingIgnoredDuringExecution:
-        - podAffinityTerm:
-            topologyKey: kubernetes.io/hostname
-            labelSelector:
-              matchLabels:
-                <<: *commonSelectorLabels
-                app: symbols
-          weight: 100
-
 worker:
   replicaCount: 3
   affinity:

charts/sourcegraph/examples/basic/override.yaml

@@ -64,14 +64,3 @@ searcher:
     requests:
       cpu: 500m
       memory: 1G
-
-symbols:
-  resources:
-    limits:
-      cpu: "4"
-      memory: 4G
-      ephemeral-storage: "10G"
-    requests:
-      cpu: "1"
-      memory: 1G
-      ephemeral-storage: "10G"

charts/sourcegraph/examples/common-modifications/override.yaml

@@ -183,19 +183,6 @@ searcher:
       ephemeral-storage: 25G
       memory: 500M
 
-
-symbols:
-  replicaCount: 1
-  resources:
-    limits:
-      cpu: "2"
-      ephemeral-storage: 12G
-      memory: 2G
-    requests:
-      cpu: 500m
-      ephemeral-storage: 10G
-      memory: 500M
-
 syntectServer:
   replicaCount: 1
   resources:

charts/sourcegraph/examples/gcp/override.yaml

@@ -74,11 +74,6 @@ searcher:
     SRC_LOG_FORMAT: 
       value: json_gcp
 
-symbols:
-  env:
-    SRC_LOG_FORMAT: 
-      value: json_gcp
-
 syntectServer:
   env:
     SRC_LOG_FORMAT: 

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

@@ -56,11 +56,20 @@ spec:
           {{- $item | toYaml | nindent 10 }}
         {{- end }}
         - name: SEARCHER_CACHE_SIZE_MB
-          # Set the cache size to ~90% of the PVC size
+          # Set the cache size to ~45% of the PVC size
           {{- if .Values.searcher.storageSize }}
-          value: {{ trimSuffix "Gi" .Values.searcher.storageSize | mul 900 | quote }}
+          value: {{ trimSuffix "Gi" .Values.searcher.storageSize | mul 450 | quote }}
           {{- else }}
-          # This value is ~90% of the default value for
+          # This value is ~45% of the default value for
+          # storageSize in the VolumeClaimTemplate below
+          value: "23400"  
+          {{- end }}
+        - name: SYMBOLS_CACHE_SIZE_MB
+          # Set the cache size to ~45% of the PVC size
+          {{- if .Values.searcher.storageSize }}
+          value: {{ trimSuffix "Gi" .Values.searcher.storageSize | mul 450 | quote }}
+          {{- else }}
+          # This value is ~45% of the default value for
           # storageSize in the VolumeClaimTemplate below
           value: "23400"  
           {{- end }}

charts/sourcegraph/tests/priorityClass_test.yaml

@@ -96,15 +96,6 @@ tests:
   - equal:
       path: spec.template.spec.priorityClassName
       value: searcher-class
-- it: set priority class on symbols
-  template: symbols/symbols.StatefulSet.yaml
-  set:
-    symbols:
-      priorityClassName: symbols-class
-  asserts:
-  - equal:
-      path: spec.template.spec.priorityClassName
-      value: symbols-class
 - it: set priority class on redisCache
   template: redis/redis-cache.Deployment.yaml
   set:

charts/sourcegraph/values.yaml

@@ -1073,7 +1073,7 @@ searcher:
     # -- Name of the ServiceAccount to be created or an existing ServiceAccount
     name: ""
   # -- Size of the PVC for searcher pods to store cache data
-  storageSize: 26Gi
+  storageSize: 52Gi
 
 storageClass:
   # -- Enable creation of storageClass.
@@ -1096,46 +1096,6 @@ storageClass:
   # learn more from the [Kubernetes documentation](https://kubernetes.io/docs/concepts/storage/storage-classes/#allowed-topologies)
   allowedTopologies: []
 
-symbols:
-  image:
-    # -- Docker image tag for the `symbols` image
-    defaultTag: 6.0.0@sha256:7f91048d1966add54b199755c77a5c3ca84b7f57bb5d2ffb65113da7f100b051
-    # -- Docker image name for the `symbols` image
-    name: "symbols"
-  # -- Security context for the `symbols` container,
-  # learn more from the [Kubernetes documentation](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container)
-  containerSecurityContext:
-    allowPrivilegeEscalation: false
-    runAsUser: 100
-    runAsGroup: 101
-    readOnlyRootFilesystem: true
-  # -- Security context for the `symbols` pod,
-  # learn more from the [Kubernetes documentation](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod)
-  podSecurityContext:
-    runAsUser: 100
-    fsGroup: 101
-    fsGroupChangePolicy: "OnRootMismatch"
-  # -- Name used by resources. Does not affect service names or PVCs.
-  name: "symbols"
-  # -- Number of `symbols` pod
-  replicaCount: 1
-  # -- Resource requests & limits for the `symbols` container,
-  # learn more from the [Kubernetes documentation](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/)
-  resources:
-    limits:
-      cpu: "2"
-      memory: 2G
-    requests:
-      cpu: 500m
-      memory: 500M
-  serviceAccount:
-    # -- Enable creation of ServiceAccount for `symbols`
-    create: false
-    # -- Name of the ServiceAccount to be created or an existing ServiceAccount
-    name: ""
-  # -- Size of the PVC for symbols pods to store cache data
-  storageSize: 12Gi
-
 syntectServer:
   image:
     # -- Docker image tag for the `syntect-server` image