Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump kube-addon-manager to v6.5 #2400

Merged
merged 1 commit into from
Jan 8, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions deploy/addons/addon-manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions deploy/docker/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions pkg/minikube/constants/constants.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions pkg/minikube/machine/cache_images.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down