scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-03 19:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #41925 from KarolKraskiewicz/dev

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 35408, 41915, 41992, 41964, 41925)

bump version numbers for heapster/influxdb/grafana images

**What this PR does / why we need it**:
It updates version of monitoring components (heapster/influxdb/grafana) to the latest one used by heapster

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #

**Special notes for your reviewer**:
[e2e/monitoring.go](https://github.com/kubernetes/kubernetes/blob/master/test/e2e/monitoring.go) test seems to be passing without modifications

**Release note**:

```release-note
```
This commit is contained in:
Kubernetes Submit Queue
2017-02-26 18:08:00 -08:00
committed by GitHub
parent f1fecc3074 b9be428bf3
commit df129690ef
5 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
cluster/addons/cluster-monitoring/google/heapster-controller.yaml
View File

@@ -14,30 +14,30 @@
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: heapster-v1.3.0-beta.0
name: heapster-v1.3.0-beta.1
namespace: kube-system
labels:
k8s-app: heapster
kubernetes.io/cluster-service: "true"
addonmanager.kubernetes.io/mode: Reconcile
version: v1.3.0-beta.0
version: v1.3.0-beta.1
spec:
replicas: 1
selector:
matchLabels:
k8s-app: heapster
version: v1.3.0-beta.0
version: v1.3.0-beta.1
template:
metadata:
labels:
k8s-app: heapster
version: v1.3.0-beta.0
version: v1.3.0-beta.1
annotations:
scheduler.alpha.kubernetes.io/critical-pod: ''
scheduler.alpha.kubernetes.io/tolerations: '[{"key":"CriticalAddonsOnly", "operator":"Exists"}]'
spec:
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
livenessProbe:
httpGet:
@@ -57,7 +57,7 @@ spec:
- name: usr-ca-certs
mountPath: /usr/share/ca-certificates
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
command:
- /eventer
@@ -95,7 +95,7 @@ spec:
- --memory={{ base_metrics_memory }}
- --extra-memory={{metrics_memory_per_node}}Mi
- --threshold=5
- --deployment=heapster-v1.3.0-beta.0
- --deployment=heapster-v1.3.0-beta.1
- --container=heapster
- --poll-period=300000
- --estimator=exponential
@@ -124,7 +124,7 @@ spec:
- --memory={{base_eventer_memory}}
- --extra-memory={{eventer_memory_per_node}}Ki
- --threshold=5
- --deployment=heapster-v1.3.0-beta.0
- --deployment=heapster-v1.3.0-beta.1
- --container=eventer
- --poll-period=300000
- --estimator=exponential

16
cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
View File

@@ -14,30 +14,30 @@
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: heapster-v1.3.0-beta.0
name: heapster-v1.3.0-beta.1
namespace: kube-system
labels:
k8s-app: heapster
kubernetes.io/cluster-service: "true"
addonmanager.kubernetes.io/mode: Reconcile
version: v1.3.0-beta.0
version: v1.3.0-beta.1
spec:
replicas: 1
selector:
matchLabels:
k8s-app: heapster
version: v1.3.0-beta.0
version: v1.3.0-beta.1
template:
metadata:
labels:
k8s-app: heapster
version: v1.3.0-beta.0
version: v1.3.0-beta.1
annotations:
scheduler.alpha.kubernetes.io/critical-pod: ''
scheduler.alpha.kubernetes.io/tolerations: '[{"key":"CriticalAddonsOnly", "operator":"Exists"}]'
spec:
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
livenessProbe:
httpGet:
@@ -58,7 +58,7 @@ spec:
- name: usr-ca-certs
mountPath: /usr/share/ca-certificates
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
command:
- /eventer
@@ -96,7 +96,7 @@ spec:
- --memory={{ base_metrics_memory }}
- --extra-memory={{ metrics_memory_per_node }}Mi
- --threshold=5
- --deployment=heapster-v1.3.0-beta.0
- --deployment=heapster-v1.3.0-beta.1
- --container=heapster
- --poll-period=300000
- --estimator=exponential
@@ -125,7 +125,7 @@ spec:
- --memory={{ base_eventer_memory }}
- --extra-memory={{ eventer_memory_per_node }}Ki
- --threshold=5
- --deployment=heapster-v1.3.0-beta.0
- --deployment=heapster-v1.3.0-beta.1
- --container=eventer
- --poll-period=300000
- --estimator=exponential

16
cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml
View File

@@ -14,30 +14,30 @@
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: heapster-v1.3.0-beta.0
name: heapster-v1.3.0-beta.1
namespace: kube-system
labels:
k8s-app: heapster
kubernetes.io/cluster-service: "true"
addonmanager.kubernetes.io/mode: Reconcile
version: v1.3.0-beta.0
version: v1.3.0-beta.1
spec:
replicas: 1
selector:
matchLabels:
k8s-app: heapster
version: v1.3.0-beta.0
version: v1.3.0-beta.1
template:
metadata:
labels:
k8s-app: heapster
version: v1.3.0-beta.0
version: v1.3.0-beta.1
annotations:
scheduler.alpha.kubernetes.io/critical-pod: ''
scheduler.alpha.kubernetes.io/tolerations: '[{"key":"CriticalAddonsOnly", "operator":"Exists"}]'
spec:
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
livenessProbe:
httpGet:
@@ -50,7 +50,7 @@ spec:
- /heapster
- --source=kubernetes.summary_api:''
- --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
command:
- /eventer
@@ -81,7 +81,7 @@ spec:
- --memory={{ base_metrics_memory }}
- --extra-memory={{ metrics_memory_per_node }}Mi
- --threshold=5
- --deployment=heapster-v1.3.0-beta.0
- --deployment=heapster-v1.3.0-beta.1
- --container=heapster
- --poll-period=300000
- --estimator=exponential
@@ -110,7 +110,7 @@ spec:
- --memory={{ base_eventer_memory }}
- --extra-memory={{ eventer_memory_per_node }}Ki
- --threshold=5
- --deployment=heapster-v1.3.0-beta.0
- --deployment=heapster-v1.3.0-beta.1
- --container=eventer
- --poll-period=300000
- --estimator=exponential

4
cluster/addons/cluster-monitoring/influxdb/influxdb-grafana-controller.yaml
View File

@@ -21,7 +21,7 @@ spec:
kubernetes.io/cluster-service: "true"
spec:
containers:
- image: gcr.io/google_containers/heapster_influxdb:v0.7
- image: gcr.io/google_containers/heapster-influxdb-amd64:v1.1.1
name: influxdb
resources:
# keep request = limit to keep this container in guaranteed class
@@ -37,7 +37,7 @@ spec:
volumeMounts:
- name: influxdb-persistent-storage
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
env:
resources:

12
cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml
View File

@@ -12,30 +12,30 @@
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: heapster-v1.3.0-beta.0
name: heapster-v1.3.0-beta.1
namespace: kube-system
labels:
k8s-app: heapster
kubernetes.io/cluster-service: "true"
addonmanager.kubernetes.io/mode: Reconcile
version: v1.3.0-beta.0
version: v1.3.0-beta.1
spec:
replicas: 1
selector:
matchLabels:
k8s-app: heapster
version: v1.3.0-beta.0
version: v1.3.0-beta.1
template:
metadata:
labels:
k8s-app: heapster
version: v1.3.0-beta.0
version: v1.3.0-beta.1
annotations:
scheduler.alpha.kubernetes.io/critical-pod: ''
scheduler.alpha.kubernetes.io/tolerations: '[{"key":"CriticalAddonsOnly", "operator":"Exists"}]'
spec:
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
livenessProbe:
httpGet:
@@ -72,7 +72,7 @@ spec:
- --memory={{ base_metrics_memory }}
- --extra-memory={{ metrics_memory_per_node }}Mi
- --threshold=5
- --deployment=heapster-v1.3.0-beta.0
- --deployment=heapster-v1.3.0-beta.1
- --container=heapster
- --poll-period=300000
- --estimator=exponential