Merge pull request #32666 from bryk/release-1.4-final

Automatic merge from submit-queue Set Dashboard UI to final 1.4 version Release info: https://github.com/kubernetes/dashboard/releases/tag/v1.4.0 Diff since beta2: a few bug fixes. This is final release for this quarter.

Merge pull request #32666 from bryk/release-1.4-final
641682c0 · Kubernetes Submit Queue · GitHub · be59266a · 3f67af65 · 641682c0
Commit 641682c0 authored Sep 15, 2016 by Kubernetes Submit Queue Committed by GitHub Sep 15, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 8 deletions

dashboard-controller.yaml cluster/addons/dashboard/dashboard-controller.yaml +4 -4

dashboard-controller.yaml ...kube-manifests/addons/dashboard/dashboard-controller.yaml +4 -4

No files found.
--- a/cluster/addons/dashboard/dashboard-controller.yaml
+++ b/cluster/addons/dashboard/dashboard-controller.yaml
@@ -2,11 +2,11 @@
 apiVersion: v1
 kind: ReplicationController
 metadata:
-  name: kubernetes-dashboard-v1.4.0-beta2
+  name: kubernetes-dashboard-v1.4.0
  namespace: kube-system
  labels:
    k8s-app: kubernetes-dashboard
-    version: v1.4.0-beta2
+    version: v1.4.0
    kubernetes.io/cluster-service: "true"
 spec:
  replicas: 1
@@ -16,7 +16,7 @@ spec:
    metadata:
      labels:
        k8s-app: kubernetes-dashboard
-        version: v1.4.0-beta2
+        version: v1.4.0
        kubernetes.io/cluster-service: "true"
      annotations:
        scheduler.alpha.kubernetes.io/critical-pod: ''
@@ -24,7 +24,7 @@ spec:
    spec:
      containers:
      - name: kubernetes-dashboard
-        image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.4.0-beta2
+        image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.4.0
        resources:
          # keep request = limit to keep this container in guaranteed class
          limits:

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