From b1091853cc55edc36946382a66392c686439eb76 Mon Sep 17 00:00:00 2001 From: kairen Date: Sun, 7 Jan 2018 01:59:11 +0800 Subject: [PATCH] Bump kube-addon-manager to v6.5 --- deploy/addons/addon-manager.yaml | 4 ++-- deploy/docker/README.md | 4 ++-- pkg/minikube/constants/constants.go | 4 ++-- pkg/minikube/machine/cache_images.go | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/deploy/addons/addon-manager.yaml b/deploy/addons/addon-manager.yaml index 780b602ae806..ea2314c64259 100644 --- a/deploy/addons/addon-manager.yaml +++ b/deploy/addons/addon-manager.yaml @@ -19,13 +19,13 @@ metadata: namespace: kube-system labels: component: kube-addon-manager - version: v6.4 + version: v6.5 kubernetes.io/minikube-addons: addon-manager spec: hostNetwork: true containers: - name: kube-addon-manager - image: gcr.io/google-containers/kube-addon-manager:v6.4-beta.2 + image: gcr.io/google-containers/kube-addon-manager:v6.5 env: - name: KUBECONFIG value: /var/lib/localkube/kubeconfig diff --git a/deploy/docker/README.md b/deploy/docker/README.md index 7d23fe06a857..358e11b5e972 100644 --- a/deploy/docker/README.md +++ b/deploy/docker/README.md @@ -66,13 +66,13 @@ metadata: namespace: kube-system labels: component: kube-addon-manager - version: v6.4 + version: v6.5 kubernetes.io/minikube-addons: addon-manager spec: hostNetwork: true containers: - name: kube-addon-manager - image: gcr.io/google-containers/kube-addon-manager:v6.4-beta.2 + image: gcr.io/google-containers/kube-addon-manager:v6.5 imagePullPolicy: IfNotPresent resources: requests: diff --git a/pkg/minikube/constants/constants.go b/pkg/minikube/constants/constants.go index 29a93f27cc87..7818dee473eb 100644 --- a/pkg/minikube/constants/constants.go +++ b/pkg/minikube/constants/constants.go @@ -176,7 +176,7 @@ var LocalkubeCachedImages = []string{ "k8s.gcr.io/k8s-dns-sidecar-amd64:1.14.5", // Addon Manager - "gcr.io/google-containers/kube-addon-manager:v6.4-beta.2", + "gcr.io/google-containers/kube-addon-manager:v6.5", // Pause "k8s.gcr.io/pause-amd64:3.0", @@ -191,7 +191,7 @@ func GetKubeadmCachedImages(version string) []string { "k8s.gcr.io/kubernetes-dashboard-amd64:v1.6.3", // Addon Manager - "gcr.io/google-containers/kube-addon-manager:v6.4-beta.2", + "gcr.io/google-containers/kube-addon-manager:v6.5", // Pause "k8s.gcr.io/pause-amd64:3.0", diff --git a/pkg/minikube/machine/cache_images.go b/pkg/minikube/machine/cache_images.go index b138d8ac341b..dcf4ec447e0d 100644 --- a/pkg/minikube/machine/cache_images.go +++ b/pkg/minikube/machine/cache_images.go @@ -58,8 +58,8 @@ func CacheImagesForBootstrapper(version string, clusterBootstrapper string) erro // CacheImages will cache images on the host // // The cache directory currently caches images using the imagename_tag -// For example, gcr.io/google-containers-kube-addon-manager:v6.4-beta.2 would be -// stored at $CACHE_DIR/gcr.io/google-containers/kube-addon-manager_v6.4-beta.2 +// For example, gcr.io/google-containers-kube-addon-manager:v6.5 would be +// stored at $CACHE_DIR/gcr.io/google-containers/kube-addon-manager_v6.5 func CacheImages(images []string, cacheDir string) error { var g errgroup.Group for _, image := range images {