Lower default storage size

abeatrix · abeatrix · commit 3476ee5c05e0 · 2023-02-15T12:06:13.000-08:00
diff --git a/README.md b/README.md
@@ -3,16 +3,12 @@
 [![sourcegraph: beta](https://img.shields.io/badge/sourcegraph-beta-blue.svg)](https://sourcegraph.com/github.com/sourcegraph/deploy-sourcegrap-k8s)
 
 > **Warning**
-> The contents of this repository are currently in beta and have not been officially released. While we encourage testing and feedback, please do not use this in production environments. We cannot guarantee support for these beta features and recommend that you use them at your own risk. We will keep you updated as development progresses and official releases become available.
+> The contents of this repository are currently in beta and will not be officially released until v4.5.0. While we encourage testing and feedback, please do not use this in production environments. We cannot guarantee support for these beta features and recommend that you use them at your own risk. We will keep you updated as development progresses and official releases become available.
 
 Deploying Sourcegraph into a Kubernetes cluster is for organizations that need highly scalable and
 available code search and code intelligence. This repository contains documentation for creating,
 updating, and maintaining a Sourcegraph cluster using Kustomize.
 
-For product and [pricing](https://about.sourcegraph.com/pricing/) information, visit
-[about.sourcegraph.com](https://about.sourcegraph.com) or [contact
-us](https://about.sourcegraph.com/contact/sales) for more information.
-
 - [Installing](https://docs.sourcegraph.com/admin/deploy/kubernetes)
 - [Configuring](https://docs.sourcegraph.com/admin/deploy/kubernetes/kustomize/configure)
 - [Updating](https://docs.sourcegraph.com/admin/updates/kubernetes)
@@ -22,17 +18,15 @@ us](https://about.sourcegraph.com/contact/sales) for more information.
 - [Enterprise Getting Started Guide](https://docs.sourcegraph.com/adopt/enterprise_getting_started_guide#kubernetes-admin) and [Admin guide](https://docs.sourcegraph.com/admin) - useful guides for Sourcegraph admins
   - [Metrics](https://docs.sourcegraph.com/admin/observability/metrics) - guidance of metrics that can be used for monitoring Sourcegraph
 
-## Deploying
-
-🚨 **Please use the branch corresponding to the version of Sourcegraph you wish to deploy, e.g. `git checkout v4.5.0`.**
+## Deploy
 
-Always refer to the [Sourcegraph Kustomize docs](https://docs.sourcegraph.com/admin/deploy/kubernetes/kustomize) for the latest instructions.
+Please refer to the [Sourcegraph Kustomize docs](https://docs.sourcegraph.com/admin/deploy/kubernetes/kustomize) for the latest instructions.
 
-## Upgrading
+## Upgrade
 
-When upgrading Sourcegraph, please check [upgrading docs](https://docs.sourcegraph.com/admin/updates/kubernetes) to confirm if manual migrations is necessary.
+When upgrading Sourcegraph, please check the [upgrade docs for Kubernetes](https://docs.sourcegraph.com/admin/updates/kubernetes) to confirm if manual migrations is necessary.
 
-## Contributing
+## Development
 
 The `dev` branch is used to track development.
 
@@ -45,3 +39,7 @@ We've made our deployment configurations open source to better serve our custome
 ## Licensing
 
 The contents of this repository are open-source licensed. However, it makes reference to non-open-source images and actually running Sourcegraph using this repository falls under Sourcegraph's [enterprise license terms](https://about.sourcegraph.com/pricing/).
+
+For product and [pricing](https://about.sourcegraph.com/pricing/) information, visit
+[about.sourcegraph.com](https://about.sourcegraph.com) or [contact
+us](https://about.sourcegraph.com/contact/sales) for more information.
diff --git a/base/monitoring/prometheus/prometheus.PersistentVolumeClaim.yaml b/base/monitoring/prometheus/prometheus.PersistentVolumeClaim.yaml
@@ -11,4 +11,4 @@ spec:
     - ReadWriteOnce
   resources:
     requests:
-      storage: 200Gi
+      storage: 50Gi
diff --git a/base/sourcegraph/blobstore/blobstore.PersistentVolumeClaim.yaml b/base/sourcegraph/blobstore/blobstore.PersistentVolumeClaim.yaml
@@ -11,4 +11,4 @@ spec:
     - ReadWriteOnce
   resources:
     requests:
-      storage: 100Gi
+      storage: 20Gi
diff --git a/base/sourcegraph/codeinsights-db/codeinsights-db.PersistentVolumeClaim.yaml b/base/sourcegraph/codeinsights-db/codeinsights-db.PersistentVolumeClaim.yaml
@@ -11,4 +11,4 @@ spec:
     - ReadWriteOnce
   resources:
     requests:
-      storage: 200Gi
+      storage: 50Gi
diff --git a/base/sourcegraph/codeintel-db/codeintel-db.PersistentVolumeClaim.yaml b/base/sourcegraph/codeintel-db/codeintel-db.PersistentVolumeClaim.yaml
@@ -11,4 +11,4 @@ spec:
     - ReadWriteOnce
   resources:
     requests:
-      storage: 200Gi
+      storage: 50Gi
diff --git a/base/sourcegraph/redis/redis-cache.PersistentVolumeClaim.yaml b/base/sourcegraph/redis/redis-cache.PersistentVolumeClaim.yaml
@@ -11,4 +11,4 @@ spec:
     - ReadWriteOnce
   resources:
     requests:
-      storage: 100Gi
+      storage: 50Gi
diff --git a/base/sourcegraph/redis/redis-store.PersistentVolumeClaim.yaml b/base/sourcegraph/redis/redis-store.PersistentVolumeClaim.yaml
@@ -11,4 +11,4 @@ spec:
     - ReadWriteOnce
   resources:
     requests:
-      storage: 100Gi
+      storage: 50Gi
diff --git a/base/sourcegraph/searcher/searcher.StatefulSet.yaml b/base/sourcegraph/searcher/searcher.StatefulSet.yaml
@@ -31,8 +31,8 @@ spec:
       containers:
         - name: searcher
           env:
-            # - name: SEARCHER_CACHE_SIZE_MB
-            #   value: "500000"
+            - name: SEARCHER_CACHE_SIZE_MB
+              value: "25000"
             - name: POD_NAME
               valueFrom:
                 fieldRef:
@@ -74,16 +74,16 @@ spec:
             runAsUser: 100
           volumeMounts:
             - mountPath: /mnt/cache
-              name: cache-ssd
+              name: cache
       volumes:
         - emptyDir: {}
-          name: cache-ssd
+          name: cache
   volumeClaimTemplates:
     - metadata:
-        name: cache-ssd
+        name: cache
       spec:
         accessModes:
           - ReadWriteOnce
         resources:
           requests:
-            storage: 50G
+            storage: 30G
diff --git a/base/sourcegraph/symbols/symbols.StatefulSet.yaml b/base/sourcegraph/symbols/symbols.StatefulSet.yaml
@@ -29,8 +29,8 @@ spec:
       containers:
         - name: symbols
           env:
-            # - name: SYMBOLS_CACHE_SIZE_MB
-            #   value: "500000"
+            - name: SYMBOLS_CACHE_SIZE_MB
+              value: "12000"
             - name: POD_NAME
               valueFrom:
                 fieldRef:
@@ -77,18 +77,18 @@ spec:
           terminationMessagePolicy: FallbackToLogsOnError
           volumeMounts:
             - mountPath: /mnt/cache
-              name: cache-ssd
+              name: cache
       volumes:
-        - name: cache-ssd
+        - name: cache
           emptyDir: {}
   updateStrategy:
     type: RollingUpdate
   volumeClaimTemplates:
     - metadata:
-        name: cache-ssd
+        name: cache
       spec:
         accessModes:
           - ReadWriteOnce
         resources:
           requests:
-            storage: 50G
+            storage: 12G
diff --git a/components/services/searcher/deployment/patches/searcher.Deployment.yaml b/components/services/searcher/deployment/patches/searcher.Deployment.yaml
@@ -15,6 +15,7 @@ spec:
         - name: searcher
           env:
             - name: SEARCHER_CACHE_SIZE_MB
+              value: null
               valueFrom:
                 resourceFieldRef:
                   containerName: searcher
diff --git a/components/services/symbols/deployment/patches/symbols.Deployment.yaml b/components/services/symbols/deployment/patches/symbols.Deployment.yaml
@@ -14,6 +14,7 @@ spec:
         - name: symbols
           env:
             - name: SYMBOLS_CACHE_SIZE_MB
+              value: null
               valueFrom:
                 resourceFieldRef:
                   containerName: symbols
@@ -23,6 +24,8 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.name
+              $patch: delete
+              value: ""
             - name: CACHE_DIR
               value: /mnt/cache/$(POD_NAME)
               # OTEL_AGENT_HOST must be defined before OTEL_EXPORTER_OTLP_ENDPOINT to substitute the node IP on which the DaemonSet pod instance runs in the latter variable
diff --git a/instances/template/kustomization.template.yaml b/instances/template/kustomization.template.yaml
@@ -194,6 +194,25 @@ components:
 #   - patches/custom.NodePort.yaml
 #   - patches/resources.yaml
 
+# ------------------------------------------------------------------------
+# Storage Size
+# ------------------------------------------------------------------------
+# patchesJson6902:
+#   - target:
+#       kind: PersistentVolumeClaim
+#       name: blobstore|codeinsights-db|codeintel-db|pgsql|prometheus|redis-store|redis-cache
+#     patch: |-
+#       - op: replace
+#         path: /spec/resources/requests/storage
+#         value: 100Gi
+#   - target:
+#       kind: StatefulSet
+#       name: gitserver|indexed-search|searcher|symbols
+#     patch: |-
+#       - op: replace
+#         path: /spec/volumeClaimTemplates/0/spec/resources/requests/storage
+#         value: 200Gi
+
 ##########################################################################################
 # [BUILD CONFIGURATIONS] Handles updating configs using env vars for kustomize
 #
