Update template format,remove default storageclass

abeatrix · abeatrix · commit 3130af97a9e7 · 2023-01-28T00:04:09.000-08:00
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,7 @@
-ingress-controller.yaml
-cluster
-cluster.yaml
 generated-cluster
 .env
 .envrc
-.cert
+.crt
 .key
+id_rsa
+known_hosts
diff --git a/base/monitoring/grafana/grafana.StatefulSet.yaml b/base/monitoring/grafana/grafana.StatefulSet.yaml
@@ -74,4 +74,3 @@ spec:
         resources:
           requests:
             storage: 2Gi
-        storageClassName: sourcegraph
diff --git a/base/monitoring/prometheus/prometheus.PersistentVolumeClaim.yaml b/base/monitoring/prometheus/prometheus.PersistentVolumeClaim.yaml
@@ -12,4 +12,3 @@ spec:
   resources:
     requests:
       storage: 200Gi
-  storageClassName: sourcegraph
diff --git a/base/sourcegraph/blobstore/blobstore.PersistentVolumeClaim.yaml b/base/sourcegraph/blobstore/blobstore.PersistentVolumeClaim.yaml
@@ -8,8 +8,7 @@ metadata:
   name: blobstore
 spec:
   accessModes:
-  - ReadWriteOnce
+    - ReadWriteOnce
   resources:
     requests:
       storage: 100Gi
-  storageClassName: sourcegraph
diff --git a/base/sourcegraph/codeinsights-db/codeinsights-db.PersistentVolumeClaim.yaml b/base/sourcegraph/codeinsights-db/codeinsights-db.PersistentVolumeClaim.yaml
@@ -12,4 +12,3 @@ spec:
   resources:
     requests:
       storage: 200Gi
-  storageClassName: sourcegraph
diff --git a/base/sourcegraph/codeintel-db/codeintel-db.PersistentVolumeClaim.yaml b/base/sourcegraph/codeintel-db/codeintel-db.PersistentVolumeClaim.yaml
@@ -12,4 +12,3 @@ spec:
   resources:
     requests:
       storage: 200Gi
-  storageClassName: sourcegraph
diff --git a/base/sourcegraph/gitserver/gitserver.StatefulSet.yaml b/base/sourcegraph/gitserver/gitserver.StatefulSet.yaml
@@ -80,4 +80,3 @@ spec:
             # The size of disk used to mirror your git repositories.
             # If you change this, also change indexed-search's disk size.
             storage: 200Gi
-        storageClassName: sourcegraph
diff --git a/base/sourcegraph/indexed-search/indexed-search.StatefulSet.yaml b/base/sourcegraph/indexed-search/indexed-search.StatefulSet.yaml
@@ -115,4 +115,3 @@ spec:
             # The size of disk to used for search indexes.
             # This should typically be gitserver disk size multipled by the number of gitserver shards.
             storage: 200Gi
-        storageClassName: sourcegraph
diff --git a/base/sourcegraph/pgsql/pgsql.PersistentVolumeClaim.yaml b/base/sourcegraph/pgsql/pgsql.PersistentVolumeClaim.yaml
@@ -12,4 +12,3 @@ spec:
   resources:
     requests:
       storage: 200Gi
-  storageClassName: sourcegraph
diff --git a/base/sourcegraph/redis/redis-cache.PersistentVolumeClaim.yaml b/base/sourcegraph/redis/redis-cache.PersistentVolumeClaim.yaml
@@ -12,4 +12,3 @@ spec:
   resources:
     requests:
       storage: 100Gi
-  storageClassName: sourcegraph
diff --git a/base/sourcegraph/redis/redis-store.PersistentVolumeClaim.yaml b/base/sourcegraph/redis/redis-store.PersistentVolumeClaim.yaml
@@ -12,4 +12,3 @@ spec:
   resources:
     requests:
       storage: 100Gi
