github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #20109 from piosz/heapster-0.18.5 

Bumped Heapster to v0.18.5 to fix issue with nil pointer panic
pull/6/head
Zach Loafman 2016-01-25 14:27:38 -08:00
parent 72745f226a f93b1f1043
commit 0e889a1afd
4 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,26 +7,26 @@
apiVersion: v1 apiVersion: v1
kind: ReplicationController kind: ReplicationController
metadata: metadata:
name: heapster-v11 name: heapster-v12
namespace: kube-system namespace: kube-system
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v11 version: v12
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
spec: spec:
replicas: 1 replicas: 1
selector: selector:
k8s-app: heapster k8s-app: heapster
version: v11 version: v12
template: template:
metadata: metadata:
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v11 version: v12
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
spec: spec:
containers: containers:
- image: gcr.io/google_containers/heapster:v0.18.4 - image: gcr.io/google_containers/heapster:v0.18.5
name: heapster name: heapster
resources: resources:
# keep request = limit to keep this container in guaranteed class # keep request = limit to keep this container in guaranteed class

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

@ -7,26 +7,26 @@
apiVersion: v1 apiVersion: v1
kind: ReplicationController kind: ReplicationController
metadata: metadata:
name: heapster-v11 name: heapster-v12
namespace: kube-system namespace: kube-system
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v11 version: v12
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
spec: spec:
replicas: 1 replicas: 1
selector: selector:
k8s-app: heapster k8s-app: heapster
version: v11 version: v12
template: template:
metadata: metadata:
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v11 version: v12
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
spec: spec:
containers: containers:
- image: gcr.io/google_containers/heapster:v0.18.4 - image: gcr.io/google_containers/heapster:v0.18.5
name: heapster name: heapster
resources: resources:
# keep request = limit to keep this container in guaranteed class # keep request = limit to keep this container in guaranteed class

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

@ -7,26 +7,26 @@
apiVersion: v1 apiVersion: v1
kind: ReplicationController kind: ReplicationController
metadata: metadata:
name: heapster-v11 name: heapster-v12
namespace: kube-system namespace: kube-system
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v11 version: v12
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
spec: spec:
replicas: 1 replicas: 1
selector: selector:
k8s-app: heapster k8s-app: heapster
version: v11 version: v12
template: template:
metadata: metadata:
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v11 version: v12
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
spec: spec:
containers: containers:
- image: gcr.io/google_containers/heapster:v0.18.4 - image: gcr.io/google_containers/heapster:v0.18.5
name: heapster name: heapster
resources: resources:
# keep request = limit to keep this container in guaranteed class # keep request = limit to keep this container in guaranteed class

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

@ -7,26 +7,26 @@
apiVersion: v1 apiVersion: v1
kind: ReplicationController kind: ReplicationController
metadata: metadata:
name: heapster-v11 name: heapster-v12
namespace: kube-system namespace: kube-system
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v11 version: v12
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
spec: spec:
replicas: 1 replicas: 1
selector: selector:
k8s-app: heapster k8s-app: heapster
version: v11 version: v12
template: template:
metadata: metadata:
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v11 version: v12
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
spec: spec:
containers: containers:
- image: gcr.io/google_containers/heapster:v0.18.4 - image: gcr.io/google_containers/heapster:v0.18.5
name: heapster name: heapster
resources: resources:
# keep request = limit to keep this container in guaranteed class # keep request = limit to keep this container in guaranteed class