Merge pull request #25963 from bryk/release-beta1

Set Dashboard UI version to v1.1.0-beta1
This commit is contained in:
Alex Mohr 2016-05-26 12:38:48 -07:00
commit 0f3003671c
3 changed files with 14 additions and 15 deletions

View File

@ -3,11 +3,11 @@
apiVersion: v1
kind: ReplicationController
metadata:
name: kubernetes-dashboard-v1.0.1
name: kubernetes-dashboard-v1.1.0-beta1
namespace: kube-system
labels:
k8s-app: kubernetes-dashboard
version: v1.0.1
version: v1.1.0-beta1
kubernetes.io/cluster-service: "true"
spec:
replicas: 1
@ -17,12 +17,12 @@ spec:
metadata:
labels:
k8s-app: kubernetes-dashboard
version: v1.0.1
version: v1.1.0-beta1
kubernetes.io/cluster-service: "true"
spec:
containers:
- name: kubernetes-dashboard
image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.0.1
image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.1.0-beta1
resources:
# keep request = limit to keep this container in guaranteed class
limits:

View File

@ -1,13 +1,12 @@
apiVersion: v1
kind: ReplicationController
metadata:
# Keep the name in sync with image version and
# gce/coreos/kube-manifests/addons/dashboard counterparts
name: kubernetes-dashboard-v1.0.1
# Keep this file in sync with addons/dashboard/dashboard-controller.yaml
name: kubernetes-dashboard-v1.1.0-beta1
namespace: kube-system
labels:
k8s-app: kubernetes-dashboard
version: v1.0.1
version: v1.1.0-beta1
kubernetes.io/cluster-service: "true"
spec:
replicas: 1
@ -17,12 +16,12 @@ spec:
metadata:
labels:
k8s-app: kubernetes-dashboard
version: v1.0.1
version: v1.1.0-beta1
kubernetes.io/cluster-service: "true"
spec:
containers:
- name: kubernetes-dashboard
image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.0.1
image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.1.0-beta1
resources:
# keep request = limit to keep this container in guaranteed class
limits:
@ -38,4 +37,4 @@ spec:
path: /
port: 9090
initialDelaySeconds: 30
timeoutSeconds: 30
timeoutSeconds: 30

View File

@ -20,25 +20,25 @@ metadata:
namespace: kube-system
labels:
app: kubernetes-dashboard
version: v1.0.1
version: v1.1.0-beta1
kubernetes.io/cluster-service: "true"
spec:
replicas: 1
selector:
app: kubernetes-dashboard
version: v1.0.1
version: v1.1.0-beta1
kubernetes.io/cluster-service: "true"
template:
metadata:
labels:
app: kubernetes-dashboard
version: v1.0.1
version: v1.1.0-beta1
kubernetes.io/cluster-service: "true"
spec:
containers:
- name: kubernetes-dashboard
# ARCH will be replaced with the architecture it's built for. Check out the Makefile for more details
image: gcr.io/google_containers/kubernetes-dashboard-ARCH:v1.0.1
image: gcr.io/google_containers/kubernetes-dashboard-ARCH:v1.1.0-beta1
imagePullPolicy: Always
ports:
- containerPort: 9090