overlays: collect PVCs into a separate base (sourcegraph#815)

* overlays: collect PVCs into a separate base

* corresponding overlay generate change

Author: uwedeportivo

overlay-generate-cluster.sh

@@ -14,6 +14,7 @@ trap cleanup EXIT
 cp -R overlays "${BUILD_DIR}"
 cp -R base "${BUILD_DIR}"/overlays/bases/deployments/base
 cp -R base "${BUILD_DIR}"/overlays/bases/rbac-roles/base
+cp -R base "${BUILD_DIR}"/overlays/bases/pvcs/base
 
 mkdir -p $2
 

overlays/bases/deployments/kustomization.yaml

@@ -13,8 +13,6 @@ resources:
   - base/redis/redis-store.Deployment.yaml
   - base/redis/redis-cache.Service.yaml
   - base/redis/redis-cache.Deployment.yaml
-  - base/redis/redis-store.PersistentVolumeClaim.yaml
-  - base/redis/redis-cache.PersistentVolumeClaim.yaml
   - base/indexed-search/indexed-search.StatefulSet.yaml
   - base/indexed-search/indexed-search.Service.yaml
   - base/indexed-search/indexed-search.IndexerService.yaml
@@ -29,14 +27,12 @@ resources:
   - base/syntect-server/syntect-server.Deployment.yaml
   - base/symbols/symbols.Service.yaml
   - base/symbols/symbols.Deployment.yaml
-  - base/pgsql/pgsql.PersistentVolumeClaim.yaml
   - base/pgsql/pgsql.ConfigMap.yaml
   - base/pgsql/pgsql.Service.yaml
   - base/pgsql/pgsql.Deployment.yaml
   - base/prometheus/prometheus.ServiceAccount.yaml
   - base/prometheus/prometheus.ConfigMap.yaml
   - base/prometheus/prometheus.Deployment.yaml
-  - base/prometheus/prometheus.PersistentVolumeClaim.yaml
   - base/prometheus/prometheus.Service.yaml
   - base/query-runner/query-runner.Service.yaml
   - base/query-runner/query-runner.Deployment.yaml
@@ -47,7 +43,6 @@ resources:
   - base/gitserver/gitserver.Service.yaml
   - base/gitserver/gitserver.StatefulSet.yaml
   - base/precise-code-intel/bundle-manager.Deployment.yaml
-  - base/precise-code-intel/bundle-manager.PersistentVolumeClaim.yaml
   - base/precise-code-intel/bundle-manager.Service.yaml
   - base/precise-code-intel/worker.Deployment.yaml
   - base/precise-code-intel/worker.Service.yaml

overlays/bases/pvcs/kustomization.yaml

@@ -0,0 +1,8 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - base/redis/redis-store.PersistentVolumeClaim.yaml
+  - base/redis/redis-cache.PersistentVolumeClaim.yaml
+  - base/pgsql/pgsql.PersistentVolumeClaim.yaml
+  - base/prometheus/prometheus.PersistentVolumeClaim.yaml
+  - base/precise-code-intel/bundle-manager.PersistentVolumeClaim.yaml

overlays/minikube/kustomization.yaml

@@ -4,6 +4,7 @@ namespace: ns-sourcegraph
 bases:
   - ../bases/deployments
   - ../bases/rbac-roles
+  - ../bases/pvcs
 patchesJson6902:
   - target:
       kind: Deployment

overlays/namespaced/kustomization.yaml

@@ -4,5 +4,6 @@ namespace: ns-sourcegraph
 bases:
   - ../bases/deployments
   - ../bases/rbac-roles
+  - ../bases/pvcs
 patchesStrategicMerge:
   - prometheus/prometheus.ClusterRoleBinding.yaml

overlays/non-root/kustomization.yaml

@@ -2,6 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 bases:
   - ../bases/deployments
+  - ../bases/pvcs
 patchesStrategicMerge:
   - frontend/sourcegraph-frontend.Deployment.yaml
   - github-proxy/github-proxy.Deployment.yaml