Skip to content

K
k3s
Commit 5ea41906 authored by Vish Kannan's avatar Vish Kannan
Browse files
Options

Merge pull request #12793 from piosz/heapster-config

Removed align_stats flag from Heapster config
parents 72830242 eed7d24c
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 18 deletions
cluster/addons/cluster-monitoring/google/heapster-controller.yaml
View file @ 5ea41906
apiVersion: v1 apiVersion: v1
kind: ReplicationController kind: ReplicationController
metadata: metadata:
name: monitoring-heapster-v7 name: monitoring-heapster-v8
namespace: kube-system namespace: kube-system
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v7 version: v8
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: v7 version: v8
template: template:
metadata: metadata:
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v7 version: v8
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
spec: spec:
containers: containers:
...@@ -32,7 +32,6 @@ spec: ...@@ -32,7 +32,6 @@ spec:
- --sink=gcm - --sink=gcm
- --sink=gcmautoscaling - --sink=gcmautoscaling
- --sink=gcl - --sink=gcl
- --align_stats
- --poll_duration=2m - --poll_duration=2m
- --stats_resolution=1m - --stats_resolution=1m
volumeMounts: volumeMounts:
......
cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
View file @ 5ea41906
apiVersion: v1 apiVersion: v1
kind: ReplicationController kind: ReplicationController
metadata: metadata:
name: monitoring-heapster-v7 name: monitoring-heapster-v8
namespace: kube-system namespace: kube-system
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v7 version: v8
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: v7 version: v8
template: template:
metadata: metadata:
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v7 version: v8
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
spec: spec:
containers: containers:
...@@ -32,7 +32,6 @@ spec: ...@@ -32,7 +32,6 @@ spec:
- --sink=gcl - --sink=gcl
- --sink=gcmautoscaling - --sink=gcmautoscaling
- --sink=influxdb:http://monitoring-influxdb:8086 - --sink=influxdb:http://monitoring-influxdb:8086
- --align_stats
- --poll_duration=2m - --poll_duration=2m
- --stats_resolution=1m - --stats_resolution=1m
volumeMounts: volumeMounts:
......
cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml
View file @ 5ea41906
apiVersion: v1 apiVersion: v1
kind: ReplicationController kind: ReplicationController
metadata: metadata:
name: monitoring-heapster-v7 name: monitoring-heapster-v8
namespace: kube-system namespace: kube-system
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v7 version: v8
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: v7 version: v8
template: template:
metadata: metadata:
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v7 version: v8
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
spec: spec:
containers: containers:
......
cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml
View file @ 5ea41906
apiVersion: v1 apiVersion: v1
kind: ReplicationController kind: ReplicationController
metadata: metadata:
name: monitoring-heapster-v7 name: monitoring-heapster-v8
namespace: kube-system namespace: kube-system
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v7 version: v8
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: v7 version: v8
template: template:
metadata: metadata:
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v7 version: v8
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
spec: spec:
containers: containers:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment