github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removing versions from deployment names.

Browse Source
This commit is contained in:
Quintin Lee
2016-03-16 16:23:45 -07:00
parent 79f0cc25e8
commit c484563315
5 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cluster/addons/cluster-monitoring/google/heapster-controller.yaml
View File

@@ -9,7 +9,7 @@
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
name: heapster-v1.0.0 name: heapster
namespace: kube-system namespace: kube-system
labels: labels:
k8s-app: heapster k8s-app: heapster
@@ -88,7 +88,7 @@ spec:
- --memory=200Mi - --memory=200Mi
- --extra-memory=3Mi - --extra-memory=3Mi
- --threshold=5 - --threshold=5
- --deployment=heapster-v1.0.0-beta1 - --deployment=heapster
- --container=heapster - --container=heapster
- --poll-period=300000 - --poll-period=300000
- image: gcr.io/google_containers/addon-resizer:1.0 - image: gcr.io/google_containers/addon-resizer:1.0
@@ -116,7 +116,7 @@ spec:
- --memory=200Mi - --memory=200Mi
- --extra-memory=3Mi - --extra-memory=3Mi
- --threshold=5 - --threshold=5
- --deployment=heapster-v1.0.0-beta1 - --deployment=heapster
- --container=eventer - --container=eventer
- --poll-period=300000 - --poll-period=300000
volumes: volumes:

6
cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
View File

@@ -9,7 +9,7 @@
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
name: heapster-v1.0.0 name: heapster
namespace: kube-system namespace: kube-system
labels: labels:
k8s-app: heapster k8s-app: heapster
@@ -89,7 +89,7 @@ spec:
- --memory=200Mi - --memory=200Mi
- --extra-memory=3Mi - --extra-memory=3Mi
- --threshold=5 - --threshold=5
- --deployment=heapster-v1.0.0-beta1 - --deployment=heapster
- --container=heapster - --container=heapster
- --poll-period=300000 - --poll-period=300000
- image: gcr.io/google_containers/addon-resizer:1.0 - image: gcr.io/google_containers/addon-resizer:1.0
@@ -117,7 +117,7 @@ spec:
- --memory=200Mi - --memory=200Mi
- --extra-memory=3Mi - --extra-memory=3Mi
- --threshold=5 - --threshold=5
- --deployment=heapster-v1.0.0-beta1 - --deployment=heapster
- --container=eventer - --container=eventer
- --poll-period=300000 - --poll-period=300000
volumes: volumes:

6
cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml
View File

@@ -9,7 +9,7 @@
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
name: heapster-v1.0.0 name: heapster
namespace: kube-system namespace: kube-system
labels: labels:
k8s-app: heapster k8s-app: heapster
@@ -80,7 +80,7 @@ spec:
- --memory=200Mi - --memory=200Mi
- --extra-memory=3Mi - --extra-memory=3Mi
- --threshold=5 - --threshold=5
- --deployment=heapster-v1.0.0-beta1 - --deployment=heapster
- --container=heapster - --container=heapster
- --poll-period=300000 - --poll-period=300000
- image: gcr.io/google_containers/addon-resizer:1.0 - image: gcr.io/google_containers/addon-resizer:1.0
@@ -108,7 +108,7 @@ spec:
- --memory=200Mi - --memory=200Mi
- --extra-memory=3Mi - --extra-memory=3Mi
- --threshold=5 - --threshold=5
- --deployment=heapster-v1.0.0-beta1 - --deployment=heapster
- --container=eventer - --container=eventer
- --poll-period=300000 - --poll-period=300000

4
cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml
View File

@@ -7,7 +7,7 @@
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
name: heapster-v1.0.0 name: heapster
namespace: kube-system namespace: kube-system
labels: labels:
k8s-app: heapster k8s-app: heapster
@@ -63,6 +63,6 @@ spec:
- --memory=200Mi - --memory=200Mi
- --extra-memory=3Mi - --extra-memory=3Mi
- --threshold=5 - --threshold=5
- --deployment=heapster-v1.0.0-beta1 - --deployment=heapster
- --container=heapster - --container=heapster
- --poll-period=300000 - --poll-period=300000

2
cluster/saltbase/salt/kube-addons/kube-addon-update.sh
View File

@@ -475,13 +475,13 @@ function update-addons() {
local -r addon_path=$1 local -r addon_path=$1
# be careful, reconcile-objects uses global variables # be careful, reconcile-objects uses global variables
reconcile-objects ${addon_path} ReplicationController "-" & reconcile-objects ${addon_path} ReplicationController "-" &
reconcile-objects ${addon_path} Deployment "-" &
# We don't expect names to be versioned for the following kinds, so # We don't expect names to be versioned for the following kinds, so
# we match the entire name, ignoring version suffix. # we match the entire name, ignoring version suffix.
# That's why we pass an empty string as the version separator. # That's why we pass an empty string as the version separator.
# If the description differs on disk, the object should be recreated. # If the description differs on disk, the object should be recreated.
# This is not implemented in this version. # This is not implemented in this version.
reconcile-objects ${addon_path} Deployment "" &
reconcile-objects ${addon_path} Service "" & reconcile-objects ${addon_path} Service "" &
reconcile-objects ${addon_path} PersistentVolume "" & reconcile-objects ${addon_path} PersistentVolume "" &
reconcile-objects ${addon_path} PersistentVolumeClaim "" & reconcile-objects ${addon_path} PersistentVolumeClaim "" &