github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #56211 from kawych/master

Browse Source 
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Bump Heapster version to v1.5.0-beta.2

**What this PR does / why we need it**:
Bump Heapster version to v1.5.0-beta.2

**Release note**:

```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue 2017-11-22 08:47:49 -08:00 committed by GitHub
commit e0ebc850bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,29 +23,29 @@ metadata:
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
name: heapster-v1.5.0-beta.1 name: heapster-v1.5.0-beta.2
namespace: kube-system namespace: kube-system
labels: labels:
k8s-app: heapster k8s-app: heapster
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
addonmanager.kubernetes.io/mode: Reconcile addonmanager.kubernetes.io/mode: Reconcile
version: v1.5.0-beta.1 version: v1.5.0-beta.2
spec: spec:
replicas: 1 replicas: 1
selector: selector:
matchLabels: matchLabels:
k8s-app: heapster k8s-app: heapster
version: v1.5.0-beta.1 version: v1.5.0-beta.2
template: template:
metadata: metadata:
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v1.5.0-beta.1 version: v1.5.0-beta.2
annotations: annotations:
scheduler.alpha.kubernetes.io/critical-pod: '' scheduler.alpha.kubernetes.io/critical-pod: ''
spec: spec:
containers: containers:
- image: gcr.io/google_containers/heapster-amd64:v1.5.0-beta.1 - image: gcr.io/google_containers/heapster-amd64:v1.5.0-beta.2
name: heapster name: heapster
livenessProbe: livenessProbe:
httpGet: httpGet:
@ -58,7 +58,7 @@ spec:
- /heapster - /heapster
- --source=kubernetes.summary_api:'' - --source=kubernetes.summary_api:''
- --sink=gcm - --sink=gcm
- image: gcr.io/google_containers/heapster-amd64:v1.5.0-beta.1 - image: gcr.io/google_containers/heapster-amd64:v1.5.0-beta.2
name: eventer name: eventer
command: command:
- /eventer - /eventer
@ -89,7 +89,7 @@ spec:
- --memory={{ base_metrics_memory }} - --memory={{ base_metrics_memory }}
- --extra-memory={{metrics_memory_per_node}}Mi - --extra-memory={{metrics_memory_per_node}}Mi
- --threshold=5 - --threshold=5
- --deployment=heapster-v1.5.0-beta.1 - --deployment=heapster-v1.5.0-beta.2
- --container=heapster - --container=heapster
- --poll-period=300000 - --poll-period=300000
- --estimator=exponential - --estimator=exponential
@ -118,7 +118,7 @@ spec:
- --memory={{base_eventer_memory}} - --memory={{base_eventer_memory}}
- --extra-memory={{eventer_memory_per_node}}Ki - --extra-memory={{eventer_memory_per_node}}Ki
- --threshold=5 - --threshold=5
- --deployment=heapster-v1.5.0-beta.1 - --deployment=heapster-v1.5.0-beta.2
- --container=eventer - --container=eventer
- --poll-period=300000 - --poll-period=300000
- --estimator=exponential - --estimator=exponential

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

@ -23,29 +23,29 @@ metadata:
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
name: heapster-v1.5.0-beta.1 name: heapster-v1.5.0-beta.2
namespace: kube-system namespace: kube-system
labels: labels:
k8s-app: heapster k8s-app: heapster
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
addonmanager.kubernetes.io/mode: Reconcile addonmanager.kubernetes.io/mode: Reconcile
version: v1.5.0-beta.1 version: v1.5.0-beta.2
spec: spec:
replicas: 1 replicas: 1
selector: selector:
matchLabels: matchLabels:
k8s-app: heapster k8s-app: heapster
version: v1.5.0-beta.1 version: v1.5.0-beta.2
template: template:
metadata: metadata:
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v1.5.0-beta.1 version: v1.5.0-beta.2
annotations: annotations:
scheduler.alpha.kubernetes.io/critical-pod: '' scheduler.alpha.kubernetes.io/critical-pod: ''
spec: spec:
containers: containers:
- image: gcr.io/google_containers/heapster-amd64:v1.5.0-beta.1 - image: gcr.io/google_containers/heapster-amd64:v1.5.0-beta.2
name: heapster name: heapster
livenessProbe: livenessProbe:
@ -60,7 +60,7 @@ spec:
- --source=kubernetes.summary_api:'' - --source=kubernetes.summary_api:''
- --sink=influxdb:http://monitoring-influxdb:8086 - --sink=influxdb:http://monitoring-influxdb:8086
- --sink=gcm:?metrics=autoscaling - --sink=gcm:?metrics=autoscaling
- image: gcr.io/google_containers/heapster-amd64:v1.5.0-beta.1 - image: gcr.io/google_containers/heapster-amd64:v1.5.0-beta.2
name: eventer name: eventer
command: command:
- /eventer - /eventer
@ -91,7 +91,7 @@ spec:
- --memory={{ base_metrics_memory }} - --memory={{ base_metrics_memory }}
- --extra-memory={{ metrics_memory_per_node }}Mi - --extra-memory={{ metrics_memory_per_node }}Mi
- --threshold=5 - --threshold=5
- --deployment=heapster-v1.5.0-beta.1 - --deployment=heapster-v1.5.0-beta.2
- --container=heapster - --container=heapster
- --poll-period=300000 - --poll-period=300000
- --estimator=exponential - --estimator=exponential
@ -120,7 +120,7 @@ spec:
- --memory={{ base_eventer_memory }} - --memory={{ base_eventer_memory }}
- --extra-memory={{ eventer_memory_per_node }}Ki - --extra-memory={{ eventer_memory_per_node }}Ki
- --threshold=5 - --threshold=5
- --deployment=heapster-v1.5.0-beta.1 - --deployment=heapster-v1.5.0-beta.2
- --container=eventer - --container=eventer
- --poll-period=300000 - --poll-period=300000
- --estimator=exponential - --estimator=exponential

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

@ -23,29 +23,29 @@ metadata:
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
name: heapster-v1.5.0-beta.1 name: heapster-v1.5.0-beta.2
namespace: kube-system namespace: kube-system
labels: labels:
k8s-app: heapster k8s-app: heapster
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
addonmanager.kubernetes.io/mode: Reconcile addonmanager.kubernetes.io/mode: Reconcile
version: v1.5.0-beta.1 version: v1.5.0-beta.2
spec: spec:
replicas: 1 replicas: 1
selector: selector:
matchLabels: matchLabels:
k8s-app: heapster k8s-app: heapster
version: v1.5.0-beta.1 version: v1.5.0-beta.2
template: template:
metadata: metadata:
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v1.5.0-beta.1 version: v1.5.0-beta.2
annotations: annotations:
scheduler.alpha.kubernetes.io/critical-pod: '' scheduler.alpha.kubernetes.io/critical-pod: ''
spec: spec:
containers: containers:
- image: gcr.io/google_containers/heapster-amd64:v1.5.0-beta.1 - image: gcr.io/google_containers/heapster-amd64:v1.5.0-beta.2
name: heapster name: heapster
livenessProbe: livenessProbe:
httpGet: httpGet:
@ -58,7 +58,7 @@ spec:
- /heapster - /heapster
- --source=kubernetes.summary_api:'' - --source=kubernetes.summary_api:''
- --sink=influxdb:http://monitoring-influxdb:8086 - --sink=influxdb:http://monitoring-influxdb:8086
- image: gcr.io/google_containers/heapster-amd64:v1.5.0-beta.1 - image: gcr.io/google_containers/heapster-amd64:v1.5.0-beta.2
name: eventer name: eventer
command: command:
- /eventer - /eventer
@ -89,7 +89,7 @@ spec:
- --memory={{ base_metrics_memory }} - --memory={{ base_metrics_memory }}
- --extra-memory={{ metrics_memory_per_node }}Mi - --extra-memory={{ metrics_memory_per_node }}Mi
- --threshold=5 - --threshold=5
- --deployment=heapster-v1.5.0-beta.1 - --deployment=heapster-v1.5.0-beta.2
- --container=heapster - --container=heapster
- --poll-period=300000 - --poll-period=300000
- --estimator=exponential - --estimator=exponential
@ -118,7 +118,7 @@ spec:
- --memory={{ base_eventer_memory }} - --memory={{ base_eventer_memory }}
- --extra-memory={{ eventer_memory_per_node }}Ki - --extra-memory={{ eventer_memory_per_node }}Ki
- --threshold=5 - --threshold=5
- --deployment=heapster-v1.5.0-beta.1 - --deployment=heapster-v1.5.0-beta.2
- --container=eventer - --container=eventer
- --poll-period=300000 - --poll-period=300000
- --estimator=exponential - --estimator=exponential

12
cluster/addons/cluster-monitoring/stackdriver/heapster-controller.yaml
View File

@ -21,29 +21,29 @@ metadata:
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
name: heapster-v1.5.0-beta.1 name: heapster-v1.5.0-beta.2
namespace: kube-system namespace: kube-system
labels: labels:
k8s-app: heapster k8s-app: heapster
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
addonmanager.kubernetes.io/mode: Reconcile addonmanager.kubernetes.io/mode: Reconcile
version: v1.5.0-beta.1 version: v1.5.0-beta.2
spec: spec:
replicas: 1 replicas: 1
selector: selector:
matchLabels: matchLabels:
k8s-app: heapster k8s-app: heapster
version: v1.5.0-beta.1 version: v1.5.0-beta.2
template: template:
metadata: metadata:
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v1.5.0-beta.1 version: v1.5.0-beta.2
annotations: annotations:
scheduler.alpha.kubernetes.io/critical-pod: '' scheduler.alpha.kubernetes.io/critical-pod: ''
spec: spec:
containers: containers:
- image: gcr.io/google_containers/heapster-amd64:v1.5.0-beta.1 - image: gcr.io/google_containers/heapster-amd64:v1.5.0-beta.2
name: heapster name: heapster
livenessProbe: livenessProbe:
httpGet: httpGet:
@ -101,7 +101,7 @@ spec:
- --memory={{ base_metrics_memory }} - --memory={{ base_metrics_memory }}
- --extra-memory={{metrics_memory_per_node}}Mi - --extra-memory={{metrics_memory_per_node}}Mi
- --threshold=5 - --threshold=5
- --deployment=heapster-v1.5.0-beta.1 - --deployment=heapster-v1.5.0-beta.2
- --container=heapster - --container=heapster
- --poll-period=300000 - --poll-period=300000
- --estimator=exponential - --estimator=exponential

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

@ -21,29 +21,29 @@ metadata:
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
name: heapster-v1.5.0-beta.1 name: heapster-v1.5.0-beta.2
namespace: kube-system namespace: kube-system
labels: labels:
k8s-app: heapster k8s-app: heapster
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
addonmanager.kubernetes.io/mode: Reconcile addonmanager.kubernetes.io/mode: Reconcile
version: v1.5.0-beta.1 version: v1.5.0-beta.2
spec: spec:
replicas: 1 replicas: 1
selector: selector:
matchLabels: matchLabels:
k8s-app: heapster k8s-app: heapster
version: v1.5.0-beta.1 version: v1.5.0-beta.2
template: template:
metadata: metadata:
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v1.5.0-beta.1 version: v1.5.0-beta.2
annotations: annotations:
scheduler.alpha.kubernetes.io/critical-pod: '' scheduler.alpha.kubernetes.io/critical-pod: ''
spec: spec:
containers: containers:
- image: gcr.io/google_containers/heapster-amd64:v1.5.0-beta.1 - image: gcr.io/google_containers/heapster-amd64:v1.5.0-beta.2
name: heapster name: heapster
livenessProbe: livenessProbe:
httpGet: httpGet:
@ -80,7 +80,7 @@ spec:
- --memory={{ base_metrics_memory }} - --memory={{ base_metrics_memory }}
- --extra-memory={{ metrics_memory_per_node }}Mi - --extra-memory={{ metrics_memory_per_node }}Mi
- --threshold=5 - --threshold=5
- --deployment=heapster-v1.5.0-beta.1 - --deployment=heapster-v1.5.0-beta.2
- --container=heapster - --container=heapster
- --poll-period=300000 - --poll-period=300000
- --estimator=exponential - --estimator=exponential