scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-04 04:08:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #22692 from bryk/releasev1.0

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-03-08 03:43:35 -08:00
parent 1b003ba25a d4c4e7c22c
commit 583c735b23
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/addons/dashboard/dashboard-controller.yaml
View File

@@ -3,7 +3,7 @@ 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.0beta1 name: kubernetes-dashboard-v1.0.0
namespace: kube-system namespace: kube-system
labels: labels:
k8s-app: kubernetes-dashboard k8s-app: kubernetes-dashboard
@@ -20,7 +20,7 @@ spec:
spec: spec:
containers: containers:
- name: kubernetes-dashboard - name: kubernetes-dashboard
image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.0.0-beta1 image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.0.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:

4
cluster/gce/coreos/kube-manifests/addons/dashboard/dashboard-controller.yaml
View File

@@ -2,7 +2,7 @@ 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.0beta1 name: kubernetes-dashboard-v1.0.0
namespace: kube-system namespace: kube-system
labels: labels:
k8s-app: kubernetes-dashboard k8s-app: kubernetes-dashboard
@@ -19,7 +19,7 @@ spec:
spec: spec:
containers: containers:
- name: kubernetes-dashboard - name: kubernetes-dashboard
image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.0.0-beta1 image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.0.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: