Merge pull request kubernetes#23937 from zmerlynn/automated-cherry-pi…

…ck-of-#23724-upstream-release-1.2 Automated cherry pick of kubernetes#23724
shyamjvs · Apr 6, 2016 · adac35c · adac35c
2 parents dadac2c + 93fcc08
commit adac35c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/cluster/addons/dashboard/dashboard-controller.yaml b/cluster/addons/dashboard/dashboard-controller.yaml
@@ -3,10 +3,11 @@ kind: ReplicationController
 metadata:
   # Keep the name in sync with image version and
   # gce/coreos/kube-manifests/addons/dashboard counterparts
-  name: kubernetes-dashboard-v1.0.0
+  name: kubernetes-dashboard-v1.0.1
   namespace: kube-system
   labels:
     k8s-app: kubernetes-dashboard
+    version: v1.0.1
     kubernetes.io/cluster-service: "true"
 spec:
   replicas: 1
@@ -16,11 +17,12 @@ spec:
     metadata:
       labels:
         k8s-app: kubernetes-dashboard
+        version: v1.0.1
         kubernetes.io/cluster-service: "true"
     spec:
       containers:
       - name: kubernetes-dashboard
-        image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.0.0
+        image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.0.1
         resources:
           # keep request = limit to keep this container in guaranteed class
           limits:

diff --git a/cluster/gce/coreos/kube-manifests/addons/dashboard/dashboard-controller.yaml b/cluster/gce/coreos/kube-manifests/addons/dashboard/dashboard-controller.yaml
@@ -2,10 +2,11 @@ apiVersion: v1
 kind: ReplicationController
 metadata:
   # Keep this file in sync with addons/dashboard/dashboard-controller.yaml
-  name: kubernetes-dashboard-v1.0.0
+  name: kubernetes-dashboard-v1.0.1
   namespace: kube-system
   labels:
     k8s-app: kubernetes-dashboard
+    version: v1.0.1
     kubernetes.io/cluster-service: "true"
 spec:
   replicas: 1
@@ -15,11 +16,12 @@ spec:
     metadata:
       labels:
         k8s-app: kubernetes-dashboard
+        version: v1.0.1
         kubernetes.io/cluster-service: "true"
     spec:
       containers:
       - name: kubernetes-dashboard
-        image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.0.0
+        image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.0.1
         resources:
           # keep request = limit to keep this container in guaranteed class
           limits: