Skip to content

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

Merge pull request #52439 from piosz/hea-1.5-beta

Automatic merge from submit-queue (batch tested with PRs 52376, 52439, 52382, 52358, 52372) Bumped Heapster to v1.5.0-beta.0
parents d9615b2f ff7dd622
Hide whitespace changes
Inline Side-by-side
Showing with 36 additions and 36 deletions
cluster/addons/cluster-monitoring/google/heapster-controller.yaml
View file @ 5135b5ac
...@@ -23,29 +23,29 @@ metadata: ...@@ -23,29 +23,29 @@ metadata:
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
name: heapster-v1.4.1 name: heapster-v1.5.0-beta.0
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.4.1 version: v1.5.0-beta.0
spec: spec:
replicas: 1 replicas: 1
selector: selector:
matchLabels: matchLabels:
k8s-app: heapster k8s-app: heapster
version: v1.4.1 version: v1.5.0-beta.0
template: template:
metadata: metadata:
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v1.4.1 version: v1.5.0-beta.0
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.4.1 - image: gcr.io/google_containers/heapster-amd64:v1.5.0-beta.0
name: heapster name: heapster
livenessProbe: livenessProbe:
httpGet: httpGet:
...@@ -65,7 +65,7 @@ spec: ...@@ -65,7 +65,7 @@ spec:
- name: usr-ca-certs - name: usr-ca-certs
mountPath: /usr/share/ca-certificates mountPath: /usr/share/ca-certificates
readOnly: true readOnly: true
- image: gcr.io/google_containers/heapster-amd64:v1.4.1 - image: gcr.io/google_containers/heapster-amd64:v1.5.0-beta.0
name: eventer name: eventer
command: command:
- /eventer - /eventer
...@@ -102,7 +102,7 @@ spec: ...@@ -102,7 +102,7 @@ spec:
- --extra-cpu={{ metrics_cpu_per_node }}m - --extra-cpu={{ metrics_cpu_per_node }}m
- --memory={{ base_metrics_memory }} - --memory={{ base_metrics_memory }}
- --extra-memory={{metrics_memory_per_node}}Mi - --extra-memory={{metrics_memory_per_node}}Mi
- --deployment=heapster-v1.4.1 - --deployment=heapster-v1.5.0-beta.0
- --container=heapster - --container=heapster
- --poll-period=300000 - --poll-period=300000
- image: gcr.io/google_containers/addon-resizer:2.0 - image: gcr.io/google_containers/addon-resizer:2.0
...@@ -129,7 +129,7 @@ spec: ...@@ -129,7 +129,7 @@ spec:
- --extra-cpu=0m - --extra-cpu=0m
- --memory={{base_eventer_memory}} - --memory={{base_eventer_memory}}
- --extra-memory={{eventer_memory_per_node}}Ki - --extra-memory={{eventer_memory_per_node}}Ki
- --deployment=heapster-v1.4.1 - --deployment=heapster-v1.5.0-beta.0
- --container=eventer - --container=eventer
- --poll-period=300000 - --poll-period=300000
volumes: volumes:
......
cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
View file @ 5135b5ac
...@@ -23,29 +23,29 @@ metadata: ...@@ -23,29 +23,29 @@ metadata:
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
name: heapster-v1.4.1 name: heapster-v1.5.0-beta.0
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.4.1 version: v1.5.0-beta.0
spec: spec:
replicas: 1 replicas: 1
selector: selector:
matchLabels: matchLabels:
k8s-app: heapster k8s-app: heapster
version: v1.4.1 version: v1.5.0-beta.0
template: template:
metadata: metadata:
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v1.4.1 version: v1.5.0-beta.0
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.4.1 - image: gcr.io/google_containers/heapster-amd64:v1.5.0-beta.0
name: heapster name: heapster
livenessProbe: livenessProbe:
httpGet: httpGet:
...@@ -66,7 +66,7 @@ spec: ...@@ -66,7 +66,7 @@ spec:
- name: usr-ca-certs - name: usr-ca-certs
mountPath: /usr/share/ca-certificates mountPath: /usr/share/ca-certificates
readOnly: true readOnly: true
- image: gcr.io/google_containers/heapster-amd64:v1.4.1 - image: gcr.io/google_containers/heapster-amd64:v1.5.0-beta.0
name: eventer name: eventer
command: command:
- /eventer - /eventer
...@@ -103,7 +103,7 @@ spec: ...@@ -103,7 +103,7 @@ spec:
- --extra-cpu={{ metrics_cpu_per_node }}m - --extra-cpu={{ metrics_cpu_per_node }}m
- --memory={{ base_metrics_memory }} - --memory={{ base_metrics_memory }}
- --extra-memory={{ metrics_memory_per_node }}Mi - --extra-memory={{ metrics_memory_per_node }}Mi
- --deployment=heapster-v1.4.1 - --deployment=heapster-v1.5.0-beta.0
- --container=heapster - --container=heapster
- --poll-period=300000 - --poll-period=300000
- image: gcr.io/google_containers/addon-resizer:2.0 - image: gcr.io/google_containers/addon-resizer:2.0
...@@ -130,7 +130,7 @@ spec: ...@@ -130,7 +130,7 @@ spec:
- --extra-cpu=0m - --extra-cpu=0m
- --memory={{ base_eventer_memory }} - --memory={{ base_eventer_memory }}
- --extra-memory={{ eventer_memory_per_node }}Ki - --extra-memory={{ eventer_memory_per_node }}Ki
- --deployment=heapster-v1.4.1 - --deployment=heapster-v1.5.0-beta.0
- --container=eventer - --container=eventer
- --poll-period=300000 - --poll-period=300000
volumes: volumes:
......
cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml
View file @ 5135b5ac
...@@ -23,29 +23,29 @@ metadata: ...@@ -23,29 +23,29 @@ metadata:
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
name: heapster-v1.4.1 name: heapster-v1.5.0-beta.0
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.4.1 version: v1.5.0-beta.0
spec: spec:
replicas: 1 replicas: 1
selector: selector:
matchLabels: matchLabels:
k8s-app: heapster k8s-app: heapster
version: v1.4.1 version: v1.5.0-beta.0
template: template:
metadata: metadata:
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v1.4.1 version: v1.5.0-beta.0
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.4.1 - image: gcr.io/google_containers/heapster-amd64:v1.5.0-beta.0
name: heapster name: heapster
livenessProbe: livenessProbe:
httpGet: httpGet:
...@@ -58,7 +58,7 @@ spec: ...@@ -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.4.1 - image: gcr.io/google_containers/heapster-amd64:v1.5.0-beta.0
name: eventer name: eventer
command: command:
- /eventer - /eventer
...@@ -88,7 +88,7 @@ spec: ...@@ -88,7 +88,7 @@ spec:
- --extra-cpu={{ metrics_cpu_per_node }}m - --extra-cpu={{ metrics_cpu_per_node }}m
- --memory={{ base_metrics_memory }} - --memory={{ base_metrics_memory }}
- --extra-memory={{ metrics_memory_per_node }}Mi - --extra-memory={{ metrics_memory_per_node }}Mi
- --deployment=heapster-v1.4.1 - --deployment=heapster-v1.5.0-beta.0
- --container=heapster - --container=heapster
- --poll-period=300000 - --poll-period=300000
- image: gcr.io/google_containers/addon-resizer:2.0 - image: gcr.io/google_containers/addon-resizer:2.0
...@@ -115,7 +115,7 @@ spec: ...@@ -115,7 +115,7 @@ spec:
- --extra-cpu=0m - --extra-cpu=0m
- --memory={{ base_eventer_memory }} - --memory={{ base_eventer_memory }}
- --extra-memory={{ eventer_memory_per_node }}Ki - --extra-memory={{ eventer_memory_per_node }}Ki
- --deployment=heapster-v1.4.1 - --deployment=heapster-v1.5.0-beta.0
- --container=eventer - --container=eventer
- --poll-period=300000 - --poll-period=300000
serviceAccountName: heapster serviceAccountName: heapster
......
cluster/addons/cluster-monitoring/stackdriver/heapster-controller.yaml
View file @ 5135b5ac
...@@ -21,29 +21,29 @@ metadata: ...@@ -21,29 +21,29 @@ metadata:
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
name: heapster-v1.4.1 name: heapster-v1.5.0-beta.0
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.4.1 version: v1.5.0-beta.0
spec: spec:
replicas: 1 replicas: 1
selector: selector:
matchLabels: matchLabels:
k8s-app: heapster k8s-app: heapster
version: v1.4.1 version: v1.5.0-beta.0
template: template:
metadata: metadata:
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v1.4.1 version: v1.5.0-beta.0
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.4.1 - image: gcr.io/google_containers/heapster-amd64:v1.5.0-beta.0
name: heapster name: heapster
livenessProbe: livenessProbe:
httpGet: httpGet:
...@@ -110,7 +110,7 @@ spec: ...@@ -110,7 +110,7 @@ spec:
- --extra-cpu={{ metrics_cpu_per_node }}m - --extra-cpu={{ metrics_cpu_per_node }}m
- --memory={{ base_metrics_memory }} - --memory={{ base_metrics_memory }}
- --extra-memory={{metrics_memory_per_node}}Mi - --extra-memory={{metrics_memory_per_node}}Mi
- --deployment=heapster-v1.4.1 - --deployment=heapster-v1.5.0-beta.0
- --container=heapster - --container=heapster
- --poll-period=300000 - --poll-period=300000
volumes: volumes:
......
cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml
View file @ 5135b5ac
...@@ -21,29 +21,29 @@ metadata: ...@@ -21,29 +21,29 @@ metadata:
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
name: heapster-v1.4.1 name: heapster-v1.5.0-beta.0
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.4.1 version: v1.5.0-beta.0
spec: spec:
replicas: 1 replicas: 1
selector: selector:
matchLabels: matchLabels:
k8s-app: heapster k8s-app: heapster
version: v1.4.1 version: v1.5.0-beta.0
template: template:
metadata: metadata:
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v1.4.1 version: v1.5.0-beta.0
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.4.1 - image: gcr.io/google_containers/heapster-amd64:v1.5.0-beta.0
name: heapster name: heapster
livenessProbe: livenessProbe:
httpGet: httpGet:
...@@ -79,7 +79,7 @@ spec: ...@@ -79,7 +79,7 @@ spec:
- --extra-cpu={{ metrics_cpu_per_node }}m - --extra-cpu={{ metrics_cpu_per_node }}m
- --memory={{ base_metrics_memory }} - --memory={{ base_metrics_memory }}
- --extra-memory={{ metrics_memory_per_node }}Mi - --extra-memory={{ metrics_memory_per_node }}Mi
- --deployment=heapster-v1.4.1 - --deployment=heapster-v1.5.0-beta.0
- --container=heapster - --container=heapster
- --poll-period=300000 - --poll-period=300000
serviceAccountName: heapster serviceAccountName: heapster
......
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