-  storageClassName: sourcegraph
diff --git a/base/sourcegraph/searcher/searcher.StatefulSet.yaml b/base/sourcegraph/searcher/searcher.StatefulSet.yaml
@@ -88,4 +88,3 @@ spec:
         resources:
           requests:
             storage: 50G
-        storageClassName: sourcegraph
diff --git a/base/sourcegraph/symbols/symbols.StatefulSet.yaml b/base/sourcegraph/symbols/symbols.StatefulSet.yaml
@@ -93,4 +93,3 @@ spec:
         resources:
           requests:
             storage: 50G
-        storageClassName: sourcegraph
diff --git a/components/clusters/aws/ebs-csi/kustomization.yaml b/components/clusters/aws/ebs-csi/kustomization.yaml
@@ -3,4 +3,4 @@ kind: Component
 components:
   - ../../../storage-class/sourcegraph
   - ../../../storage-class/aws/ebs-csi
-  - ../alb
+  - ../../../ingress/alb
diff --git a/components/clusters/aws/eks-ebs/kustomization.yaml b/components/clusters/aws/eks-ebs/kustomization.yaml
@@ -3,4 +3,4 @@ kind: Component
 components:
   - ../../../storage-class/sourcegraph
   - ../../../storage-class/aws/eks-ebs
-  - ../alb
+  - ../../../ingress/alb
diff --git a/components/clusters/gke/configure/kustomization.yaml b/components/clusters/gke/configure/kustomization.yaml
@@ -1,11 +1,6 @@
 apiVersion: kustomize.config.k8s.io/v1alpha1
 kind: Component
-resources:
-  - frontend.BackendConfig.yaml
 components:
   - ../../../storage-class/sourcegraph
   - ../../../storage-class/gcp
-patchesStrategicMerge:
-  - frontend.Service.yaml
-  - frontend-internal.Service.yaml
-  - frontend.Ingress.yaml
+  - ../../../ingress/gke
diff --git a/components/clusters/minikube/kustomization.yaml b/components/clusters/minikube/kustomization.yaml
@@ -9,7 +9,7 @@ patches:
     path: patches/remove-deployment-resources-container-0.yaml
   - target:
       kind: Deployment
-      name: pgsql|redis-cache|redis-store|codeintel-db
+      name: pgsql|redis-cache|redis-store|codeintel-db|codeinsights-db
       group: apps
       version: v1
     path: patches/remove-deployment-resources-container-1.yaml
@@ -38,3 +38,9 @@ patches:
       - op: replace 
         path: /spec/resources/requests/storage
         value: 10Gi
