Skip to content

K
k3s
Commit 365386e2 authored by k8s-merge-robot's avatar k8s-merge-robot
Browse files
Options

Merge pull request #26617 from sjpotter/heapster

Automatic merge from submit-queue cluster/coreos: Update heapster addon to beta2 fixes #26616 As noted there, heapster was updated but not for gce/coreos which breaks anything that depends on heapster's new metrics API (i.e. autoscaling)
parents 06f742a5 049c51e7
Hide whitespace changes
Inline Side-by-side
Showing with 36 additions and 43 deletions
cluster/gce/coreos/kube-manifests/addons/cluster-monitoring/google/heapster-controller.yaml
View file @ 365386e2
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta2
kind: Deployment kind: Deployment
metadata: metadata:
name: heapster-v1.1.0.beta1 name: heapster-v1.1.0.beta2
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.1.0.beta1 version: v1.1.0.beta2
spec: spec:
replicas: 1 replicas: 1
selector: selector:
matchLabels: matchLabels:
k8s-app: heapster k8s-app: heapster
version: v1.1.0.beta1 version: v1.1.0.beta2
template: template:
metadata: metadata:
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v1.1.0.beta1 version: v1.1.0.beta2
spec: spec:
containers: containers:
- image: gcr.io/google_containers/heapster:v1.1.0-beta1 - image: gcr.io/google_containers/heapster:v1.1.0-beta2
name: heapster name: heapster
resources: resources:
# keep request = limit to keep this container in guaranteed class # keep request = limit to keep this container in guaranteed class
...@@ -34,7 +34,6 @@ spec: ...@@ -34,7 +34,6 @@ spec:
- /heapster - /heapster
- --source=kubernetes.summary_api:'' - --source=kubernetes.summary_api:''
- --sink=gcm - --sink=gcm
- --metric_resolution=60s
volumeMounts: volumeMounts:
- name: ssl-certs - name: ssl-certs
mountPath: /etc/ssl/certs mountPath: /etc/ssl/certs
...@@ -42,7 +41,7 @@ spec: ...@@ -42,7 +41,7 @@ spec:
- name: usrsharecacerts - name: usrsharecacerts
mountPath: /usr/share/ca-certificates mountPath: /usr/share/ca-certificates
readOnly: true readOnly: true
- image: gcr.io/google_containers/heapster:v1.1.0-beta1 - image: gcr.io/google_containers/heapster:v1.1.0-beta2
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
...@@ -88,7 +87,7 @@ spec: ...@@ -88,7 +87,7 @@ spec:
- --memory=300Mi - --memory=300Mi
- --extra-memory=4Mi - --extra-memory=4Mi
- --threshold=5 - --threshold=5
- --deployment=heapster-v1.1.0.beta1 - --deployment=heapster-v1.1.0.beta2
- --container=heapster - --container=heapster
- --poll-period=300000 - --poll-period=300000
- image: gcr.io/google_containers/addon-resizer:1.0 - image: gcr.io/google_containers/addon-resizer:1.0
...@@ -116,7 +115,7 @@ spec: ...@@ -116,7 +115,7 @@ spec:
- --memory=300Mi - --memory=300Mi
- --extra-memory=307200Ki - --extra-memory=307200Ki
- --threshold=5 - --threshold=5
- --deployment=heapster-v1.1.0.beta1 - --deployment=heapster-v1.1.0.beta2
- --container=eventer - --container=eventer
- --poll-period=300000 - --poll-period=300000
volumes: volumes:
...@@ -125,4 +124,4 @@ spec: ...@@ -125,4 +124,4 @@ spec:
path: "/etc/ssl/certs" path: "/etc/ssl/certs"
- name: usrsharecacerts - name: usrsharecacerts
hostPath: hostPath:
path: "/usr/share/ca-certificates" path: "/usr/share/ca-certificates"
\ No newline at end of file
cluster/gce/coreos/kube-manifests/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
View file @ 365386e2
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta2
kind: Deployment kind: Deployment
metadata: metadata:
name: heapster-v1.1.0.beta1 name: heapster-v1.1.0.beta2
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.1.0.beta1 version: v1.1.0.beta2
spec: spec:
replicas: 1 replicas: 1
selector: selector:
matchLabels: matchLabels:
k8s-app: heapster k8s-app: heapster
version: v1.1.0.beta1 version: v1.1.0.beta2
template: template:
metadata: metadata:
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v1.1.0.beta1 version: v1.1.0.beta2
spec: spec:
containers: containers:
- image: gcr.io/google_containers/heapster:v1.1.0-beta1 - image: gcr.io/google_containers/heapster:v1.1.0-beta2
name: heapster name: heapster
resources: resources:
# keep request = limit to keep this container in guaranteed class # keep request = limit to keep this container in guaranteed class
...@@ -35,7 +35,6 @@ spec: ...@@ -35,7 +35,6 @@ 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
- --metric_resolution=60s
volumeMounts: volumeMounts:
- name: ssl-certs - name: ssl-certs
mountPath: /etc/ssl/certs mountPath: /etc/ssl/certs
...@@ -43,7 +42,7 @@ spec: ...@@ -43,7 +42,7 @@ spec:
- name: usrsharecacerts - name: usrsharecacerts
mountPath: /usr/share/ca-certificates mountPath: /usr/share/ca-certificates
readOnly: true readOnly: true
- image: gcr.io/google_containers/heapster:v1.1.0-beta1 - image: gcr.io/google_containers/heapster:v1.1.0-beta2
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
...@@ -89,7 +88,7 @@ spec: ...@@ -89,7 +88,7 @@ spec:
- --memory=300Mi - --memory=300Mi
- --extra-memory=4Mi - --extra-memory=4Mi
- --threshold=5 - --threshold=5
- --deployment=heapster-v1.1.0.beta1 - --deployment=heapster-v1.1.0.beta2
- --container=heapster - --container=heapster
- --poll-period=300000 - --poll-period=300000
- image: gcr.io/google_containers/addon-resizer:1.0 - image: gcr.io/google_containers/addon-resizer:1.0
...@@ -117,7 +116,7 @@ spec: ...@@ -117,7 +116,7 @@ spec:
- --memory=300Mi - --memory=300Mi
- --extra-memory=307200Ki - --extra-memory=307200Ki
- --threshold=5 - --threshold=5
- --deployment=heapster-v1.1.0.beta1 - --deployment=heapster-v1.1.0.beta2
- --container=eventer - --container=eventer
- --poll-period=300000 - --poll-period=300000
volumes: volumes:
...@@ -126,4 +125,4 @@ spec: ...@@ -126,4 +125,4 @@ spec:
path: "/etc/ssl/certs" path: "/etc/ssl/certs"
- name: usrsharecacerts - name: usrsharecacerts
hostPath: hostPath:
path: "/usr/share/ca-certificates" path: "/usr/share/ca-certificates"
\ No newline at end of file
cluster/gce/coreos/kube-manifests/addons/cluster-monitoring/influxdb/heapster-controller.yaml
View file @ 365386e2
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta2
kind: Deployment kind: Deployment
metadata: metadata:
name: heapster-v1.1.0.beta1 name: heapster-v1.1.0.beta2
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.1.0.beta1 version: v1.1.0.beta2
spec: spec:
replicas: 1 replicas: 1
selector: selector:
matchLabels: matchLabels:
k8s-app: heapster k8s-app: heapster
version: v1.1.0.beta1 version: v1.1.0.beta2
template: template:
metadata: metadata:
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v1.1.0.beta1 version: v1.1.0.beta2
spec: spec:
containers: containers:
- image: gcr.io/google_containers/heapster:v1.1.0-beta1 - image: gcr.io/google_containers/heapster:v1.1.0-beta2
name: heapster name: heapster
resources: resources:
# keep request = limit to keep this container in guaranteed class # keep request = limit to keep this container in guaranteed class
...@@ -34,8 +34,7 @@ spec: ...@@ -34,8 +34,7 @@ spec:
- /heapster - /heapster
- --source=kubernetes.summary_api:'' - --source=kubernetes.summary_api:''
- --sink=influxdb:http://monitoring-influxdb:8086 - --sink=influxdb:http://monitoring-influxdb:8086
- --metric_resolution=60s - image: gcr.io/google_containers/heapster:v1.1.0-beta2
- image: gcr.io/google_containers/heapster:v1.1.0-beta1
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
...@@ -74,7 +73,7 @@ spec: ...@@ -74,7 +73,7 @@ spec:
- --memory=300Mi - --memory=300Mi
- --extra-memory=4Mi - --extra-memory=4Mi
- --threshold=5 - --threshold=5
- --deployment=heapster-v1.1.0.beta1 - --deployment=heapster-v1.1.0.beta2
- --container=heapster - --container=heapster
- --poll-period=300000 - --poll-period=300000
- image: gcr.io/google_containers/addon-resizer:1.0 - image: gcr.io/google_containers/addon-resizer:1.0
...@@ -102,6 +101,6 @@ spec: ...@@ -102,6 +101,6 @@ spec:
- --memory=300Mi - --memory=300Mi
- --extra-memory=307200Ki - --extra-memory=307200Ki
- --threshold=5 - --threshold=5
- --deployment=heapster-v1.1.0.beta1 - --deployment=heapster-v1.1.0.beta2
- --container=eventer - --container=eventer
- --poll-period=300000 - --poll-period=300000
cluster/gce/coreos/kube-manifests/addons/cluster-monitoring/standalone/heapster-controller.yaml
View file @ 365386e2
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
name: heapster-v1.1.0.beta1 name: heapster-v1.1.0.beta2
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.1.0.beta1 version: v1.1.0.beta2
spec: spec:
replicas: 1 replicas: 1
selector: selector:
matchLabels: matchLabels:
k8s-app: heapster k8s-app: heapster
version: v1.1.0.beta1 version: v1.1.0.beta2
template: template:
metadata: metadata:
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v1.1.0.beta1 version: v1.1.0.beta2
spec: spec:
containers: containers:
- image: gcr.io/google_containers/heapster:v1.1.0-beta1 - image: gcr.io/google_containers/heapster:v1.1.0-beta2
name: heapster name: heapster
resources: resources:
# keep request = limit to keep this container in guaranteed class # keep request = limit to keep this container in guaranteed class
...@@ -33,7 +33,6 @@ spec: ...@@ -33,7 +33,6 @@ spec:
command: command:
- /heapster - /heapster
- --source=kubernetes.summary_api:'' - --source=kubernetes.summary_api:''
- --metric_resolution=60s
- image: gcr.io/google_containers/addon-resizer:1.0 - image: gcr.io/google_containers/addon-resizer:1.0
name: heapster-nanny name: heapster-nanny
resources: resources:
...@@ -59,6 +58,6 @@ spec: ...@@ -59,6 +58,6 @@ spec:
- --memory=300Mi - --memory=300Mi
- --extra-memory=4Mi - --extra-memory=4Mi
- --threshold=5 - --threshold=5
- --deployment=heapster-v1.1.0.beta1 - --deployment=heapster-v1.1.0.beta2
- --container=heapster - --container=heapster
- --poll-period=300000 - --poll-period=300000
\ No newline at end of file
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