Skip to content
This repository has been archived by the owner on May 16, 2023. It is now read-only.

Commit

Permalink
[elasticsearch] improve pvc purge
Browse files Browse the repository at this point in the history
`release` label need to be added StatefulSet `spec.selector.matchLabels` to be included in pvc so we can select only pvc matching release
  • Loading branch information
jmlrt committed Oct 18, 2019
1 parent 00cce78 commit 0a9304e
Show file tree
Hide file tree
Showing 12 changed files with 13 additions and 11 deletions.
2 changes: 1 addition & 1 deletion elasticsearch/examples/6.x/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ test: install goss

purge:
helm del --purge $(RELEASE)
for pvc in $$(kubectl get pvc -o name | grep $(RELEASE)); do kubectl delete $$pvc; done
kubectl delete $$(kubectl get pvc -l release=$(RELEASE) -o name)
2 changes: 1 addition & 1 deletion elasticsearch/examples/config/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ test: secrets install goss

purge:
helm del --purge $(RELEASE)
for pvc in $$(kubectl get pvc -o name | grep $(RELEASE)); do kubectl delete $$pvc; done
kubectl delete $$(kubectl get pvc -l release=$(RELEASE) -o name)
2 changes: 1 addition & 1 deletion elasticsearch/examples/default/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ test: install goss

purge:
helm del --purge $(RELEASE)
for pvc in $$(kubectl get pvc -o name | grep $(RELEASE)); do kubectl delete $$pvc; done
kubectl delete $$(kubectl get pvc -l release=$(RELEASE) -o name)
2 changes: 1 addition & 1 deletion elasticsearch/examples/docker-for-mac/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ test: install

purge:
helm del --purge $(RELEASE)
for pvc in $$(kubectl get pvc -o name | grep $(RELEASE)); do kubectl delete $$pvc; done
kubectl delete $$(kubectl get pvc -l release=$(RELEASE) -o name)
2 changes: 1 addition & 1 deletion elasticsearch/examples/kubernetes-kind/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ test: install

purge:
helm del --purge $(RELEASE)
for pvc in $$(kubectl get pvc -o name | grep $(RELEASE)); do kubectl delete $$pvc; done
kubectl delete $$(kubectl get pvc -l release=$(RELEASE) -o name)
2 changes: 1 addition & 1 deletion elasticsearch/examples/minikube/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ test: install

purge:
helm del --purge $(RELEASE)
for pvc in $$(kubectl get pvc -o name | grep $(RELEASE)); do kubectl delete $$pvc; done
kubectl delete $$(kubectl get pvc -l release=$(RELEASE) -o name)
3 changes: 2 additions & 1 deletion elasticsearch/examples/multi/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@ test: install goss
purge:
helm del --purge $(PREFIX)-master
helm del --purge $(PREFIX)-data
for pvc in $$(kubectl get pvc -o name | grep $(PREFIX)); do kubectl delete $$pvc; done
kubectl delete $$(kubectl get pvc -l release=$(PREFIX)-master -o name)
kubectl delete $$(kubectl get pvc -l release=$(PREFIX)-data -o name)
2 changes: 1 addition & 1 deletion elasticsearch/examples/openshift/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ test: install goss

purge:
helm del --purge $(RELEASE)
for pvc in $$(kubectl get pvc -o name | grep $(RELEASE)); do kubectl delete $$pvc; done
kubectl delete $$(kubectl get pvc -l release=$(RELEASE) -o name)
2 changes: 1 addition & 1 deletion elasticsearch/examples/oss/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ test: install goss

purge:
helm del --purge $(RELEASE)
for pvc in $$(kubectl get pvc -o name | grep $(RELEASE)); do kubectl delete $$pvc; done
kubectl delete $$(kubectl get pvc -l release=$(RELEASE) -o name)
2 changes: 1 addition & 1 deletion elasticsearch/examples/security/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ install:
purge:
kubectl delete secrets elastic-credentials elastic-certificates elastic-certificate-pem || true
helm del --purge $(RELEASE)
for pvc in $$(kubectl get pvc -o name | grep $(RELEASE)); do kubectl delete $$pvc; done
kubectl delete $$(kubectl get pvc -l release=$(RELEASE) -o name)

test: secrets install goss

Expand Down
2 changes: 1 addition & 1 deletion elasticsearch/examples/upgrade/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ test: init install goss

purge:
helm del --purge $(RELEASE)
for pvc in $$(kubectl get pvc -o name | grep $(RELEASE)); do kubectl delete $$pvc; done
kubectl delete $$(kubectl get pvc -l release=$(RELEASE) -o name)
1 change: 1 addition & 0 deletions elasticsearch/templates/statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ spec:
selector:
matchLabels:
app: "{{ template "uname" . }}"
release: {{ .Release.Name | quote }}
replicas: {{ .Values.replicas }}
podManagementPolicy: {{ .Values.podManagementPolicy }}
updateStrategy:
Expand Down

0 comments on commit 0a9304e

Please sign in to comment.