Update the addon manager. (#1301)

This gets us closer to being able to disable the storage provisioner.

cmd/minikube/cmd/config/config.go

@@ -127,6 +127,12 @@ var settings = []Setting{
 		validations: []setFn{IsValidAddon},
 		callbacks:   []setFn{EnableOrDisableAddon},
 	},
+	{
+		name:        "default-storageclass",
+		set:         SetBool,
+		validations: []setFn{IsValidAddon},
+		callbacks:   []setFn{EnableOrDisableAddon},
+	},
 	{
 		name:        "kube-dns",
 		set:         SetBool,

deploy/addons/addon-manager.yaml

@@ -19,13 +19,13 @@ metadata:
   namespace: kube-system
   labels:
     component: kube-addon-manager
-    version: v6.4-alpha.1
+    version: v6.4
     kubernetes.io/minikube-addons: addon-manager
 spec:
   hostNetwork: true
   containers:
   - name: kube-addon-manager
-    image: gcr.io/google-containers/kube-addon-manager:v6.4-alpha.1
+    image: gcr.io/google-containers/kube-addon-manager:v6.4-beta.1
     imagePullPolicy: IfNotPresent
     resources:
       requests:

deploy/addons/dashboard/dashboard-rc.yaml

@@ -18,22 +18,21 @@ metadata:
   name: kubernetes-dashboard
   namespace: kube-system
   labels:
-    app: kubernetes-dashboard
     version: v1.6.0
-    kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
     kubernetes.io/minikube-addons: dashboard
 spec:
   replicas: 1
   selector:
     app: kubernetes-dashboard
     version: v1.6.0
-    kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
   template:
     metadata:
       labels:
         app: kubernetes-dashboard
         version: v1.6.0
-        kubernetes.io/cluster-service: "true"
+        addonmanager.kubernetes.io/mode: Reconcile
     spec:
       containers:
       - name: kubernetes-dashboard

deploy/addons/dashboard/dashboard-svc.yaml

@@ -20,7 +20,7 @@ metadata:
   namespace: kube-system
   labels:
     app: kubernetes-dashboard
-    kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
     kubernetes.io/minikube-addons: dashboard
     kubernetes.io/minikube-addons-endpoint: dashboard
 spec:

deploy/addons/heapster/grafana-svc.yaml

@@ -14,5 +14,5 @@ spec:
   - port: 80
     targetPort: 3000
   selector:
-    kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
     name: influxGrafana

deploy/addons/heapster/heapster-rc.yaml

@@ -11,7 +11,7 @@ metadata:
 spec:
   replicas: 1
   selector:
-    kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
     k8s-app: heapster
   template:
     metadata:

deploy/addons/heapster/heapster-svc.yaml

@@ -13,5 +13,5 @@ spec:
   - port: 80
     targetPort: 8082
   selector:
-    kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
     k8s-app: heapster

deploy/addons/heapster/influxGrafana-rc.yaml

@@ -24,7 +24,7 @@ metadata:
 spec:
   replicas: 1
   selector:
-    kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
     name: influxGrafana
   template:
     metadata:

deploy/addons/heapster/influxdb-svc.yaml

@@ -16,5 +16,5 @@ spec:
     port: 8086
     targetPort: 8086
   selector:
-    kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
     name: influxGrafana

deploy/addons/ingress/ingress-configmap.yaml

@@ -20,4 +20,4 @@ metadata:
   name: nginx-load-balancer-conf
   namespace: kube-system
   labels:
-    kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile

deploy/addons/ingress/ingress-rc.yaml

@@ -18,17 +18,17 @@ metadata:
   name: default-http-backend
   namespace: kube-system
   labels:
-    kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
 spec:
   replicas: 1
   selector:
     app: default-http-backend
-    kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
   template:
     metadata:
       labels:
         app: default-http-backend
-        kubernetes.io/cluster-service: "true"
+        addonmanager.kubernetes.io/mode: Reconcile
     spec:
       terminationGracePeriodSeconds: 60
       containers:
@@ -62,18 +62,18 @@ metadata:
   namespace: kube-system
   labels:
     app: nginx-ingress-controller
-    kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
 spec:
   replicas: 1
   selector:
     app: nginx-ingress-controller
-    kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
   template:
     metadata:
       labels:
         app: nginx-ingress-controller
         name: nginx-ingress-controller
-        kubernetes.io/cluster-service: "true"
+        addonmanager.kubernetes.io/mode: Reconcile
     spec:
       terminationGracePeriodSeconds: 60
       containers:

deploy/addons/ingress/ingress-svc.yaml

@@ -19,7 +19,7 @@ metadata:
   namespace: kube-system
   labels:
     app: default-http-backend
-    kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
 spec:
   type: NodePort
   ports:

deploy/addons/kube-dns/kube-dns-controller.yaml

@@ -20,7 +20,7 @@ metadata:
   namespace: kube-system
   labels:
     k8s-app: kube-dns
-    kubernetes.io/cluster-service: "true"
+    version: v20
     addonmanager.kubernetes.io/mode: Reconcile
 spec:
   replicas: 1

deploy/addons/kube-dns/kube-dns-svc.yaml

@@ -19,7 +19,7 @@ metadata:
   namespace: kube-system
   labels:
     k8s-app: kube-dns
-    kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
     kubernetes.io/name: "KubeDNS"
 spec:
   selector:

deploy/addons/registry-creds/registry-creds-rc.yaml

@@ -5,20 +5,20 @@ metadata:
   namespace: kube-system
   labels:
     version: v1.7
-    kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
     kubernetes.io/minikube-addons: registry-creds
 spec:
   replicas: 1
   selector:
     name: registry-creds
     version: v1.7
-    kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
   template:
     metadata:
       labels:
         name: registry-creds
         version: v1.7
-        kubernetes.io/cluster-service: "true"
+        addonmanager.kubernetes.io/mode: Reconcile
     spec:
       containers:
       - image: upmcenterprises/registry-creds:1.7
@@ -67,4 +67,4 @@ spec:
       volumes:
       - name: gcr-creds
         secret:
-          secretName: registry-creds-gcr
+          secretName: registry-creds-gcr

deploy/addons/storageclass/storageclass.yaml

@@ -6,6 +6,6 @@ metadata:
   annotations:
     storageclass.beta.kubernetes.io/is-default-class: "true"
   labels:
-    kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
 
 provisioner: k8s.io/minikube-hostpath