Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

overlays: collect PVCs into a separate base #815

Merged
merged 2 commits into from
Aug 13, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions overlay-generate-cluster.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
5 changes: 0 additions & 5 deletions overlays/bases/deployments/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -49,7 +45,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
8 changes: 8 additions & 0 deletions overlays/bases/pvcs/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions overlays/minikube/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ namespace: ns-sourcegraph
bases:
- ../bases/deployments
- ../bases/rbac-roles
- ../bases/pvcs
patchesJson6902:
- target:
kind: Deployment
Expand Down
1 change: 1 addition & 0 deletions overlays/namespaced/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@ namespace: ns-sourcegraph
bases:
- ../bases/deployments
- ../bases/rbac-roles
- ../bases/pvcs
patchesStrategicMerge:
- prometheus/prometheus.ClusterRoleBinding.yaml
1 change: 1 addition & 0 deletions overlays/non-root/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down