Merge pull request #10260 from dchen1107/clean

Set resource limit for both heapster and influxdb container based on
2025-08-09 03:57:41 +00:00 · 2015-06-23 15:57:53 -07:00 · 2015-06-23 15:57:53 -07:00 · c1a7055701
commit c1a7055701
parent 6dc6992023 e0186c3bd0
5 changed files with 20 additions and 0 deletions
--- a/cluster/addons/cluster-monitoring/google/heapster-controller.yaml
+++ b/cluster/addons/cluster-monitoring/google/heapster-controller.yaml
@ -22,6 +22,10 @@ spec:
      containers: 
        - image: gcr.io/google_containers/heapster:v0.14.3
          name: heapster
          resources:
            limits:
              cpu: 200m
              memory: 2.5Gi
          command:
            - /heapster
            - --source=kubernetes:''
--- a/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
+++ b/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
@ -22,6 +22,10 @@ spec:
      containers: 
        - image: gcr.io/google_containers/heapster:v0.14.3
          name: heapster
          resources:
            limits:
              cpu: 200m
              memory: 2.5Gi
          command:
            - /heapster
            - --source=kubernetes:''
--- a/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml
+++ b/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml
@ -22,6 +22,10 @@ spec:
      containers: 
        - image: gcr.io/google_containers/heapster:v0.14.3
          name: heapster
          resources:
            limits:
              cpu: 200m
              memory: 2.5Gi
          command:
            - /heapster
            - --source=kubernetes:''
--- a/cluster/addons/cluster-monitoring/influxdb/influxdb-grafana-controller.yaml
+++ b/cluster/addons/cluster-monitoring/influxdb/influxdb-grafana-controller.yaml
@ -22,6 +22,10 @@ spec:
      containers: 
        - image: gcr.io/google_containers/heapster_influxdb:v0.3
          name: influxdb
          resources:
            limits:
              cpu: 300m
              memory: 2Gi
          ports: 
            - containerPort: 8083
              hostPort: 8083
--- a/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml
+++ b/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml
@ -22,6 +22,10 @@ spec:
      containers: 
        - image: gcr.io/google_containers/heapster:v0.14.3
          name: heapster
          resources:
            limits:
              cpu: 200m
              memory: 2.5Gi
          command:
            - /heapster
            - --source=kubernetes:''