github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-06 11:42:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #9615 from vishh/heapster_v0.14.0

Browse Source 
Update to heapster v0.14.0
This commit is contained in:
Abhi Shah
2015-06-11 15:14:34 -07:00
parent 82aa8f9984 a38204a498
commit 0e3633d404
8 changed files with 43 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,26 +1,26 @@
apiVersion: v1beta3
apiVersion: v1
kind: ReplicationController
metadata:
name: monitoring-heapster-v1
name: monitoring-heapster-v2
namespace: default
labels:
k8s-app: heapster
version: v1
version: v2
kubernetes.io/cluster-service: "true"
spec:
replicas: 1
selector:
k8s-app: heapster
version: v1
version: v2
template:
metadata:
labels:
k8s-app: heapster
version: v1
version: v2
kubernetes.io/cluster-service: "true"
spec:
containers:
- image: gcr.io/google_containers/heapster:v0.13.0
- image: gcr.io/google_containers/heapster:v0.14.0
name: heapster
command:
- /heapster

13
cluster/addons/cluster-monitoring/google/heapster-service.yaml Normal file
View File

@@ -0,0 +1,13 @@
kind: Service
apiVersion: v1
metadata:
name: monitoring-heapster
labels:
kubernetes.io/cluster-service: "true"
name: monitoring-heapster
spec:
ports:
- port: 80
targetPort: 8082
selector:
k8s-app: heapster

2
cluster/addons/cluster-monitoring/influxdb/grafana-service.yaml
View File

@@ -1,4 +1,4 @@
apiVersion: v1beta3
apiVersion: v1
kind: Service
metadata:
name: monitoring-grafana

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

@@ -1,26 +1,26 @@
apiVersion: v1beta3
apiVersion: v1
kind: ReplicationController
metadata:
name: monitoring-heapster-v1
name: monitoring-heapster-v2
namespace: default
labels:
k8s-app: heapster
version: v1
version: v2
kubernetes.io/cluster-service: "true"
spec:
replicas: 1
selector:
k8s-app: heapster
version: v1
version: v2
template:
metadata:
labels:
k8s-app: heapster
version: v1
version: v2
kubernetes.io/cluster-service: "true"
spec:
containers:
- image: gcr.io/google_containers/heapster:v0.13.0
- image: gcr.io/google_containers/heapster:v0.14.0
name: heapster
command:
- /heapster

13
cluster/addons/cluster-monitoring/influxdb/heapster-service.yaml Normal file
View File

@@ -0,0 +1,13 @@
kind: Service
apiVersion: v1
metadata:
name: monitoring-heapster
labels:
kubernetes.io/cluster-service: "true"
name: monitoring-heapster
spec:
ports:
- port: 80
targetPort: 8082
selector:
k8s-app: heapster

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

@@ -1,4 +1,4 @@
apiVersion: v1beta3
apiVersion: v1
kind: ReplicationController
metadata:
name: monitoring-influx-grafana-v1

2
cluster/addons/cluster-monitoring/influxdb/influxdb-service.yaml
View File

@@ -1,4 +1,4 @@
apiVersion: v1beta3
apiVersion: v1
kind: Service
metadata:
name: monitoring-influxdb