Skip to content

Commit

Permalink
Create a new Deployment in kube-system for every version.
Browse files Browse the repository at this point in the history
  • Loading branch information
@Q-Lee
Q-Lee committed Mar 29, 2016
1 parent 08e9ef0 commit 0dcd49d
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 16 deletions.
10 changes: 6 additions & 4 deletions cluster/addons/cluster-monitoring/google/heapster-controller.yaml
View file
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 @@ -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
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 @@ -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
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
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
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

1 comment on commit 0dcd49d

@k8s-teamcity-mesosphere
Copy link

Choose a reason for hiding this comment

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

TeamCity OSS :: Kubernetes Mesos :: 4 - Smoke Tests Build 20166 outcome was SUCCESS
Summary: Tests passed: 1, ignored: 267 Build time: 00:05:28

Please sign in to comment.