Skip to content

K
k3s
Commit 6173c43c authored by k8s-merge-robot's avatar k8s-merge-robot
Browse files
Options

Merge pull request #23724 from maciaszczykm/dashboard-release-v1.0.1

Automatic merge from submit-queue Update Dashboard UI addon to v1.0.1 Release details: https://github.com/kubernetes/dashboard/releases/tag/v1.0.1 CC @bryk
parents 6950fab4 72500284
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 4 deletions
cluster/addons/dashboard/dashboard-controller.yaml
View file @ 6173c43c
...@@ -3,10 +3,11 @@ kind: ReplicationController ...@@ -3,10 +3,11 @@ kind: ReplicationController
metadata: metadata:
# Keep the name in sync with image version and # Keep the name in sync with image version and
# gce/coreos/kube-manifests/addons/dashboard counterparts # gce/coreos/kube-manifests/addons/dashboard counterparts
name: kubernetes-dashboard-v1.0.0 name: kubernetes-dashboard-v1.0.1
namespace: kube-system namespace: kube-system
labels: labels:
k8s-app: kubernetes-dashboard k8s-app: kubernetes-dashboard
version: v1.0.1
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
spec: spec:
replicas: 1 replicas: 1
...@@ -16,11 +17,12 @@ spec: ...@@ -16,11 +17,12 @@ spec:
metadata: metadata:
labels: labels:
k8s-app: kubernetes-dashboard k8s-app: kubernetes-dashboard
version: v1.0.1
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.0.0 image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.0.1
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 @ 6173c43c
...@@ -2,10 +2,11 @@ apiVersion: v1 ...@@ -2,10 +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.0.0 name: kubernetes-dashboard-v1.0.1
namespace: kube-system namespace: kube-system
labels: labels:
k8s-app: kubernetes-dashboard k8s-app: kubernetes-dashboard
version: v1.0.1
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
spec: spec:
replicas: 1 replicas: 1
...@@ -15,11 +16,12 @@ spec: ...@@ -15,11 +16,12 @@ spec:
metadata: metadata:
labels: labels:
k8s-app: kubernetes-dashboard k8s-app: kubernetes-dashboard
version: v1.0.1
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.0.0 image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.0.1
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