+  - target:
+      kind: Deployment
+      name: sourcegraph-frontend|pgsql|codeintel-db|codeinsights-db
+      group: apps
+      version: v1
+    path: patches/remove-deployment-resources-container-init.yaml
diff --git a/components/clusters/minikube/patches/remove-deployment-resources-container-init.yaml b/components/clusters/minikube/patches/remove-deployment-resources-container-init.yaml
@@ -0,0 +1,2 @@
+- op: remove
+  path: /spec/template/spec/initContainers/0/resources
diff --git a/components/ingress/alb/README.md b/components/ingress/alb/README.md
diff --git a/components/ingress/alb/frontend.Ingress.yaml b/components/ingress/alb/frontend.Ingress.yaml
diff --git a/components/ingress/alb/kustomization.yaml b/components/ingress/alb/kustomization.yaml
diff --git a/components/ingress/gke/frontend-internal.Service.yaml b/components/ingress/gke/frontend-internal.Service.yaml
diff --git a/components/ingress/gke/frontend.BackendConfig.yaml b/components/ingress/gke/frontend.BackendConfig.yaml
diff --git a/components/ingress/gke/frontend.Ingress.yaml b/components/ingress/gke/frontend.Ingress.yaml
diff --git a/components/ingress/gke/frontend.Service.yaml b/components/ingress/gke/frontend.Service.yaml
diff --git a/components/ingress/gke/kustomization.yaml b/components/ingress/gke/kustomization.yaml
@@ -0,0 +1,8 @@
+apiVersion: kustomize.config.k8s.io/v1alpha1
+kind: Component
+resources:
+  - frontend.BackendConfig.yaml
+patchesStrategicMerge:
+  - frontend.Service.yaml
+  - frontend-internal.Service.yaml
+  - frontend.Ingress.yaml
diff --git a/components/remove/codeinsights-db/kustomization.yaml b/components/remove/codeinsights-db/kustomization.yaml
@@ -0,0 +1,27 @@
+apiVersion: kustomize.config.k8s.io/v1alpha1
+kind: Component
+patchesStrategicMerge:
+  - |-
+    $patch: delete
+    apiVersion: v1
+    kind: ConfigMap
+    metadata:
+      name: codeinsights-db-conf
+  - |-
+    $patch: delete
+    apiVersion: apps/v1
+    kind: Deployment
+    metadata:
+      name: codeinsights-db
+  - |-
+    $patch: delete
+    apiVersion: v1
+    kind: PersistentVolumeClaim
+    metadata:
+      name: codeinsights-db
+  - |-
+    $patch: delete
+    apiVersion: v1
+    kind: Service
+    metadata:
+      name: codeinsights-db
diff --git a/components/remove/codeintel-db/kustomization.yaml b/components/remove/codeintel-db/kustomization.yaml
@@ -0,0 +1,27 @@
+apiVersion: kustomize.config.k8s.io/v1alpha1
+kind: Component
+patchesStrategicMerge:
+  - |-
+    $patch: delete
+    apiVersion: v1
+    kind: ConfigMap
+    metadata:
+      name: codeintel-db-conf
+  - |-
+    $patch: delete
+    apiVersion: apps/v1
+    kind: Deployment
+    metadata:
+      name: codeintel-db
+  - |-
+    $patch: delete
+    apiVersion: v1
+    kind: PersistentVolumeClaim
+    metadata:
+      name: codeintel-db
+  - |-
+    $patch: delete
+    apiVersion: v1
+    kind: Service
+    metadata:
+      name: codeintel-db
diff --git a/components/remove/pgsql/kustomization.yaml b/components/remove/pgsql/kustomization.yaml
@@ -0,0 +1,27 @@
+apiVersion: kustomize.config.k8s.io/v1alpha1
+kind: Component
+patchesStrategicMerge:
+  - |-
+    $patch: delete
+    apiVersion: v1
+    kind: ConfigMap
+    metadata:
+      name: pgsql-conf
+  - |-
+    $patch: delete
+    apiVersion: apps/v1
+    kind: Deployment
+    metadata:
+      name: pgsql
+  - |-
+    $patch: delete
+    apiVersion: v1
+    kind: PersistentVolumeClaim
+    metadata:
+      name: pgsql
+  - |-
+    $patch: delete
+    apiVersion: v1
+    kind: Service
+    metadata:
+      name: pgsql
diff --git a/components/remove/redis/kustomization.yaml b/components/remove/redis/kustomization.yaml
@@ -0,0 +1,39 @@
+apiVersion: kustomize.config.k8s.io/v1alpha1
+kind: Component
+patchesStrategicMerge:
+  - |-
+    $patch: delete
+    apiVersion: apps/v1
+    kind: Deployment
+    metadata:
+      name: redis-cache
+  - |-
+    $patch: delete
+    apiVersion: v1
+    kind: PersistentVolumeClaim
+    metadata:
+      name: redis-cache
+  - |-
+    $patch: delete
+    apiVersion: v1
+    kind: Service
+    metadata:
+      name: redis-cache
+  - |-
+    $patch: delete
+    apiVersion: apps/v1
+    kind: Deployment
+    metadata:
+      name: redis-store
+  - |-
+    $patch: delete
+    apiVersion: v1
+    kind: PersistentVolumeClaim
+    metadata:
+      name: redis-store
+  - |-
+    $patch: delete
+    apiVersion: v1
+    kind: Service
+    metadata:
+      name: redis-store
diff --git a/components/services/symbols/statefulset/patches/symbols.StatefulSet.yaml b/components/services/symbols/statefulset/patches/symbols.StatefulSet.yaml
@@ -57,4 +57,3 @@ spec:
         resources:
           requests:
             storage: 50G
