github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 20:24:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #23512 from Q-Lee/nanny-fix

Browse Source 
Automatic merge from submit-queue

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

It appears that version numbers have already been properly added to these files. Small change to delete an old deployment entirely, so we can make a new one per version (like replication controllers).

We'll want to change this back once the kube-addons support deployments in a later version.
This commit is contained in:
k8s-merge-robot 2016-03-29 20:59:46 -07:00
commit c327879771
5 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,21 +11,23 @@
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
name: heapster-v1.1.0-beta1 name: heapster-v1.1.0.beta1
namespace: kube-system namespace: kube-system
labels: labels:
k8s-app: heapster k8s-app: heapster
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
version: v1.1.0.beta1
spec: spec:
replicas: 1 replicas: 1
selector: selector:
matchLabels: matchLabels:
k8s-app: heapster k8s-app: heapster
version: v1.1.0.beta1
template: template:
metadata: metadata:
labels: labels:
k8s-app: heapster k8s-app: heapster
kubernetes.io/cluster-service: "true" version: v1.1.0.beta1
spec: spec:
containers: containers:
- image: gcr.io/google_containers/heapster:v1.1.0-beta1 - image: gcr.io/google_containers/heapster:v1.1.0-beta1
@ -90,7 +92,7 @@ spec:
- --memory={{ metrics_memory }} - --memory={{ metrics_memory }}
- --extra-memory={{metrics_memory_per_node}}Mi - --extra-memory={{metrics_memory_per_node}}Mi
- --threshold=5 - --threshold=5
- --deployment=heapster-v1.1.0-beta1 - --deployment=heapster-v1.1.0.beta1
- --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
@ -118,7 +120,7 @@ spec:
- --memory={{eventer_memory}} - --memory={{eventer_memory}}
- --extra-memory={{eventer_memory_per_node}}Ki - --extra-memory={{eventer_memory_per_node}}Ki
- --threshold=5 - --threshold=5
- --deployment=heapster-v1.1.0-beta1 - --deployment=heapster-v1.1.0.beta1
- --container=eventer - --container=eventer
- --poll-period=300000 - --poll-period=300000
volumes: volumes:

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

@ -11,21 +11,23 @@
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
name: heapster-v1.1.0-beta1 name: heapster-v1.1.0.beta1
namespace: kube-system namespace: kube-system
labels: labels:
k8s-app: heapster k8s-app: heapster
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
version: v1.1.0.beta1
spec: spec:
replicas: 1 replicas: 1
selector: selector:
matchLabels: matchLabels:
k8s-app: heapster k8s-app: heapster
version: v1.1.0.beta1
template: template:
metadata: metadata:
labels: labels:
k8s-app: heapster k8s-app: heapster
kubernetes.io/cluster-service: "true" version: v1.1.0.beta1
spec: spec:
containers: containers:
- image: gcr.io/google_containers/heapster:v1.1.0-beta1 - image: gcr.io/google_containers/heapster:v1.1.0-beta1
@ -91,7 +93,7 @@ spec:
- --memory={{ metrics_memory }} - --memory={{ metrics_memory }}
- --extra-memory={{ metrics_memory_per_node }}Mi - --extra-memory={{ metrics_memory_per_node }}Mi
- --threshold=5 - --threshold=5
- --deployment=heapster-v1.1.0-beta1 - --deployment=heapster-v1.1.0.beta1
- --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
@ -119,7 +121,7 @@ spec:
- --memory={{ eventer_memory }} - --memory={{ eventer_memory }}
- --extra-memory={{ eventer_memory_per_node }}Ki - --extra-memory={{ eventer_memory_per_node }}Ki
- --threshold=5 - --threshold=5
- --deployment=heapster-v1.1.0-beta1 - --deployment=heapster-v1.1.0.beta1
- --container=eventer - --container=eventer
- --poll-period=300000 - --poll-period=300000
volumes: volumes:

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

@ -11,21 +11,23 @@
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
name: heapster-v1.1.0-beta1 name: heapster-v1.1.0.beta1
namespace: kube-system namespace: kube-system
labels: labels:
k8s-app: heapster k8s-app: heapster
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
version: v1.1.0.beta1
spec: spec:
replicas: 1 replicas: 1
selector: selector:
matchLabels: matchLabels:
k8s-app: heapster k8s-app: heapster
version: v1.1.0.beta1
template: template:
metadata: metadata:
labels: labels:
k8s-app: heapster k8s-app: heapster
kubernetes.io/cluster-service: "true" version: v1.1.0.beta1
spec: spec:
containers: containers:
- image: gcr.io/google_containers/heapster:v1.1.0-beta1 - image: gcr.io/google_containers/heapster:v1.1.0-beta1
@ -82,7 +84,7 @@ spec:
- --memory={{ metrics_memory }} - --memory={{ metrics_memory }}
- --extra-memory={{ metrics_memory_per_node }}Mi - --extra-memory={{ metrics_memory_per_node }}Mi
- --threshold=5 - --threshold=5
- --deployment=heapster-v1.1.0-beta1 - --deployment=heapster-v1.1.0.beta1
- --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
@ -110,7 +112,7 @@ spec:
- --memory={{ eventer_memory }} - --memory={{ eventer_memory }}
- --extra-memory={{ eventer_memory_per_node }}Ki - --extra-memory={{ eventer_memory_per_node }}Ki
- --threshold=5 - --threshold=5
- --deployment=heapster-v1.1.0-beta1 - --deployment=heapster-v1.1.0.beta1
- --container=eventer - --container=eventer
- --poll-period=300000 - --poll-period=300000

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

@ -8,21 +8,23 @@
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
name: heapster-v1.1.0-beta1 name: heapster-v1.1.0.beta1
namespace: kube-system namespace: kube-system
labels: labels:
k8s-app: heapster k8s-app: heapster
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
version: v1.1.0.beta1
spec: spec:
replicas: 1 replicas: 1
selector: selector:
matchLabels: matchLabels:
k8s-app: heapster k8s-app: heapster
version: v1.1.0.beta1
template: template:
metadata: metadata:
labels: labels:
k8s-app: heapster k8s-app: heapster
kubernetes.io/cluster-service: "true" version: v1.1.0.beta1
spec: spec:
containers: containers:
- image: gcr.io/google_containers/heapster:v1.1.0-beta1 - image: gcr.io/google_containers/heapster:v1.1.0-beta1
@ -64,6 +66,6 @@ spec:
- --memory={{ metrics_memory }} - --memory={{ metrics_memory }}
- --extra-memory={{ metrics_memory_per_node }}Mi - --extra-memory={{ metrics_memory_per_node }}Mi
- --threshold=5 - --threshold=5
- --deployment=heapster-v1.1.0-beta1 - --deployment=heapster-v1.1.0.beta1
- --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 "" &