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

Create a new Deployment in kube-system for every version. #23512

Merged
merged 1 commit into from
Mar 30, 2016
Merged

Create a new Deployment in kube-system for every version. #23512

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
10 changes: 6 additions & 4 deletions cluster/addons/cluster-monitoring/google/heapster-controller.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,23 @@
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: heapster-v1.1.0-beta1
name: heapster-v1.1.0.beta1
namespace: kube-system
labels:
k8s-app: heapster
kubernetes.io/cluster-service: "true"
version: v1.1.0.beta1
spec:
replicas: 1
selector:
matchLabels:
k8s-app: heapster
version: v1.1.0.beta1
template:
metadata:
labels:
Copy link
Member

Choose a reason for hiding this comment

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

These need a version label or two deployments will select the same set of replicasets

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ack.

Copy link

Choose a reason for hiding this comment

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

@mikedanese, I noticed your comment "need a version label or two deployments will select the same set of replicasets". This is news to me, but I'm a novice so am probably confused. Could you spare a moment explain this concern in more detail, or point me to some relevant docs? Thanks.

k8s-app: heapster
kubernetes.io/cluster-service: "true"
version: v1.1.0.beta1
spec:
containers:
- image: gcr.io/google_containers/heapster:v1.1.0-beta1
Expand Down Expand Up @@ -90,7 +92,7 @@ spec:
- --memory={{ metrics_memory }}
- --extra-memory={{metrics_memory_per_node}}Mi
- --threshold=5
- --deployment=heapster-v1.1.0-beta1
- --deployment=heapster-v1.1.0.beta1
- --container=heapster
- --poll-period=300000
- image: gcr.io/google_containers/addon-resizer:1.0
Expand Down Expand Up @@ -118,7 +120,7 @@ spec:
- --memory={{eventer_memory}}
- --extra-memory={{eventer_memory_per_node}}Ki
- --threshold=5
- --deployment=heapster-v1.1.0-beta1
- --deployment=heapster-v1.1.0.beta1
- --container=eventer
- --poll-period=300000
volumes:
Expand Down
10 changes: 6 additions & 4 deletions cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,23 @@
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: heapster-v1.1.0-beta1
name: heapster-v1.1.0.beta1
namespace: kube-system
labels:
k8s-app: heapster
kubernetes.io/cluster-service: "true"
version: v1.1.0.beta1
spec:
replicas: 1
selector:
matchLabels:
k8s-app: heapster
version: v1.1.0.beta1
template:
metadata:
labels:
Copy link
Member

Choose a reason for hiding this comment

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

With this label removed from the pods and replica sets, what will delete them when the version is upgraded in the future?

Copy link
Member

Choose a reason for hiding this comment

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

Addon updater uses kubectl stop.

k8s-app: heapster
kubernetes.io/cluster-service: "true"
version: v1.1.0.beta1
spec:
containers:
- image: gcr.io/google_containers/heapster:v1.1.0-beta1
Expand Down Expand Up @@ -91,7 +93,7 @@ spec:
- --memory={{ metrics_memory }}
- --extra-memory={{ metrics_memory_per_node }}Mi
- --threshold=5
- --deployment=heapster-v1.1.0-beta1
- --deployment=heapster-v1.1.0.beta1
- --container=heapster
- --poll-period=300000
- image: gcr.io/google_containers/addon-resizer:1.0
Expand Down Expand Up @@ -119,7 +121,7 @@ spec:
- --memory={{ eventer_memory }}
- --extra-memory={{ eventer_memory_per_node }}Ki
- --threshold=5
- --deployment=heapster-v1.1.0-beta1
- --deployment=heapster-v1.1.0.beta1
- --container=eventer
- --poll-period=300000
volumes:
Expand Down
10 changes: 6 additions & 4 deletions cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,23 @@
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: heapster-v1.1.0-beta1
name: heapster-v1.1.0.beta1
namespace: kube-system
labels:
k8s-app: heapster
kubernetes.io/cluster-service: "true"
version: v1.1.0.beta1
spec:
replicas: 1
selector:
matchLabels:
k8s-app: heapster
version: v1.1.0.beta1
template:
metadata:
labels:
k8s-app: heapster
kubernetes.io/cluster-service: "true"
version: v1.1.0.beta1
spec:
containers:
- image: gcr.io/google_containers/heapster:v1.1.0-beta1
Expand Down Expand Up @@ -82,7 +84,7 @@ spec:
- --memory={{ metrics_memory }}
- --extra-memory={{ metrics_memory_per_node }}Mi
- --threshold=5
- --deployment=heapster-v1.1.0-beta1
- --deployment=heapster-v1.1.0.beta1
- --container=heapster
- --poll-period=300000
- image: gcr.io/google_containers/addon-resizer:1.0
Expand Down Expand Up @@ -110,7 +112,7 @@ spec:
- --memory={{ eventer_memory }}
- --extra-memory={{ eventer_memory_per_node }}Ki
- --threshold=5
- --deployment=heapster-v1.1.0-beta1
- --deployment=heapster-v1.1.0.beta1
- --container=eventer
- --poll-period=300000

8 changes: 5 additions & 3 deletions cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,23 @@
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: heapster-v1.1.0-beta1
name: heapster-v1.1.0.beta1
namespace: kube-system
labels:
k8s-app: heapster
kubernetes.io/cluster-service: "true"
version: v1.1.0.beta1
spec:
replicas: 1
selector:
matchLabels:
k8s-app: heapster
version: v1.1.0.beta1
template:
metadata:
labels:
k8s-app: heapster
kubernetes.io/cluster-service: "true"
version: v1.1.0.beta1
spec:
containers:
- image: gcr.io/google_containers/heapster:v1.1.0-beta1
Expand Down Expand Up @@ -64,6 +66,6 @@ spec:
- --memory={{ metrics_memory }}
- --extra-memory={{ metrics_memory_per_node }}Mi
- --threshold=5
- --deployment=heapster-v1.1.0-beta1
- --deployment=heapster-v1.1.0.beta1
- --container=heapster
- --poll-period=300000
2 changes: 1 addition & 1 deletion cluster/saltbase/salt/kube-addons/kube-addon-update.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,13 +475,13 @@ function update-addons() {
local -r addon_path=$1
# be careful, reconcile-objects uses global variables
reconcile-objects ${addon_path} ReplicationController "-" &
reconcile-objects ${addon_path} Deployment "-" &

# We don't expect names to be versioned for the following kinds, so
# we match the entire name, ignoring version suffix.
# That's why we pass an empty string as the version separator.
# If the description differs on disk, the object should be recreated.
# This is not implemented in this version.
reconcile-objects ${addon_path} Deployment "" &
reconcile-objects ${addon_path} Service "" &
reconcile-objects ${addon_path} PersistentVolume "" &
reconcile-objects ${addon_path} PersistentVolumeClaim "" &
Expand Down