Skip to content

Commit 8c61cd3

Browse files
authored
overlays: collect PVCs into a separate base (#815)
* overlays: collect PVCs into a separate base * corresponding overlay generate change
1 parent 552d2e6 commit 8c61cd3

File tree

6 files changed

+12
-5
lines changed

6 files changed

+12
-5
lines changed

Diff for: overlay-generate-cluster.sh

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ trap cleanup EXIT
1414
cp -R overlays "${BUILD_DIR}"
1515
cp -R base "${BUILD_DIR}"/overlays/bases/deployments/base
1616
cp -R base "${BUILD_DIR}"/overlays/bases/rbac-roles/base
17+
cp -R base "${BUILD_DIR}"/overlays/bases/pvcs/base
1718

1819
mkdir -p $2
1920

Diff for: overlays/bases/deployments/kustomization.yaml

-5
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ resources:
1313
- base/redis/redis-store.Deployment.yaml
1414
- base/redis/redis-cache.Service.yaml
1515
- base/redis/redis-cache.Deployment.yaml
16-
- base/redis/redis-store.PersistentVolumeClaim.yaml
17-
- base/redis/redis-cache.PersistentVolumeClaim.yaml
1816
- base/indexed-search/indexed-search.StatefulSet.yaml
1917
- base/indexed-search/indexed-search.Service.yaml
2018
- base/indexed-search/indexed-search.IndexerService.yaml
@@ -29,14 +27,12 @@ resources:
2927
- base/syntect-server/syntect-server.Deployment.yaml
3028
- base/symbols/symbols.Service.yaml
3129
- base/symbols/symbols.Deployment.yaml
32-
- base/pgsql/pgsql.PersistentVolumeClaim.yaml
3330
- base/pgsql/pgsql.ConfigMap.yaml
3431
- base/pgsql/pgsql.Service.yaml
3532
- base/pgsql/pgsql.Deployment.yaml
3633
- base/prometheus/prometheus.ServiceAccount.yaml
3734
- base/prometheus/prometheus.ConfigMap.yaml
3835
- base/prometheus/prometheus.Deployment.yaml
39-
- base/prometheus/prometheus.PersistentVolumeClaim.yaml
4036
- base/prometheus/prometheus.Service.yaml
4137
- base/query-runner/query-runner.Service.yaml
4238
- base/query-runner/query-runner.Deployment.yaml
@@ -47,7 +43,6 @@ resources:
4743
- base/gitserver/gitserver.Service.yaml
4844
- base/gitserver/gitserver.StatefulSet.yaml
4945
- base/precise-code-intel/bundle-manager.Deployment.yaml
50-
- base/precise-code-intel/bundle-manager.PersistentVolumeClaim.yaml
5146
- base/precise-code-intel/bundle-manager.Service.yaml
5247
- base/precise-code-intel/worker.Deployment.yaml
5348
- base/precise-code-intel/worker.Service.yaml

Diff for: overlays/bases/pvcs/kustomization.yaml

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
3+
resources:
4+
- base/redis/redis-store.PersistentVolumeClaim.yaml
5+
- base/redis/redis-cache.PersistentVolumeClaim.yaml
6+
- base/pgsql/pgsql.PersistentVolumeClaim.yaml
7+
- base/prometheus/prometheus.PersistentVolumeClaim.yaml
8+
- base/precise-code-intel/bundle-manager.PersistentVolumeClaim.yaml

Diff for: overlays/minikube/kustomization.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ namespace: ns-sourcegraph
44
bases:
55
- ../bases/deployments
66
- ../bases/rbac-roles
7+
- ../bases/pvcs
78
patchesJson6902:
89
- target:
910
kind: Deployment

Diff for: overlays/namespaced/kustomization.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@ namespace: ns-sourcegraph
44
bases:
55
- ../bases/deployments
66
- ../bases/rbac-roles
7+
- ../bases/pvcs
78
patchesStrategicMerge:
89
- prometheus/prometheus.ClusterRoleBinding.yaml

Diff for: overlays/non-root/kustomization.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
22
kind: Kustomization
33
bases:
44
- ../bases/deployments
5+
- ../bases/pvcs
56
patchesStrategicMerge:
67
- frontend/sourcegraph-frontend.Deployment.yaml
78
- github-proxy/github-proxy.Deployment.yaml

0 commit comments

Comments
 (0)