Skip to content

K
k3s
Commit 73b0b313 authored by k8s-merge-robot's avatar k8s-merge-robot Committed by GitHub
Browse files
Options

Merge pull request #27869 from bryk/dashboard-v1.1.0

Automatic merge from submit-queue Set Dashboard UI version to v1.1.0 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]() This is our final release for this quarter. Release info and changelog will go there: https://github.com/kubernetes/dashboard/releases/tag/v1.1.0
parents b9bc756a aba33495
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 8 deletions
cluster/addons/dashboard/dashboard-controller.yaml
View file @ 73b0b313
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
apiVersion: v1 apiVersion: v1
kind: ReplicationController kind: ReplicationController
metadata: metadata:
name: kubernetes-dashboard-v1.1.0-beta3 name: kubernetes-dashboard-v1.1.0
namespace: kube-system namespace: kube-system
labels: labels:
k8s-app: kubernetes-dashboard k8s-app: kubernetes-dashboard
version: v1.1.0-beta3 version: v1.1.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.1.0-beta3 version: v1.1.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.1.0-beta3 image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.1.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 @ 73b0b313
...@@ -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.1.0-beta3 name: kubernetes-dashboard-v1.1.0
namespace: kube-system namespace: kube-system
labels: labels:
k8s-app: kubernetes-dashboard k8s-app: kubernetes-dashboard
version: v1.1.0-beta3 version: v1.1.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.1.0-beta3 version: v1.1.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.1.0-beta3 image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.1.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