Skip to content

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

Merge pull request #32362 from piosz/heap

Automatic merge from submit-queue Bumped Heapster to v1.2.0-beta.3 The new version contains Kubernetes deps in version `1.4.0-beta.0`
parents b93860d6 2d87deb0
Hide whitespace changes
Inline Side-by-side
Showing with 36 additions and 36 deletions
cluster/addons/cluster-monitoring/google/heapster-controller.yaml
View file @ 20763190
...@@ -20,29 +20,29 @@ ...@@ -20,29 +20,29 @@
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
name: heapster-v1.2.0-beta.2 name: heapster-v1.2.0-beta.3
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.2 version: v1.2.0-beta.3
spec: spec:
replicas: 1 replicas: 1
selector: selector:
matchLabels: matchLabels:
k8s-app: heapster k8s-app: heapster
version: v1.2.0-beta.2 version: v1.2.0-beta.3
template: template:
metadata: metadata:
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v1.2.0-beta.2 version: v1.2.0-beta.3
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.2 - image: gcr.io/google_containers/heapster:v1.2.0-beta.3
name: heapster name: heapster
livenessProbe: livenessProbe:
httpGet: httpGet:
...@@ -67,7 +67,7 @@ spec: ...@@ -67,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.2 - image: gcr.io/google_containers/heapster:v1.2.0-beta.3
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
...@@ -110,7 +110,7 @@ spec: ...@@ -110,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.2 - --deployment=heapster-v1.2.0-beta.3
- --container=heapster - --container=heapster
- --poll-period=300000 - --poll-period=300000
- --estimator=exponential - --estimator=exponential
...@@ -139,7 +139,7 @@ spec: ...@@ -139,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.2 - --deployment=heapster-v1.2.0-beta.3
- --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 @ 20763190
...@@ -20,29 +20,29 @@ ...@@ -20,29 +20,29 @@
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
name: heapster-v1.2.0-beta.2 name: heapster-v1.2.0-beta.3
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.2 version: v1.2.0-beta.3
spec: spec:
replicas: 1 replicas: 1
selector: selector:
matchLabels: matchLabels:
k8s-app: heapster k8s-app: heapster
version: v1.2.0-beta.2 version: v1.2.0-beta.3
template: template:
metadata: metadata:
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v1.2.0-beta.2 version: v1.2.0-beta.3
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.2 - image: gcr.io/google_containers/heapster:v1.2.0-beta.3
name: heapster name: heapster
livenessProbe: livenessProbe:
httpGet: httpGet:
...@@ -68,7 +68,7 @@ spec: ...@@ -68,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.2 - image: gcr.io/google_containers/heapster:v1.2.0-beta.3
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
...@@ -111,7 +111,7 @@ spec: ...@@ -111,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.2 - --deployment=heapster-v1.2.0-beta.3
- --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.2.0-beta.2 - --deployment=heapster-v1.2.0-beta.3
- --container=eventer - --container=eventer
- --poll-period=300000 - --poll-period=300000
- --estimator=exponential - --estimator=exponential
......
cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml
View file @ 20763190
...@@ -20,29 +20,29 @@ ...@@ -20,29 +20,29 @@
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
name: heapster-v1.2.0-beta.2 name: heapster-v1.2.0-beta.3
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.2 version: v1.2.0-beta.3
spec: spec:
replicas: 1 replicas: 1
selector: selector:
matchLabels: matchLabels:
k8s-app: heapster k8s-app: heapster
version: v1.2.0-beta.2 version: v1.2.0-beta.3
template: template:
metadata: metadata:
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v1.2.0-beta.2 version: v1.2.0-beta.3
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.2 - image: gcr.io/google_containers/heapster:v1.2.0-beta.3
name: heapster name: heapster
livenessProbe: livenessProbe:
httpGet: httpGet:
...@@ -63,7 +63,7 @@ spec: ...@@ -63,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.2 - image: gcr.io/google_containers/heapster:v1.2.0-beta.3
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
...@@ -102,7 +102,7 @@ spec: ...@@ -102,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.2 - --deployment=heapster-v1.2.0-beta.3
- --container=heapster - --container=heapster
- --poll-period=300000 - --poll-period=300000
- --estimator=exponential - --estimator=exponential
...@@ -131,7 +131,7 @@ spec: ...@@ -131,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.2 - --deployment=heapster-v1.2.0-beta.3
- --container=eventer - --container=eventer
- --poll-period=300000 - --poll-period=300000
- --estimator=exponential - --estimator=exponential
......
cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml
View file @ 20763190
...@@ -16,29 +16,29 @@ ...@@ -16,29 +16,29 @@
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
name: heapster-v1.2.0-beta.2 name: heapster-v1.2.0-beta.3
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.2 version: v1.2.0-beta.3
spec: spec:
replicas: 1 replicas: 1
selector: selector:
matchLabels: matchLabels:
k8s-app: heapster k8s-app: heapster
version: v1.2.0-beta.2 version: v1.2.0-beta.3
template: template:
metadata: metadata:
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v1.2.0-beta.2 version: v1.2.0-beta.3
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.2 - image: gcr.io/google_containers/heapster:v1.2.0-beta.3
name: heapster name: heapster
livenessProbe: livenessProbe:
httpGet: httpGet:
...@@ -83,7 +83,7 @@ spec: ...@@ -83,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.2 - --deployment=heapster-v1.2.0-beta.3
- --container=heapster - --container=heapster
- --poll-period=300000 - --poll-period=300000
- --estimator=exponential - --estimator=exponential
test/kubemark/resources/heapster_template.json
View file @ 20763190
...@@ -2,23 +2,23 @@ ...@@ -2,23 +2,23 @@
"kind": "ReplicationController", "kind": "ReplicationController",
"apiVersion": "v1", "apiVersion": "v1",
"metadata": { "metadata": {
"name": "heapster-v1.1.0", "name": "heapster-v1.2.0-beta.3",
"labels": { "labels": {
"k8s-app": "heapster", "k8s-app": "heapster",
"version": "v1.1.0" "version": "v1.2.0-beta.3"
} }
}, },
"spec": { "spec": {
"replicas": 1, "replicas": 1,
"selector": { "selector": {
"k8s-app": "heapster", "k8s-app": "heapster",
"version": "v1.1.0" "version": "v1.2.0-beta.3"
}, },
"template": { "template": {
"metadata": { "metadata": {
"labels": { "labels": {
"k8s-app": "heapster", "k8s-app": "heapster",
"version": "v1.1.0" "version": "v1.2.0-beta.3"
} }
}, },
"spec": { "spec": {
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
"containers": [ "containers": [
{ {
"name": "heapster", "name": "heapster",
"image": "gcr.io/google_containers/heapster:v1.2.0-beta.1", "image": "gcr.io/google_containers/heapster:v1.2.0-beta.3",
"resources": { "resources": {
"requests": { "requests": {
"cpu": "100m", "cpu": "100m",
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
}, },
{ {
"name": "eventer", "name": "eventer",
"image": "gcr.io/google_containers/heapster:v1.2.0-beta.1", "image": "gcr.io/google_containers/heapster:v1.2.0-beta.3",
"resources": { "resources": {
"requests": { "requests": {
"cpu": "100m", "cpu": "100m",
......
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