github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-18 08:09:58 +00:00
Code Issues Projects Releases Wiki Activity

Fix grafana and heapster RC names

Browse Source
This commit is contained in:
Clayton Coleman 2015-01-29 16:02:30 -05:00
parent a0356bca96
commit 053c2b2100
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/addons/cluster-monitoring/heapster-controller.yaml
View File

@ -1,5 +1,5 @@
apiVersion: "v1beta1" apiVersion: "v1beta1"
id: "monitoring-heapsterController" id: "monitoring-heapster-controller"
kind: "ReplicationController" kind: "ReplicationController"
desiredState: desiredState:
replicas: 1 replicas: 1
@ -9,7 +9,7 @@ desiredState:
desiredState: desiredState:
manifest: manifest:
version: "v1beta1" version: "v1beta1"
id: "monitoring-heapsterController" id: "monitoring-heapster-controller"
containers: containers:
- name: "heapster" - name: "heapster"
image: "kubernetes/heapster:v0.6" image: "kubernetes/heapster:v0.6"

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

@ -1,6 +1,6 @@
apiVersion: "v1beta1" apiVersion: "v1beta1"
kind: "ReplicationController" kind: "ReplicationController"
id: "monitoring-influxGrafanaController" id: "monitoring-influx-grafana-controller"
desiredState: desiredState:
replicas: 1 replicas: 1
replicaSelector: replicaSelector:
@ -11,7 +11,7 @@ desiredState:
desiredState: desiredState:
manifest: manifest:
version: "v1beta1" version: "v1beta1"
id: "monitoring-influxGrafanaController" id: "monitoring-influx-grafana-controller"
containers: containers:
- name: "influxdb" - name: "influxdb"
image: "kubernetes/heapster_influxdb:v0.3" image: "kubernetes/heapster_influxdb:v0.3"

4
hack/e2e-suite/monitoring.sh
View File

@ -49,8 +49,8 @@ function setup {
} }
function cleanup { function cleanup {
"${KUBECFG}" resize monitoring-influxGrafanaController 0 &> /dev/null || true "${KUBECFG}" resize monitoring-influx-grafana-controller 0 &> /dev/null || true
"${KUBECFG}" resize monitoring-heapsterController 0 &> /dev/null || true "${KUBECFG}" resize monitoring-heapster-controller 0 &> /dev/null || true
while "${KUBECTL}" get pods -l "name=influxGrafana" -o template -t {{range.items}}{{.id}}:{{end}} | grep -c . &> /dev/null \ while "${KUBECTL}" get pods -l "name=influxGrafana" -o template -t {{range.items}}{{.id}}:{{end}} | grep -c . &> /dev/null \
|| "${KUBECTL}" get pods -l "name=heapster" -o template -t {{range.items}}{{.id}}:{{end}} | grep -c . &> /dev/null; do || "${KUBECTL}" get pods -l "name=heapster" -o template -t {{range.items}}{{.id}}:{{end}} | grep -c . &> /dev/null; do
sleep 2 sleep 2