Skip to content

K
k3s
Commit 18e67573 authored by Filip Grzadkowski's avatar Filip Grzadkowski
Browse files
Options

Merge pull request #25739 from piosz/heapster-1.1.0-beta2

Bumped Heapster to v1.1.0-beta2
parents 4ea034c2 eea3a4e5
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 34 deletions
cluster/addons/cluster-monitoring/google/heapster-controller.yaml
View file @ 18e67573
......@@ -11,26 +11,26 @@
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: heapster-v1.1.0.beta1
name: heapster-v1.1.0.beta2
namespace: kube-system
labels:
k8s-app: heapster
kubernetes.io/cluster-service: "true"
version: v1.1.0.beta1
version: v1.1.0.beta2
spec:
replicas: 1
selector:
matchLabels:
k8s-app: heapster
version: v1.1.0.beta1
version: v1.1.0.beta2
template:
metadata:
labels:
k8s-app: heapster
version: v1.1.0.beta1
version: v1.1.0.beta2
spec:
containers:
- image: gcr.io/google_containers/heapster:v1.1.0-beta1
- image: gcr.io/google_containers/heapster:v1.1.0-beta2
name: heapster
resources:
# keep request = limit to keep this container in guaranteed class
......@@ -44,12 +44,11 @@ spec:
- /heapster
- --source=kubernetes.summary_api:''
- --sink=gcm
- --metric_resolution=60s
volumeMounts:
- name: ssl-certs
mountPath: /etc/ssl/certs
readOnly: true
- image: gcr.io/google_containers/heapster:v1.1.0-beta1
- image: gcr.io/google_containers/heapster:v1.1.0-beta2
name: eventer
resources:
# keep request = limit to keep this container in guaranteed class
......@@ -92,7 +91,7 @@ spec:
- --memory={{ metrics_memory }}
- --extra-memory={{metrics_memory_per_node}}Mi
- --threshold=5
- --deployment=heapster-v1.1.0.beta1
- --deployment=heapster-v1.1.0.beta2
- --container=heapster
- --poll-period=300000
- image: gcr.io/google_containers/addon-resizer:1.0
......@@ -120,7 +119,7 @@ spec:
- --memory={{eventer_memory}}
- --extra-memory={{eventer_memory_per_node}}Ki
- --threshold=5
- --deployment=heapster-v1.1.0.beta1
- --deployment=heapster-v1.1.0.beta2
- --container=eventer
- --poll-period=300000
volumes:
......
cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
View file @ 18e67573
......@@ -11,26 +11,26 @@
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: heapster-v1.1.0.beta1
name: heapster-v1.1.0.beta2
namespace: kube-system
labels:
k8s-app: heapster
kubernetes.io/cluster-service: "true"
version: v1.1.0.beta1
version: v1.1.0.beta2
spec:
replicas: 1
selector:
matchLabels:
k8s-app: heapster
version: v1.1.0.beta1
version: v1.1.0.beta2
template:
metadata:
labels:
k8s-app: heapster
version: v1.1.0.beta1
version: v1.1.0.beta2
spec:
containers:
- image: gcr.io/google_containers/heapster:v1.1.0-beta1
- image: gcr.io/google_containers/heapster:v1.1.0-beta2
name: heapster
resources:
# keep request = limit to keep this container in guaranteed class
......@@ -45,12 +45,11 @@ spec:
- --source=kubernetes.summary_api:''
- --sink=influxdb:http://monitoring-influxdb:8086
- --sink=gcm:?metrics=autoscaling
- --metric_resolution=60s
volumeMounts:
- name: ssl-certs
mountPath: /etc/ssl/certs
readOnly: true
- image: gcr.io/google_containers/heapster:v1.1.0-beta1
- image: gcr.io/google_containers/heapster:v1.1.0-beta2
name: eventer
resources:
# keep request = limit to keep this container in guaranteed class
......@@ -93,7 +92,7 @@ spec:
- --memory={{ metrics_memory }}
- --extra-memory={{ metrics_memory_per_node }}Mi
- --threshold=5
- --deployment=heapster-v1.1.0.beta1
- --deployment=heapster-v1.1.0.beta2
- --container=heapster
- --poll-period=300000
- image: gcr.io/google_containers/addon-resizer:1.0
......@@ -121,7 +120,7 @@ spec:
- --memory={{ eventer_memory }}
- --extra-memory={{ eventer_memory_per_node }}Ki
- --threshold=5
- --deployment=heapster-v1.1.0.beta1
- --deployment=heapster-v1.1.0.beta2
- --container=eventer
- --poll-period=300000
volumes:
......
cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml
View file @ 18e67573
......@@ -11,26 +11,26 @@
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: heapster-v1.1.0.beta1
name: heapster-v1.1.0.beta2
namespace: kube-system
labels:
k8s-app: heapster
kubernetes.io/cluster-service: "true"
version: v1.1.0.beta1
version: v1.1.0.beta2
spec:
replicas: 1
selector:
matchLabels:
k8s-app: heapster
version: v1.1.0.beta1
version: v1.1.0.beta2
template:
metadata:
labels:
k8s-app: heapster
version: v1.1.0.beta1
version: v1.1.0.beta2
spec:
containers:
- image: gcr.io/google_containers/heapster:v1.1.0-beta1
- image: gcr.io/google_containers/heapster:v1.1.0-beta2
name: heapster
resources:
# keep request = limit to keep this container in guaranteed class
......@@ -44,8 +44,7 @@ spec:
- /heapster
- --source=kubernetes.summary_api:''
- --sink=influxdb:http://monitoring-influxdb:8086
- --metric_resolution=60s
- image: gcr.io/google_containers/heapster:v1.1.0-beta1
- image: gcr.io/google_containers/heapster:v1.1.0-beta2
name: eventer
resources:
# keep request = limit to keep this container in guaranteed class
......@@ -84,7 +83,7 @@ spec:
- --memory={{ metrics_memory }}
- --extra-memory={{ metrics_memory_per_node }}Mi
- --threshold=5
- --deployment=heapster-v1.1.0.beta1
- --deployment=heapster-v1.1.0.beta2
- --container=heapster
- --poll-period=300000
- image: gcr.io/google_containers/addon-resizer:1.0
......@@ -112,7 +111,7 @@ spec:
- --memory={{ eventer_memory }}
- --extra-memory={{ eventer_memory_per_node }}Ki
- --threshold=5
- --deployment=heapster-v1.1.0.beta1
- --deployment=heapster-v1.1.0.beta2
- --container=eventer
- --poll-period=300000
cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml
View file @ 18e67573
......@@ -8,26 +8,26 @@
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: heapster-v1.1.0.beta1
name: heapster-v1.1.0.beta2
namespace: kube-system
labels:
k8s-app: heapster
kubernetes.io/cluster-service: "true"
version: v1.1.0.beta1
version: v1.1.0.beta2
spec:
replicas: 1
selector:
matchLabels:
k8s-app: heapster
version: v1.1.0.beta1
version: v1.1.0.beta2
template:
metadata:
labels:
k8s-app: heapster
version: v1.1.0.beta1
version: v1.1.0.beta2
spec:
containers:
- image: gcr.io/google_containers/heapster:v1.1.0-beta1
- image: gcr.io/google_containers/heapster:v1.1.0-beta2
name: heapster
resources:
# keep request = limit to keep this container in guaranteed class
......@@ -40,7 +40,6 @@ spec:
command:
- /heapster
- --source=kubernetes.summary_api:''
- --metric_resolution=60s
- image: gcr.io/google_containers/addon-resizer:1.0
name: heapster-nanny
resources:
......@@ -66,6 +65,6 @@ spec:
- --memory={{ metrics_memory }}
- --extra-memory={{ metrics_memory_per_node }}Mi
- --threshold=5
- --deployment=heapster-v1.1.0.beta1
- --deployment=heapster-v1.1.0.beta2
- --container=heapster
- --poll-period=300000
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