Skip to content

K
k3s
Commit 69fd7aaf authored by Piotr Szczesniak's avatar Piotr Szczesniak
Browse files
Options

Bumped Heapster to v1.3.0

parent 223c721d
Hide whitespace changes
Inline Side-by-side
Showing with 36 additions and 36 deletions
cluster/addons/cluster-monitoring/google/heapster-controller.yaml
View file @ 69fd7aaf
...@@ -14,29 +14,29 @@ ...@@ -14,29 +14,29 @@
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
name: heapster-v1.3.0-beta.1 name: heapster-v1.3.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.3.0-beta.1 version: v1.3.0
spec: spec:
replicas: 1 replicas: 1
selector: selector:
matchLabels: matchLabels:
k8s-app: heapster k8s-app: heapster
version: v1.3.0-beta.1 version: v1.3.0
template: template:
metadata: metadata:
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v1.3.0-beta.1 version: v1.3.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.3.0-beta.1 - image: gcr.io/google_containers/heapster-amd64:v1.3.0
name: heapster name: heapster
livenessProbe: livenessProbe:
httpGet: httpGet:
...@@ -56,7 +56,7 @@ spec: ...@@ -56,7 +56,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.3.0-beta.1 - image: gcr.io/google_containers/heapster-amd64:v1.3.0
name: eventer name: eventer
command: command:
- /eventer - /eventer
...@@ -94,7 +94,7 @@ spec: ...@@ -94,7 +94,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.3.0-beta.1 - --deployment=heapster-v1.3.0
- --container=heapster - --container=heapster
- --poll-period=300000 - --poll-period=300000
- --estimator=exponential - --estimator=exponential
...@@ -123,7 +123,7 @@ spec: ...@@ -123,7 +123,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.3.0-beta.1 - --deployment=heapster-v1.3.0
- --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 @ 69fd7aaf
...@@ -14,29 +14,29 @@ ...@@ -14,29 +14,29 @@
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
name: heapster-v1.3.0-beta.1 name: heapster-v1.3.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.3.0-beta.1 version: v1.3.0
spec: spec:
replicas: 1 replicas: 1
selector: selector:
matchLabels: matchLabels:
k8s-app: heapster k8s-app: heapster
version: v1.3.0-beta.1 version: v1.3.0
template: template:
metadata: metadata:
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v1.3.0-beta.1 version: v1.3.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.3.0-beta.1 - image: gcr.io/google_containers/heapster-amd64:v1.3.0
name: heapster name: heapster
livenessProbe: livenessProbe:
httpGet: httpGet:
...@@ -57,7 +57,7 @@ spec: ...@@ -57,7 +57,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.3.0-beta.1 - image: gcr.io/google_containers/heapster-amd64:v1.3.0
name: eventer name: eventer
command: command:
- /eventer - /eventer
...@@ -95,7 +95,7 @@ spec: ...@@ -95,7 +95,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.3.0-beta.1 - --deployment=heapster-v1.3.0
- --container=heapster - --container=heapster
- --poll-period=300000 - --poll-period=300000
- --estimator=exponential - --estimator=exponential
...@@ -124,7 +124,7 @@ spec: ...@@ -124,7 +124,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.3.0-beta.1 - --deployment=heapster-v1.3.0
- --container=eventer - --container=eventer
- --poll-period=300000 - --poll-period=300000
- --estimator=exponential - --estimator=exponential
......
cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml
View file @ 69fd7aaf
...@@ -14,29 +14,29 @@ ...@@ -14,29 +14,29 @@
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
name: heapster-v1.3.0-beta.1 name: heapster-v1.3.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.3.0-beta.1 version: v1.3.0
spec: spec:
replicas: 1 replicas: 1
selector: selector:
matchLabels: matchLabels:
k8s-app: heapster k8s-app: heapster
version: v1.3.0-beta.1 version: v1.3.0
template: template:
metadata: metadata:
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v1.3.0-beta.1 version: v1.3.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.3.0-beta.1 - image: gcr.io/google_containers/heapster-amd64:v1.3.0
name: heapster name: heapster
livenessProbe: livenessProbe:
httpGet: httpGet:
...@@ -49,7 +49,7 @@ spec: ...@@ -49,7 +49,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.3.0-beta.1 - image: gcr.io/google_containers/heapster-amd64:v1.3.0
name: eventer name: eventer
command: command:
- /eventer - /eventer
...@@ -80,7 +80,7 @@ spec: ...@@ -80,7 +80,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.3.0-beta.1 - --deployment=heapster-v1.3.0
- --container=heapster - --container=heapster
- --poll-period=300000 - --poll-period=300000
- --estimator=exponential - --estimator=exponential
...@@ -109,7 +109,7 @@ spec: ...@@ -109,7 +109,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.3.0-beta.1 - --deployment=heapster-v1.3.0
- --container=eventer - --container=eventer
- --poll-period=300000 - --poll-period=300000
- --estimator=exponential - --estimator=exponential
......
cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml
View file @ 69fd7aaf
...@@ -12,29 +12,29 @@ ...@@ -12,29 +12,29 @@
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
name: heapster-v1.3.0-beta.1 name: heapster-v1.3.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.3.0-beta.1 version: v1.3.0
spec: spec:
replicas: 1 replicas: 1
selector: selector:
matchLabels: matchLabels:
k8s-app: heapster k8s-app: heapster
version: v1.3.0-beta.1 version: v1.3.0
template: template:
metadata: metadata:
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v1.3.0-beta.1 version: v1.3.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.3.0-beta.1 - image: gcr.io/google_containers/heapster-amd64:v1.3.0
name: heapster name: heapster
livenessProbe: livenessProbe:
httpGet: httpGet:
...@@ -71,7 +71,7 @@ spec: ...@@ -71,7 +71,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.3.0-beta.1 - --deployment=heapster-v1.3.0
- --container=heapster - --container=heapster
- --poll-period=300000 - --poll-period=300000
- --estimator=exponential - --estimator=exponential
......
test/kubemark/resources/heapster_template.json
View file @ 69fd7aaf
...@@ -2,23 +2,23 @@ ...@@ -2,23 +2,23 @@
"kind": "ReplicationController", "kind": "ReplicationController",
"apiVersion": "v1", "apiVersion": "v1",
"metadata": { "metadata": {
"name": "heapster-v1.3.0-beta.0", "name": "heapster-v1.3.0",
"labels": { "labels": {
"k8s-app": "heapster", "k8s-app": "heapster",
"version": "v1.3.0-beta.0" "version": "v1.3.0"
} }
}, },
"spec": { "spec": {
"replicas": 1, "replicas": 1,
"selector": { "selector": {
"k8s-app": "heapster", "k8s-app": "heapster",
"version": "v1.3.0-beta.0" "version": "v1.3.0"
}, },
"template": { "template": {
"metadata": { "metadata": {
"labels": { "labels": {
"k8s-app": "heapster", "k8s-app": "heapster",
"version": "v1.3.0-beta.0" "version": "v1.3.0"
} }
}, },
"spec": { "spec": {
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
"containers": [ "containers": [
{ {
"name": "heapster", "name": "heapster",
"image": "gcr.io/google_containers/heapster:v1.3.0-beta.0", "image": "gcr.io/google_containers/heapster:v1.3.0",
"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.3.0-beta.0", "image": "gcr.io/google_containers/heapster:v1.3.0",
"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