From b88bebded5ea0c7c38e83ff4c1faa2889cb9cd34 Mon Sep 17 00:00:00 2001 From: Janet Kuo Date: Mon, 21 Nov 2016 10:58:38 -0800 Subject: [PATCH 1/2] Remove initialized annotation from statefulset examples --- .../calico-policy-controller/calico-etcd-statefulset.yaml | 2 -- examples/cockroachdb/cockroachdb-statefulset.yaml | 1 - examples/storage/cassandra/README.md | 2 -- examples/storage/cassandra/cassandra-statefulset.yaml | 2 -- hack/testdata/nginx-statefulset.yaml | 2 -- test/e2e/testing-manifests/petset/cockroachdb/petset.yaml | 1 - test/e2e/testing-manifests/petset/mysql-galera/petset.yaml | 1 - test/e2e/testing-manifests/petset/redis/petset.yaml | 1 - test/e2e/testing-manifests/petset/zookeeper/petset.yaml | 1 - 9 files changed, 13 deletions(-) diff --git a/cluster/addons/calico-policy-controller/calico-etcd-statefulset.yaml b/cluster/addons/calico-policy-controller/calico-etcd-statefulset.yaml index e7981f442fc..77fd12e522e 100644 --- a/cluster/addons/calico-policy-controller/calico-etcd-statefulset.yaml +++ b/cluster/addons/calico-policy-controller/calico-etcd-statefulset.yaml @@ -11,8 +11,6 @@ spec: replicas: 1 template: metadata: - annotations: - pod.alpha.kubernetes.io/initialized: "true" labels: kubernetes.io/cluster-service: "true" k8s-app: calico-etcd diff --git a/examples/cockroachdb/cockroachdb-statefulset.yaml b/examples/cockroachdb/cockroachdb-statefulset.yaml index 143172494b8..3f2e5f8050b 100644 --- a/examples/cockroachdb/cockroachdb-statefulset.yaml +++ b/examples/cockroachdb/cockroachdb-statefulset.yaml @@ -66,7 +66,6 @@ spec: labels: app: cockroachdb annotations: - pod.alpha.kubernetes.io/initialized: "true" # Init containers are run only once in the lifetime of a pod, before # it's started up for the first time. It has to exit successfully # before the pod's main containers are allowed to start. diff --git a/examples/storage/cassandra/README.md b/examples/storage/cassandra/README.md index c7ec320ce4d..06cdb500e04 100644 --- a/examples/storage/cassandra/README.md +++ b/examples/storage/cassandra/README.md @@ -188,8 +188,6 @@ spec: replicas: 3 template: metadata: - annotations: - pod.alpha.kubernetes.io/initialized: "true" labels: app: cassandra spec: diff --git a/examples/storage/cassandra/cassandra-statefulset.yaml b/examples/storage/cassandra/cassandra-statefulset.yaml index 302a3b9a953..d6f3b1ce5c6 100644 --- a/examples/storage/cassandra/cassandra-statefulset.yaml +++ b/examples/storage/cassandra/cassandra-statefulset.yaml @@ -7,8 +7,6 @@ spec: replicas: 3 template: metadata: - annotations: - pod.alpha.kubernetes.io/initialized: "true" labels: app: cassandra spec: diff --git a/hack/testdata/nginx-statefulset.yaml b/hack/testdata/nginx-statefulset.yaml index b28782a3e42..299e407dfa3 100644 --- a/hack/testdata/nginx-statefulset.yaml +++ b/hack/testdata/nginx-statefulset.yaml @@ -27,8 +27,6 @@ spec: metadata: labels: app: nginx-statefulset - annotations: - pod.alpha.kubernetes.io/initialized: "true" spec: terminationGracePeriodSeconds: 0 containers: diff --git a/test/e2e/testing-manifests/petset/cockroachdb/petset.yaml b/test/e2e/testing-manifests/petset/cockroachdb/petset.yaml index 88aeda1f133..053e41a00d6 100644 --- a/test/e2e/testing-manifests/petset/cockroachdb/petset.yaml +++ b/test/e2e/testing-manifests/petset/cockroachdb/petset.yaml @@ -10,7 +10,6 @@ spec: labels: app: cockroachdb annotations: - pod.alpha.kubernetes.io/initialized: "true" # Init containers are run only once in the lifetime of a pod, before # it's started up for the first time. It has to exit successfully # before the pod's main containers are allowed to start. diff --git a/test/e2e/testing-manifests/petset/mysql-galera/petset.yaml b/test/e2e/testing-manifests/petset/mysql-galera/petset.yaml index c499837889d..f80d1c82bd9 100644 --- a/test/e2e/testing-manifests/petset/mysql-galera/petset.yaml +++ b/test/e2e/testing-manifests/petset/mysql-galera/petset.yaml @@ -10,7 +10,6 @@ spec: labels: app: mysql annotations: - pod.alpha.kubernetes.io/initialized: "true" pod.alpha.kubernetes.io/init-containers: '[ { "name": "install", diff --git a/test/e2e/testing-manifests/petset/redis/petset.yaml b/test/e2e/testing-manifests/petset/redis/petset.yaml index 73a4f925022..ff770733df9 100644 --- a/test/e2e/testing-manifests/petset/redis/petset.yaml +++ b/test/e2e/testing-manifests/petset/redis/petset.yaml @@ -10,7 +10,6 @@ spec: labels: app: redis annotations: - pod.alpha.kubernetes.io/initialized: "true" pod.alpha.kubernetes.io/init-containers: '[ { "name": "install", diff --git a/test/e2e/testing-manifests/petset/zookeeper/petset.yaml b/test/e2e/testing-manifests/petset/zookeeper/petset.yaml index aefd42e9d88..3f454ebd9f9 100644 --- a/test/e2e/testing-manifests/petset/zookeeper/petset.yaml +++ b/test/e2e/testing-manifests/petset/zookeeper/petset.yaml @@ -10,7 +10,6 @@ spec: labels: app: zk annotations: - pod.alpha.kubernetes.io/initialized: "true" pod.alpha.kubernetes.io/init-containers: '[ { "name": "install", From 90e5971a525afabff900d2974f14964d81bdbda0 Mon Sep 17 00:00:00 2001 From: Janet Kuo Date: Mon, 21 Nov 2016 11:10:04 -0800 Subject: [PATCH 2/2] Remove alpha limitation on PetSet in cassandra example --- examples/storage/cassandra/README.md | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/examples/storage/cassandra/README.md b/examples/storage/cassandra/README.md index 06cdb500e04..5055fd816ea 100644 --- a/examples/storage/cassandra/README.md +++ b/examples/storage/cassandra/README.md @@ -396,16 +396,13 @@ functionality, like a Deployment, ReplicaSet, Replication Controller, or Job. ## Step 4: Delete Cassandra StatefulSet -There are some limitations with the Alpha release of PetSet in 1.3. From the [documentation](http://kubernetes.io/docs/user-guide/petset/): - -"Deleting the StatefulSet will not delete any pods. You will either have to manually scale it down to 0 pods first, or delete the pods yourself. -Deleting and/or scaling a StatefulSet down will not delete the volumes associated with the StatefulSet. This is done to ensure safety first, your data is more valuable than an auto purge of all related StatefulSet resources. Deleting the Persistent Volume Claims will result in a deletion of the associated volumes." +Deleting and/or scaling a StatefulSet down will not delete the volumes associated with the StatefulSet. This is done to ensure safety first, your data is more valuable than an auto purge of all related StatefulSet resources. Deleting the Persistent Volume Claims may result in a deletion of the associated volumes, depending on the storage class and reclaim policy. You should never assume ability to access a volume after claim deletion. Use the following commands to delete the StatefulSet. ```console $ grace=$(kubectl get po cassandra-0 --template '{{.spec.terminationGracePeriodSeconds}}') \ - && kubectl delete statefulset,po -l app=cassandra \ + && kubectl delete statefulset -l app=cassandra \ && echo "Sleeping $grace" \ && sleep $grace \ && kubectl delete pvc -l app=cassandra