Merge pull request #3984 from tstromberg/v1.14-bugs

Upgrade addon-manager to v9.0 for compatibility with Kubernetes v1.14
kubernetes · Mar 26, 2019 · adc8cf0 · adc8cf0
2 parents 2a32858 + c91da2a
commit adc8cf0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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: v8.6
+    version: v9.0
     kubernetes.io/minikube-addons: addon-manager
 spec:
   hostNetwork: true
   containers:
   - name: kube-addon-manager
-    image: {{default "k8s.gcr.io" .ImageRepository}}/kube-addon-manager:v8.6
+    image: {{default "k8s.gcr.io" .ImageRepository}}/kube-addon-manager:v9.0
     env:
     - name: KUBECONFIG
       value: /var/lib/minikube/kubeconfig

diff --git a/pkg/minikube/constants/constants.go b/pkg/minikube/constants/constants.go
@@ -350,7 +350,7 @@ func GetKubeadmCachedImages(imageRepository string, kubernetesVersionStr string)
 
 	images = append(images, []string{
 		imageRepository + "kubernetes-dashboard-amd64:v1.10.1",
-		imageRepository + "kube-addon-manager:v8.6",
+		imageRepository + "kube-addon-manager:v9.0",
 		minikubeRepository + "storage-provisioner:v1.8.1",
 	}...)