-        storageClassName: sourcegraph
diff --git a/components/storage-class/update-class-name/kustomization.yaml b/components/storage-class/update-class-name/kustomization.yaml
@@ -12,6 +12,18 @@ patchesJson6902:
       group: apps
       version: v1
     path: patches/replace-storageclass-name-sts.yaml
+  - target:
+      kind: StatefulSet|Deployment
+      name: searcher
+      group: apps
+      version: v1
+    path: patches/replace-storageclass-name-sts.yaml
+  - target:
+      kind: StatefulSet|Deployment
+      name: symbols
+      group: apps
+      version: v1
+    path: patches/replace-storageclass-name-sts.yaml
   - target:
       kind: PersistentVolumeClaim
       name: .*
diff --git a/components/storage-class/update-class-name/patches/replace-storageclass-name-deploy.yaml b/components/storage-class/update-class-name/patches/replace-storageclass-name-deploy.yaml
@@ -0,0 +1,4 @@
+- op: replace
+  path: /spec/template/spec/volumeClaimTemplates/0/spec/storageClassName
+  # update your storageclass value in overlays/storageclass/.sourcegraph_config.env
+  value: $(STORAGECLASS_NAME)
diff --git a/components/storage-class/update-class-name/patches/transformer.yaml b/components/storage-class/update-class-name/patches/transformer.yaml
@@ -3,4 +3,7 @@ varReference:
     path: spec/storageClassName
   - kind: StatefulSet
     group: apps
-    path: spec/volumeClaimTemplates/spec/storageClassName
+    path: spec/volumeClaimTemplates/spec/storageClassName
+  - kind: Deployment
+    group: apps
+    path: spec/volumeClaimTemplates/spec/storageClassName
diff --git a/instances/README.md b/instances/README.md
@@ -0,0 +1,24 @@
+# Instances
+
+See the [Sourcegraph Kustomize docs](https://docs.sourcegraph.com/admin/deploy/kubernetes/kustomize) for the latested instructions.
+
+## Create an overlay for your instances
+
+The [instances/template](template) folder contains a file named [kustomization.template.yaml](template/kustomization.template.yaml)) that is preconfigured to construct a Kustomize overlay for deploying Sourcegraph.
+
+**Step 1**: Create a new directory within the `instances` subdirectory.
+
+- The name of this directory, $INSTANCE_NAME, serves as the name of your overlay, for example, dev, prod, staging, etc.
+
+```bash
+# from the root of this repository
+mkdir instances/$INSTANCE_NAME
+```
+
+**Step 2**: Copy the `kustomization.template.yaml` file from the `instances/template` directory to the new directory created in step 1, and rename it to `kustomization.yaml`.
+
+```bash
+cp instances/template/kustomization.template.yaml instances/$INSTANCE_NAME/kustomization.yaml
+```
+
+**Step 3**: You can begin customizing your Sourcegraph deployment by updating the [kustomization.yaml file](https://docs.sourcegraph.com/admin/deploy/kubernetes/kustomize/intro#kustomization-yaml) inside $INSTANCE_NAME (the directory for your instance). Please follow our [configuration guides](https://docs.sourcegraph.com/admin/deploy/kubernetes/kustomize/configure.md) for guidance.
diff --git a/instances/template/kustomization.template.yaml b/instances/template/kustomization.template.yaml
diff --git a/overlays/README.md b/overlays/README.md
diff --git a/overlays/template/kustomization.template.yaml b/overlays/template/kustomization.template.yaml
