Skip to content

K
k3s
Commit 641682c0 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

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.
parents be59266a 3f67af65
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 8 deletions
cluster/addons/dashboard/dashboard-controller.yaml
View file @ 641682c0
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
apiVersion: v1 apiVersion: v1
kind: ReplicationController kind: ReplicationController
metadata: metadata:
name: kubernetes-dashboard-v1.4.0-beta2 name: kubernetes-dashboard-v1.4.0
namespace: kube-system namespace: kube-system
labels: labels:
k8s-app: kubernetes-dashboard k8s-app: kubernetes-dashboard
version: v1.4.0-beta2 version: v1.4.0
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
spec: spec:
replicas: 1 replicas: 1
...@@ -16,7 +16,7 @@ spec: ...@@ -16,7 +16,7 @@ spec:
metadata: metadata:
labels: labels:
k8s-app: kubernetes-dashboard k8s-app: kubernetes-dashboard
version: v1.4.0-beta2 version: v1.4.0
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
annotations: annotations:
scheduler.alpha.kubernetes.io/critical-pod: '' scheduler.alpha.kubernetes.io/critical-pod: ''
...@@ -24,7 +24,7 @@ spec: ...@@ -24,7 +24,7 @@ spec:
spec: spec:
containers: containers:
- name: kubernetes-dashboard - 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: resources:
# keep request = limit to keep this container in guaranteed class # keep request = limit to keep this container in guaranteed class
limits: limits:
......
cluster/gce/coreos/kube-manifests/addons/dashboard/dashboard-controller.yaml
View file @ 641682c0
...@@ -2,11 +2,11 @@ apiVersion: v1 ...@@ -2,11 +2,11 @@ apiVersion: v1
kind: ReplicationController kind: ReplicationController
metadata: metadata:
# Keep this file in sync with addons/dashboard/dashboard-controller.yaml # 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 namespace: kube-system
labels: labels:
k8s-app: kubernetes-dashboard k8s-app: kubernetes-dashboard
version: v1.4.0-beta2 version: v1.4.0
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
spec: spec:
replicas: 1 replicas: 1
...@@ -16,12 +16,12 @@ spec: ...@@ -16,12 +16,12 @@ spec:
metadata: metadata:
labels: labels:
k8s-app: kubernetes-dashboard k8s-app: kubernetes-dashboard
version: v1.4.0-beta2 version: v1.4.0
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
spec: spec:
containers: containers:
- name: kubernetes-dashboard - 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: resources:
# keep request = limit to keep this container in guaranteed class # keep request = limit to keep this container in guaranteed class
limits: limits:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment