github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-10 12:32:03 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #57902 from kawych/small_fix

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 57902, 57958). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Fix errors in Heapster deployment for google sink

**What this PR does / why we need it**:
Fixes a bug in Heapster deployment for google sink.

**Release note**:
```release-note
Fixes a bug in Heapster deployment for google sink.
```
This commit is contained in:
Kubernetes Submit Queue 2018-01-08 03:18:33 -08:00 committed by GitHub
commit 21b1e30108
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -101,7 +101,7 @@ spec:
memory: {{ nanny_memory }} memory: {{ nanny_memory }}
volumeMounts: volumeMounts:
- name: heapster-config-volume - name: heapster-config-volume
mountMath: /etc/config mountPath: /etc/config
env: env:
- name: MY_POD_NAME - name: MY_POD_NAME
valueFrom: valueFrom:
@ -143,7 +143,7 @@ spec:
fieldPath: metadata.namespace fieldPath: metadata.namespace
volumeMounts: volumeMounts:
- name: eventer-config-volume - name: eventer-config-volume
mountMath: /etc/config mountPath: /etc/config
command: command:
- /pod_nanny - /pod_nanny
- --config-dir=/etc/config - --config-dir=/etc/config
@ -160,7 +160,6 @@ spec:
- name: heapster-config-volume - name: heapster-config-volume
configMap: configMap:
name: heapster-config name: heapster-config
volumes:
- name: eventer-config-volume - name: eventer-config-volume
configMap: configMap:
name: eventer-config name: eventer-config