Skip to content

K
k3s
Unverified Commit 965fd732 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #61536 from kawych/automated-cherry-pick-of-#61396-upstream-release-1.10

Automatic merge from submit-queue. Automated cherry pick of #61396: Bump Heapster to v1.5.2 Cherry pick of #61396 on release-1.10. #61396: Bump Heapster to v1.5.2 **Release note**: ```release-note Bump Heapster to v1.5.2 ```
parents ac5071de 1ef6f6d5
Hide whitespace changes
Inline Side-by-side
Showing with 36 additions and 36 deletions
cluster/addons/cluster-monitoring/google/heapster-controller.yaml
View file @ 965fd732
...@@ -36,30 +36,30 @@ data: ...@@ -36,30 +36,30 @@ data:
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
name: heapster-v1.5.0 name: heapster-v1.5.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 version: v1.5.2
spec: spec:
replicas: 1 replicas: 1
selector: selector:
matchLabels: matchLabels:
k8s-app: heapster k8s-app: heapster
version: v1.5.0 version: v1.5.2
template: template:
metadata: metadata:
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v1.5.0 version: v1.5.2
annotations: annotations:
scheduler.alpha.kubernetes.io/critical-pod: '' scheduler.alpha.kubernetes.io/critical-pod: ''
spec: spec:
priorityClassName: system-cluster-critical priorityClassName: system-cluster-critical
containers: containers:
- image: k8s.gcr.io/heapster-amd64:v1.5.0 - image: k8s.gcr.io/heapster-amd64:v1.5.2
name: heapster name: heapster
livenessProbe: livenessProbe:
httpGet: httpGet:
...@@ -72,7 +72,7 @@ spec: ...@@ -72,7 +72,7 @@ spec:
- /heapster - /heapster
- --source=kubernetes.summary_api:'' - --source=kubernetes.summary_api:''
- --sink=gcm - --sink=gcm
- image: k8s.gcr.io/heapster-amd64:v1.5.0 - image: k8s.gcr.io/heapster-amd64:v1.5.2
name: eventer name: eventer
command: command:
- /eventer - /eventer
...@@ -107,7 +107,7 @@ spec: ...@@ -107,7 +107,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 - --deployment=heapster-v1.5.2
- --container=heapster - --container=heapster
- --poll-period=300000 - --poll-period=300000
- --estimator=exponential - --estimator=exponential
...@@ -140,7 +140,7 @@ spec: ...@@ -140,7 +140,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 - --deployment=heapster-v1.5.2
- --container=eventer - --container=eventer
- --poll-period=300000 - --poll-period=300000
- --estimator=exponential - --estimator=exponential
......
cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
View file @ 965fd732
...@@ -36,30 +36,30 @@ data: ...@@ -36,30 +36,30 @@ data:
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
name: heapster-v1.5.0 name: heapster-v1.5.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 version: v1.5.2
spec: spec:
replicas: 1 replicas: 1
selector: selector:
matchLabels: matchLabels:
k8s-app: heapster k8s-app: heapster
version: v1.5.0 version: v1.5.2
template: template:
metadata: metadata:
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v1.5.0 version: v1.5.2
annotations: annotations:
scheduler.alpha.kubernetes.io/critical-pod: '' scheduler.alpha.kubernetes.io/critical-pod: ''
spec: spec:
priorityClassName: system-cluster-critical priorityClassName: system-cluster-critical
containers: containers:
- image: k8s.gcr.io/heapster-amd64:v1.5.0 - image: k8s.gcr.io/heapster-amd64:v1.5.2
name: heapster name: heapster
livenessProbe: livenessProbe:
httpGet: httpGet:
...@@ -73,7 +73,7 @@ spec: ...@@ -73,7 +73,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: k8s.gcr.io/heapster-amd64:v1.5.0 - image: k8s.gcr.io/heapster-amd64:v1.5.2
name: eventer name: eventer
command: command:
- /eventer - /eventer
...@@ -108,7 +108,7 @@ spec: ...@@ -108,7 +108,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 - --deployment=heapster-v1.5.2
- --container=heapster - --container=heapster
- --poll-period=300000 - --poll-period=300000
- --estimator=exponential - --estimator=exponential
...@@ -141,7 +141,7 @@ spec: ...@@ -141,7 +141,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 - --deployment=heapster-v1.5.2
- --container=eventer - --container=eventer
- --poll-period=300000 - --poll-period=300000
- --estimator=exponential - --estimator=exponential
......
cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml
View file @ 965fd732
...@@ -36,30 +36,30 @@ data: ...@@ -36,30 +36,30 @@ data:
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
name: heapster-v1.5.0 name: heapster-v1.5.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 version: v1.5.2
spec: spec:
replicas: 1 replicas: 1
selector: selector:
matchLabels: matchLabels:
k8s-app: heapster k8s-app: heapster
version: v1.5.0 version: v1.5.2
template: template:
metadata: metadata:
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v1.5.0 version: v1.5.2
annotations: annotations:
scheduler.alpha.kubernetes.io/critical-pod: '' scheduler.alpha.kubernetes.io/critical-pod: ''
spec: spec:
priorityClassName: system-cluster-critical priorityClassName: system-cluster-critical
containers: containers:
- image: k8s.gcr.io/heapster-amd64:v1.5.0 - image: k8s.gcr.io/heapster-amd64:v1.5.2
name: heapster name: heapster
livenessProbe: livenessProbe:
httpGet: httpGet:
...@@ -72,7 +72,7 @@ spec: ...@@ -72,7 +72,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: k8s.gcr.io/heapster-amd64:v1.5.0 - image: k8s.gcr.io/heapster-amd64:v1.5.2
name: eventer name: eventer
command: command:
- /eventer - /eventer
...@@ -107,7 +107,7 @@ spec: ...@@ -107,7 +107,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 - --deployment=heapster-v1.5.2
- --container=heapster - --container=heapster
- --poll-period=300000 - --poll-period=300000
- --estimator=exponential - --estimator=exponential
...@@ -140,7 +140,7 @@ spec: ...@@ -140,7 +140,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 - --deployment=heapster-v1.5.2
- --container=eventer - --container=eventer
- --poll-period=300000 - --poll-period=300000
- --estimator=exponential - --estimator=exponential
......
cluster/addons/cluster-monitoring/stackdriver/heapster-controller.yaml
View file @ 965fd732
...@@ -23,30 +23,30 @@ data: ...@@ -23,30 +23,30 @@ data:
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
name: heapster-v1.5.0 name: heapster-v1.5.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 version: v1.5.2
spec: spec:
replicas: 1 replicas: 1
selector: selector:
matchLabels: matchLabels:
k8s-app: heapster k8s-app: heapster
version: v1.5.0 version: v1.5.2
template: template:
metadata: metadata:
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v1.5.0 version: v1.5.2
annotations: annotations:
scheduler.alpha.kubernetes.io/critical-pod: '' scheduler.alpha.kubernetes.io/critical-pod: ''
spec: spec:
priorityClassName: system-cluster-critical priorityClassName: system-cluster-critical
containers: containers:
- image: k8s.gcr.io/heapster-amd64:v1.5.0 - image: k8s.gcr.io/heapster-amd64:v1.5.2
name: heapster name: heapster
livenessProbe: livenessProbe:
httpGet: httpGet:
...@@ -108,7 +108,7 @@ spec: ...@@ -108,7 +108,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 - --deployment=heapster-v1.5.2
- --container=heapster - --container=heapster
- --poll-period=300000 - --poll-period=300000
- --estimator=exponential - --estimator=exponential
......
cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml
View file @ 965fd732
...@@ -23,30 +23,30 @@ data: ...@@ -23,30 +23,30 @@ data:
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
name: heapster-v1.5.0 name: heapster-v1.5.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 version: v1.5.2
spec: spec:
replicas: 1 replicas: 1
selector: selector:
matchLabels: matchLabels:
k8s-app: heapster k8s-app: heapster
version: v1.5.0 version: v1.5.2
template: template:
metadata: metadata:
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v1.5.0 version: v1.5.2
annotations: annotations:
scheduler.alpha.kubernetes.io/critical-pod: '' scheduler.alpha.kubernetes.io/critical-pod: ''
spec: spec:
priorityClassName: system-cluster-critical priorityClassName: system-cluster-critical
containers: containers:
- image: k8s.gcr.io/heapster-amd64:v1.5.0 - image: k8s.gcr.io/heapster-amd64:v1.5.2
name: heapster name: heapster
livenessProbe: livenessProbe:
httpGet: httpGet:
...@@ -87,7 +87,7 @@ spec: ...@@ -87,7 +87,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 - --deployment=heapster-v1.5.2
- --container=heapster - --container=heapster
- --poll-period=300000 - --poll-period=300000
- --estimator=exponential - --estimator=exponential
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment