From 329d39de840507701622283f629ca473eb65f6b9 Mon Sep 17 00:00:00 2001 From: Kelsey Hightower Date: Thu, 29 Sep 2016 09:12:39 -0700 Subject: [PATCH] use offical kubernetes release --- bin/cleanup.sh | 10 +++++----- deployments/federation-apiserver.yaml | 2 +- deployments/federation-controller-manager.yaml | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bin/cleanup.sh b/bin/cleanup.sh index e332b6d..bda291b 100755 --- a/bin/cleanup.sh +++ b/bin/cleanup.sh @@ -7,9 +7,9 @@ kubectl --context=federation-cluster delete services nginx kubectl --namespace=federation delete pods,svc,rc,deployment,secret --all -gcloud dns managed-zones delete federation +gcloud dns managed-zones delete federation -q -gcloud container clusters delete gce-asia-east1 --zone=asia-east1-b -gcloud container clusters delete gce-europe-west1 --zone=europe-west1-b -gcloud container clusters delete gce-us-central1 --zone=us-central1-b -gcloud container clusters delete gce-us-east1 --zone=us-east1-b +gcloud container clusters delete gce-asia-east1 -q --zone=asia-east1-b +gcloud container clusters delete gce-europe-west1 -q --zone=europe-west1-b +gcloud container clusters delete gce-us-central1 -q --zone=us-central1-b +gcloud container clusters delete gce-us-east1 -q --zone=us-east1-b diff --git a/deployments/federation-apiserver.yaml b/deployments/federation-apiserver.yaml index 95e7f00..a605afa 100644 --- a/deployments/federation-apiserver.yaml +++ b/deployments/federation-apiserver.yaml @@ -15,7 +15,7 @@ spec: spec: containers: - name: apiserver - image: gcr.io/google_containers/hyperkube-amd64:v1.4.0-beta.0 + image: gcr.io/google_containers/hyperkube-amd64:v1.4.0 command: - /hyperkube - federation-apiserver diff --git a/deployments/federation-controller-manager.yaml b/deployments/federation-controller-manager.yaml index a49e660..81a177a 100644 --- a/deployments/federation-controller-manager.yaml +++ b/deployments/federation-controller-manager.yaml @@ -19,7 +19,7 @@ spec: path: /etc/ssl containers: - name: controller-manager - image: gcr.io/google_containers/hyperkube-amd64:v1.4.0-beta.0 + image: gcr.io/google_containers/hyperkube-amd64:v1.4.0 args: - /hyperkube - federation-controller-manager