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

Merge pull request #27092 from euank/monitoring-api-version 

Automatic merge from submit-queue

cluster/gce/coreos: Update heapster apiVersion

This fixes an inadvertant search-replace error in #26617.
The error was missed then because the search-replace issue wasn't
present in the standalone controllers, but was in all the others.

I verified that with this change heapster comes up under the default influxdb monitoring and without this change addon manager spits out validation failure errors for the heapster yaml.

cc @yifan-gu
pull/6/head
k8s-merge-robot 2016-06-10 01:01:44 -07:00 committed by GitHub
parent ade299c18f d2761de36b
commit 1f18eee335
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/gce/coreos/kube-manifests/addons/cluster-monitoring/google/heapster-controller.yaml
View File

@ -1,4 +1,4 @@
apiVersion: extensions/v1beta2
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: heapster-v1.1.0.beta2

2
cluster/gce/coreos/kube-manifests/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
View File

@ -1,4 +1,4 @@
apiVersion: extensions/v1beta2
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: heapster-v1.1.0.beta2

2
cluster/gce/coreos/kube-manifests/addons/cluster-monitoring/influxdb/heapster-controller.yaml
View File

@ -1,4 +1,4 @@
apiVersion: extensions/v1beta2
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: heapster-v1.1.0.beta2

1
cluster/gce/coreos/kube-manifests/addons/cluster-monitoring/influxdb/influxdb-grafana-controller.yaml
View File

@ -71,3 +71,4 @@ spec:
emptyDir: {}
- name: grafana-persistent-storage
emptyDir: {}