Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Dashboard UI addon to v1.0.1 #23724

Merged
merged 1 commit into from
Apr 4, 2016
Merged

Update Dashboard UI addon to v1.0.1 #23724

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions cluster/addons/dashboard/dashboard-controller.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ kind: ReplicationController
metadata:
# Keep the name in sync with image version and
# gce/coreos/kube-manifests/addons/dashboard counterparts
name: kubernetes-dashboard-v1.0.0
name: kubernetes-dashboard-v1.0.1
namespace: kube-system
labels:
k8s-app: kubernetes-dashboard
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add a version label here (and below) and set it to 1.0.1 (or v1.0.1)? This will make the labeling consistent with the dns addon, and I believe that a change in labels in required for the updater to actually use the new yaml file to replace the running RC when upgrading a cluster.

@ihmccreery @zmerlynn

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Filed #23739 to cover this in test.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@maciaszczykm Can you do this?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, done.

version: v1.0.1
kubernetes.io/cluster-service: "true"
spec:
replicas: 1
Expand All @@ -16,11 +17,12 @@ spec:
metadata:
labels:
k8s-app: kubernetes-dashboard
version: v1.0.1
kubernetes.io/cluster-service: "true"
spec:
containers:
- 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:
# keep request = limit to keep this container in guaranteed class
limits:
Expand Down
6 changes: 4 additions & 2 deletions cluster/gce/coreos/kube-manifests/addons/dashboard/dashboard-controller.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@ apiVersion: v1
kind: ReplicationController
metadata:
# 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
labels:
k8s-app: kubernetes-dashboard
version: v1.0.1
kubernetes.io/cluster-service: "true"
spec:
replicas: 1
Expand All @@ -15,11 +16,12 @@ spec:
metadata:
labels:
k8s-app: kubernetes-dashboard
version: v1.0.1
kubernetes.io/cluster-service: "true"
spec:
containers:
- 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:
# keep request = limit to keep this container in guaranteed class
limits:
Expand Down