Skip to content

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

Merge pull request #31878 from mksalawa/heapster_liveness_probe

Automatic merge from submit-queue Add Heapster liveness probe **What this PR does / why we need it**: Add liveness probe for heapster service. **Which issue this PR fixes** [https://github.com/kubernetes/heapster/issues/1251](https://github.com/kubernetes/heapster/issues/1251) **Release note**: ```release-note Added liveness probe to Heapster service. ```
parents 4e1ff53b 92c7feaf
Hide whitespace changes
Inline Side-by-side
Showing with 58 additions and 30 deletions
cluster/addons/cluster-monitoring/google/heapster-controller.yaml
View file @ df24500c
...@@ -20,30 +20,37 @@ ...@@ -20,30 +20,37 @@
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
name: heapster-v1.2.0-beta.1 name: heapster-v1.2.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"
version: v1.2.0-beta.1 version: v1.2.0-beta.2
spec: spec:
replicas: 1 replicas: 1
selector: selector:
matchLabels: matchLabels:
k8s-app: heapster k8s-app: heapster
version: v1.2.0-beta.1 version: v1.2.0-beta.2
template: template:
metadata: metadata:
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v1.2.0-beta.1 version: v1.2.0-beta.2
annotations: annotations:
scheduler.alpha.kubernetes.io/critical-pod: '' scheduler.alpha.kubernetes.io/critical-pod: ''
scheduler.alpha.kubernetes.io/tolerations: '[{"key":"CriticalAddonsOnly", "operator":"Exists"}]' scheduler.alpha.kubernetes.io/tolerations: '[{"key":"CriticalAddonsOnly", "operator":"Exists"}]'
spec: spec:
containers: containers:
- image: gcr.io/google_containers/heapster:v1.2.0-beta.1 - image: gcr.io/google_containers/heapster:v1.2.0-beta.2
name: heapster name: heapster
livenessProbe:
httpGet:
path: /healthz
port: 8080
scheme: HTTP
initialDelaySeconds: 180
timeoutSeconds: 5
resources: resources:
# keep request = limit to keep this container in guaranteed class # keep request = limit to keep this container in guaranteed class
limits: limits:
...@@ -60,7 +67,7 @@ spec: ...@@ -60,7 +67,7 @@ spec:
- name: ssl-certs - name: ssl-certs
mountPath: /etc/ssl/certs mountPath: /etc/ssl/certs
readOnly: true readOnly: true
- image: gcr.io/google_containers/heapster:v1.2.0-beta.1 - image: gcr.io/google_containers/heapster:v1.2.0-beta.2
name: eventer name: eventer
resources: resources:
# keep request = limit to keep this container in guaranteed class # keep request = limit to keep this container in guaranteed class
...@@ -103,7 +110,7 @@ spec: ...@@ -103,7 +110,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.2.0-beta.1 - --deployment=heapster-v1.2.0-beta.2
- --container=heapster - --container=heapster
- --poll-period=300000 - --poll-period=300000
- --estimator=exponential - --estimator=exponential
...@@ -132,7 +139,7 @@ spec: ...@@ -132,7 +139,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.2.0-beta.1 - --deployment=heapster-v1.2.0-beta.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 @ df24500c
...@@ -20,30 +20,37 @@ ...@@ -20,30 +20,37 @@
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
name: heapster-v1.2.0-beta.1 name: heapster-v1.2.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"
version: v1.2.0-beta.1 version: v1.2.0-beta.2
spec: spec:
replicas: 1 replicas: 1
selector: selector:
matchLabels: matchLabels:
k8s-app: heapster k8s-app: heapster
version: v1.2.0-beta.1 version: v1.2.0-beta.2
template: template:
metadata: metadata:
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v1.2.0-beta.1 version: v1.2.0-beta.2
annotations: annotations:
scheduler.alpha.kubernetes.io/critical-pod: '' scheduler.alpha.kubernetes.io/critical-pod: ''
scheduler.alpha.kubernetes.io/tolerations: '[{"key":"CriticalAddonsOnly", "operator":"Exists"}]' scheduler.alpha.kubernetes.io/tolerations: '[{"key":"CriticalAddonsOnly", "operator":"Exists"}]'
spec: spec:
containers: containers:
- image: gcr.io/google_containers/heapster:v1.2.0-beta.1 - image: gcr.io/google_containers/heapster:v1.2.0-beta.2
name: heapster name: heapster
livenessProbe:
httpGet:
path: /healthz
port: 8080
scheme: HTTP
initialDelaySeconds: 180
timeoutSeconds: 5
resources: resources:
# keep request = limit to keep this container in guaranteed class # keep request = limit to keep this container in guaranteed class
limits: limits:
...@@ -61,7 +68,7 @@ spec: ...@@ -61,7 +68,7 @@ spec:
- name: ssl-certs - name: ssl-certs
mountPath: /etc/ssl/certs mountPath: /etc/ssl/certs
readOnly: true readOnly: true
- image: gcr.io/google_containers/heapster:v1.2.0-beta.1 - image: gcr.io/google_containers/heapster:v1.2.0-beta.2
name: eventer name: eventer
resources: resources:
# keep request = limit to keep this container in guaranteed class # keep request = limit to keep this container in guaranteed class
...@@ -104,7 +111,7 @@ spec: ...@@ -104,7 +111,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.2.0-beta.1 - --deployment=heapster-v1.2.0-beta.2
- --container=heapster - --container=heapster
- --poll-period=300000 - --poll-period=300000
- --estimator=exponential - --estimator=exponential
...@@ -133,7 +140,7 @@ spec: ...@@ -133,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.2.0-beta.1 - --deployment=heapster-v1.2.0-beta.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 @ df24500c
...@@ -20,30 +20,37 @@ ...@@ -20,30 +20,37 @@
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
name: heapster-v1.2.0-beta.1 name: heapster-v1.2.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"
version: v1.2.0-beta.1 version: v1.2.0-beta.2
spec: spec:
replicas: 1 replicas: 1
selector: selector:
matchLabels: matchLabels:
k8s-app: heapster k8s-app: heapster
version: v1.2.0-beta.1 version: v1.2.0-beta.2
template: template:
metadata: metadata:
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v1.2.0-beta.1 version: v1.2.0-beta.2
annotations: annotations:
scheduler.alpha.kubernetes.io/critical-pod: '' scheduler.alpha.kubernetes.io/critical-pod: ''
scheduler.alpha.kubernetes.io/tolerations: '[{"key":"CriticalAddonsOnly", "operator":"Exists"}]' scheduler.alpha.kubernetes.io/tolerations: '[{"key":"CriticalAddonsOnly", "operator":"Exists"}]'
spec: spec:
containers: containers:
- image: gcr.io/google_containers/heapster:v1.2.0-beta.1 - image: gcr.io/google_containers/heapster:v1.2.0-beta.2
name: heapster name: heapster
livenessProbe:
httpGet:
path: /healthz
port: 8080
scheme: HTTP
initialDelaySeconds: 180
timeoutSeconds: 5
resources: resources:
# keep request = limit to keep this container in guaranteed class # keep request = limit to keep this container in guaranteed class
limits: limits:
...@@ -56,7 +63,7 @@ spec: ...@@ -56,7 +63,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:v1.2.0-beta.1 - image: gcr.io/google_containers/heapster:v1.2.0-beta.2
name: eventer name: eventer
resources: resources:
# keep request = limit to keep this container in guaranteed class # keep request = limit to keep this container in guaranteed class
...@@ -95,7 +102,7 @@ spec: ...@@ -95,7 +102,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.2.0-beta.1 - --deployment=heapster-v1.2.0-beta.2
- --container=heapster - --container=heapster
- --poll-period=300000 - --poll-period=300000
- --estimator=exponential - --estimator=exponential
...@@ -124,7 +131,7 @@ spec: ...@@ -124,7 +131,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.2.0-beta.1 - --deployment=heapster-v1.2.0-beta.2
- --container=eventer - --container=eventer
- --poll-period=300000 - --poll-period=300000
- --estimator=exponential - --estimator=exponential
......
cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml
View file @ df24500c
...@@ -16,30 +16,37 @@ ...@@ -16,30 +16,37 @@
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
name: heapster-v1.2.0-beta.1 name: heapster-v1.2.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"
version: v1.2.0-beta.1 version: v1.2.0-beta.2
spec: spec:
replicas: 1 replicas: 1
selector: selector:
matchLabels: matchLabels:
k8s-app: heapster k8s-app: heapster
version: v1.2.0-beta.1 version: v1.2.0-beta.2
template: template:
metadata: metadata:
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v1.2.0-beta.1 version: v1.2.0-beta.2
annotations: annotations:
scheduler.alpha.kubernetes.io/critical-pod: '' scheduler.alpha.kubernetes.io/critical-pod: ''
scheduler.alpha.kubernetes.io/tolerations: '[{"key":"CriticalAddonsOnly", "operator":"Exists"}]' scheduler.alpha.kubernetes.io/tolerations: '[{"key":"CriticalAddonsOnly", "operator":"Exists"}]'
spec: spec:
containers: containers:
- image: gcr.io/google_containers/heapster:v1.2.0-beta.1 - image: gcr.io/google_containers/heapster:v1.2.0-beta.2
name: heapster name: heapster
livenessProbe:
httpGet:
path: /healthz
port: 8080
scheme: HTTP
initialDelaySeconds: 180
timeoutSeconds: 5
resources: resources:
# keep request = limit to keep this container in guaranteed class # keep request = limit to keep this container in guaranteed class
limits: limits:
...@@ -76,7 +83,7 @@ spec: ...@@ -76,7 +83,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.2.0-beta.1 - --deployment=heapster-v1.2.0-beta.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