From c9d8520755d5c3cfa7c43035400fdc0c3759390b Mon Sep 17 00:00:00 2001 From: sandoichi Date: Tue, 5 May 2020 13:01:53 -0400 Subject: [PATCH] add --all flag to uninstall step (#73) * add --all flag to uninstall step * remove another unsupported field from pre 1.15 yaml --- README.md | 2 +- docs/user/cass-operator-manifests-pre-1.15.yaml | 1 - hack/release/make-yaml-bundle.sh | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 0338f1ef8..7d49cb38d 100644 --- a/README.md +++ b/README.md @@ -267,7 +267,7 @@ Kubernetes distribution you're using to do so. Delete your CassandraDatacenters first, otherwise Kubernetes will block deletion because we use a finalizer. ``` -kubectl delete cassdcs --all-namespaces +kubectl delete cassdcs --all-namespaces --all ``` Remove the operator Deployment, CRD, etc. diff --git a/docs/user/cass-operator-manifests-pre-1.15.yaml b/docs/user/cass-operator-manifests-pre-1.15.yaml index 2dfe08e03..e9ea8de7c 100644 --- a/docs/user/cass-operator-manifests-pre-1.15.yaml +++ b/docs/user/cass-operator-manifests-pre-1.15.yaml @@ -544,7 +544,6 @@ webhooks: namespace: cass-operator path: /validate-cassandra-datastax-com-v1beta1-cassandradatacenter failurePolicy: Ignore - matchPolicy: Equivalent name: cassandradatacenter-webhook.cassandra.datastax.com rules: - apiGroups: diff --git a/hack/release/make-yaml-bundle.sh b/hack/release/make-yaml-bundle.sh index ba4d60299..43e125a8a 100755 --- a/hack/release/make-yaml-bundle.sh +++ b/hack/release/make-yaml-bundle.sh @@ -13,5 +13,5 @@ cat operator/deploy/namespace.yaml | yq r - >> "$bundle" echo '---' >> "$bundle" helm template ./charts/cass-operator-chart/ -n cass-operator | kubectl create --dry-run=client -o yaml -n cass-operator -f - >> "$bundle" -grep -v x-kubernetes-preserve-unknown-fields < "$bundle" > docs/user/cass-operator-manifests-pre-1.15.yaml +grep -v "x-kubernetes-preserve-unknown-fields\|matchPolicy" < "$bundle" > docs/user/cass-operator-manifests-pre-1.15.yaml mv "$bundle" docs/user/cass-operator-manifests.yaml