Skip to content

K
k3s
Commit b9be428b authored by Karol Kraśkiewicz's avatar Karol Kraśkiewicz
Browse files
Options

bump version numbers for heapster/influxdb/grafana images

parent 1a46a167
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 32 deletions
cluster/addons/cluster-monitoring/google/heapster-controller.yaml
View file @ b9be428b
...@@ -14,30 +14,30 @@ ...@@ -14,30 +14,30 @@
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
name: heapster-v1.3.0-beta.0 name: heapster-v1.3.0-beta.1
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.0 version: v1.3.0-beta.1
spec: spec:
replicas: 1 replicas: 1
selector: selector:
matchLabels: matchLabels:
k8s-app: heapster k8s-app: heapster
version: v1.3.0-beta.0 version: v1.3.0-beta.1
template: template:
metadata: metadata:
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v1.3.0-beta.0 version: v1.3.0-beta.1
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.3.0-beta.0 - image: gcr.io/google_containers/heapster-amd64:v1.3.0-beta.1
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:v1.3.0-beta.0 - image: gcr.io/google_containers/heapster-amd64:v1.3.0-beta.1
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.0 - --deployment=heapster-v1.3.0-beta.1
- --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.0 - --deployment=heapster-v1.3.0-beta.1
- --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 @ b9be428b
...@@ -14,30 +14,30 @@ ...@@ -14,30 +14,30 @@
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
name: heapster-v1.3.0-beta.0 name: heapster-v1.3.0-beta.1
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.0 version: v1.3.0-beta.1
spec: spec:
replicas: 1 replicas: 1
selector: selector:
matchLabels: matchLabels:
k8s-app: heapster k8s-app: heapster
version: v1.3.0-beta.0 version: v1.3.0-beta.1
template: template:
metadata: metadata:
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v1.3.0-beta.0 version: v1.3.0-beta.1
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.3.0-beta.0 - image: gcr.io/google_containers/heapster-amd64:v1.3.0-beta.1
name: heapster name: heapster
livenessProbe: livenessProbe:
httpGet: httpGet:
...@@ -58,7 +58,7 @@ spec: ...@@ -58,7 +58,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:v1.3.0-beta.0 - image: gcr.io/google_containers/heapster-amd64:v1.3.0-beta.1
name: eventer name: eventer
command: command:
- /eventer - /eventer
...@@ -96,7 +96,7 @@ spec: ...@@ -96,7 +96,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.0 - --deployment=heapster-v1.3.0-beta.1
- --container=heapster - --container=heapster
- --poll-period=300000 - --poll-period=300000
- --estimator=exponential - --estimator=exponential
...@@ -125,7 +125,7 @@ spec: ...@@ -125,7 +125,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.0 - --deployment=heapster-v1.3.0-beta.1
- --container=eventer - --container=eventer
- --poll-period=300000 - --poll-period=300000
- --estimator=exponential - --estimator=exponential
......
cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml
View file @ b9be428b
...@@ -14,30 +14,30 @@ ...@@ -14,30 +14,30 @@
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
name: heapster-v1.3.0-beta.0 name: heapster-v1.3.0-beta.1
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.0 version: v1.3.0-beta.1
spec: spec:
replicas: 1 replicas: 1
selector: selector:
matchLabels: matchLabels:
k8s-app: heapster k8s-app: heapster
version: v1.3.0-beta.0 version: v1.3.0-beta.1
template: template:
metadata: metadata:
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v1.3.0-beta.0 version: v1.3.0-beta.1
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.3.0-beta.0 - image: gcr.io/google_containers/heapster-amd64:v1.3.0-beta.1
name: heapster name: heapster
livenessProbe: livenessProbe:
httpGet: httpGet:
...@@ -50,7 +50,7 @@ spec: ...@@ -50,7 +50,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.3.0-beta.0 - image: gcr.io/google_containers/heapster-amd64:v1.3.0-beta.1
name: eventer name: eventer
command: command:
- /eventer - /eventer
...@@ -81,7 +81,7 @@ spec: ...@@ -81,7 +81,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.0 - --deployment=heapster-v1.3.0-beta.1
- --container=heapster - --container=heapster
- --poll-period=300000 - --poll-period=300000
- --estimator=exponential - --estimator=exponential
...@@ -110,7 +110,7 @@ spec: ...@@ -110,7 +110,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.0 - --deployment=heapster-v1.3.0-beta.1
- --container=eventer - --container=eventer
- --poll-period=300000 - --poll-period=300000
- --estimator=exponential - --estimator=exponential
......
cluster/addons/cluster-monitoring/influxdb/influxdb-grafana-controller.yaml
View file @ b9be428b
...@@ -21,7 +21,7 @@ spec: ...@@ -21,7 +21,7 @@ spec:
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
spec: spec:
containers: containers:
- image: gcr.io/google_containers/heapster_influxdb:v0.7 - image: gcr.io/google_containers/heapster-influxdb-amd64:v1.1.1
name: influxdb name: influxdb
resources: resources:
# keep request = limit to keep this container in guaranteed class # keep request = limit to keep this container in guaranteed class
...@@ -37,7 +37,7 @@ spec: ...@@ -37,7 +37,7 @@ spec:
volumeMounts: volumeMounts:
- name: influxdb-persistent-storage - name: influxdb-persistent-storage
mountPath: /data mountPath: /data
- image: gcr.io/google_containers/heapster_grafana:v3.1.1 - image: gcr.io/google_containers/heapster-grafana-amd64:v4.0.2
name: grafana name: grafana
env: env:
resources: resources:
......
cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml
View file @ b9be428b
...@@ -12,30 +12,30 @@ ...@@ -12,30 +12,30 @@
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
name: heapster-v1.3.0-beta.0 name: heapster-v1.3.0-beta.1
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.0 version: v1.3.0-beta.1
spec: spec:
replicas: 1 replicas: 1
selector: selector:
matchLabels: matchLabels:
k8s-app: heapster k8s-app: heapster
version: v1.3.0-beta.0 version: v1.3.0-beta.1
template: template:
metadata: metadata:
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v1.3.0-beta.0 version: v1.3.0-beta.1
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.3.0-beta.0 - image: gcr.io/google_containers/heapster-amd64:v1.3.0-beta.1
name: heapster name: heapster
livenessProbe: livenessProbe:
httpGet: httpGet:
...@@ -72,7 +72,7 @@ spec: ...@@ -72,7 +72,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.0 - --deployment=heapster-v1.3.0-beta.1
- --container=heapster - --container=heapster
- --poll-period=300000 - --poll-period=300000
- --estimator=exponential - --estimator=exponential
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