mirror of
https://github.com/ceph/ceph-csi.git
synced 2025-06-13 10:33:35 +00:00
vendor updates
This commit is contained in:
@ -1,16 +1,3 @@
|
||||
{% set base_metrics_memory = "140Mi" -%}
|
||||
{% set base_metrics_cpu = "80m" -%}
|
||||
{% set base_eventer_memory = "190Mi" -%}
|
||||
{% set metrics_memory_per_node = 4 -%}
|
||||
{% set metrics_cpu_per_node = 0.5 -%}
|
||||
{% set eventer_memory_per_node = 500 -%}
|
||||
{% set num_nodes = pillar.get('num_nodes', -1) -%}
|
||||
{% set nanny_memory = "90Mi" -%}
|
||||
{% set nanny_memory_per_node = 200 -%}
|
||||
{% if num_nodes >= 0 -%}
|
||||
{% set nanny_memory = (90 * 1024 + num_nodes * nanny_memory_per_node)|string + "Ki" -%}
|
||||
{% endif -%}
|
||||
|
||||
apiVersion: v1
|
||||
kind: ServiceAccount
|
||||
metadata:
|
||||
@ -70,8 +57,9 @@ spec:
|
||||
annotations:
|
||||
scheduler.alpha.kubernetes.io/critical-pod: ''
|
||||
spec:
|
||||
priorityClassName: system-cluster-critical
|
||||
containers:
|
||||
- image: gcr.io/google_containers/heapster-amd64:v1.5.0
|
||||
- image: k8s.gcr.io/heapster-amd64:v1.5.0
|
||||
name: heapster
|
||||
livenessProbe:
|
||||
httpGet:
|
||||
@ -84,13 +72,13 @@ spec:
|
||||
- /heapster
|
||||
- --source=kubernetes.summary_api:''
|
||||
- --sink=gcm
|
||||
- image: gcr.io/google_containers/heapster-amd64:v1.5.0
|
||||
- image: k8s.gcr.io/heapster-amd64:v1.5.0
|
||||
name: eventer
|
||||
command:
|
||||
- /eventer
|
||||
- --source=kubernetes:''
|
||||
- --sink=gcl
|
||||
- image: gcr.io/google_containers/addon-resizer:1.8.1
|
||||
- image: k8s.gcr.io/addon-resizer:1.8.1
|
||||
name: heapster-nanny
|
||||
resources:
|
||||
limits:
|
||||
@ -101,7 +89,7 @@ spec:
|
||||
memory: {{ nanny_memory }}
|
||||
volumeMounts:
|
||||
- name: heapster-config-volume
|
||||
mountMath: /etc/config
|
||||
mountPath: /etc/config
|
||||
env:
|
||||
- name: MY_POD_NAME
|
||||
valueFrom:
|
||||
@ -123,7 +111,7 @@ spec:
|
||||
- --container=heapster
|
||||
- --poll-period=300000
|
||||
- --estimator=exponential
|
||||
- image: gcr.io/google_containers/addon-resizer:1.8.1
|
||||
- image: k8s.gcr.io/addon-resizer:1.8.1
|
||||
name: eventer-nanny
|
||||
resources:
|
||||
limits:
|
||||
@ -143,7 +131,7 @@ spec:
|
||||
fieldPath: metadata.namespace
|
||||
volumeMounts:
|
||||
- name: eventer-config-volume
|
||||
mountMath: /etc/config
|
||||
mountPath: /etc/config
|
||||
command:
|
||||
- /pod_nanny
|
||||
- --config-dir=/etc/config
|
||||
@ -160,7 +148,6 @@ spec:
|
||||
- name: heapster-config-volume
|
||||
configMap:
|
||||
name: heapster-config
|
||||
volumes:
|
||||
- name: eventer-config-volume
|
||||
configMap:
|
||||
name: eventer-config
|
||||
|
@ -1,16 +1,3 @@
|
||||
{% set base_metrics_memory = "140Mi" -%}
|
||||
{% set base_metrics_cpu = "80m" -%}
|
||||
{% set base_eventer_memory = "190Mi" -%}
|
||||
{% set metrics_memory_per_node = 4 -%}
|
||||
{% set metrics_cpu_per_node = 0.5 -%}
|
||||
{% set eventer_memory_per_node = 500 -%}
|
||||
{% set num_nodes = pillar.get('num_nodes', -1) -%}
|
||||
{% set nanny_memory = "90Mi" -%}
|
||||
{% set nanny_memory_per_node = 200 -%}
|
||||
{% if num_nodes >= 0 -%}
|
||||
{% set nanny_memory = (90 * 1024 + num_nodes * nanny_memory_per_node)|string + "Ki" -%}
|
||||
{% endif -%}
|
||||
|
||||
apiVersion: v1
|
||||
kind: ServiceAccount
|
||||
metadata:
|
||||
@ -70,9 +57,9 @@ spec:
|
||||
annotations:
|
||||
scheduler.alpha.kubernetes.io/critical-pod: ''
|
||||
spec:
|
||||
priorityClassName: system-cluster-critical
|
||||
containers:
|
||||
- image: gcr.io/google_containers/heapster-amd64:v1.5.0
|
||||
|
||||
- image: k8s.gcr.io/heapster-amd64:v1.5.0
|
||||
name: heapster
|
||||
livenessProbe:
|
||||
httpGet:
|
||||
@ -86,13 +73,13 @@ spec:
|
||||
- --source=kubernetes.summary_api:''
|
||||
- --sink=influxdb:http://monitoring-influxdb:8086
|
||||
- --sink=gcm:?metrics=autoscaling
|
||||
- image: gcr.io/google_containers/heapster-amd64:v1.5.0
|
||||
- image: k8s.gcr.io/heapster-amd64:v1.5.0
|
||||
name: eventer
|
||||
command:
|
||||
- /eventer
|
||||
- --source=kubernetes:''
|
||||
- --sink=gcl
|
||||
- image: gcr.io/google_containers/addon-resizer:1.8.1
|
||||
- image: k8s.gcr.io/addon-resizer:1.8.1
|
||||
name: heapster-nanny
|
||||
resources:
|
||||
limits:
|
||||
@ -125,7 +112,7 @@ spec:
|
||||
- --container=heapster
|
||||
- --poll-period=300000
|
||||
- --estimator=exponential
|
||||
- image: gcr.io/google_containers/addon-resizer:1.8.1
|
||||
- image: k8s.gcr.io/addon-resizer:1.8.1
|
||||
name: eventer-nanny
|
||||
resources:
|
||||
limits:
|
||||
|
@ -1,16 +1,3 @@
|
||||
{% set base_metrics_memory = "140Mi" -%}
|
||||
{% set base_metrics_cpu = "80m" -%}
|
||||
{% set base_eventer_memory = "190Mi" -%}
|
||||
{% set metrics_memory_per_node = 4 -%}
|
||||
{% set metrics_cpu_per_node = 0.5|float -%}
|
||||
{% set eventer_memory_per_node = 500 -%}
|
||||
{% set num_nodes = pillar.get('num_nodes', -1) -%}
|
||||
{% set nanny_memory = "90Mi" -%}
|
||||
{% set nanny_memory_per_node = 200 -%}
|
||||
{% if num_nodes >= 0 -%}
|
||||
{% set nanny_memory = (90 * 1024 + num_nodes * nanny_memory_per_node)|string + "Ki" -%}
|
||||
{% endif -%}
|
||||
|
||||
apiVersion: v1
|
||||
kind: ServiceAccount
|
||||
metadata:
|
||||
@ -70,8 +57,9 @@ spec:
|
||||
annotations:
|
||||
scheduler.alpha.kubernetes.io/critical-pod: ''
|
||||
spec:
|
||||
priorityClassName: system-cluster-critical
|
||||
containers:
|
||||
- image: gcr.io/google_containers/heapster-amd64:v1.5.0
|
||||
- image: k8s.gcr.io/heapster-amd64:v1.5.0
|
||||
name: heapster
|
||||
livenessProbe:
|
||||
httpGet:
|
||||
@ -84,13 +72,13 @@ spec:
|
||||
- /heapster
|
||||
- --source=kubernetes.summary_api:''
|
||||
- --sink=influxdb:http://monitoring-influxdb:8086
|
||||
- image: gcr.io/google_containers/heapster-amd64:v1.5.0
|
||||
- image: k8s.gcr.io/heapster-amd64:v1.5.0
|
||||
name: eventer
|
||||
command:
|
||||
- /eventer
|
||||
- --source=kubernetes:''
|
||||
- --sink=influxdb:http://monitoring-influxdb:8086
|
||||
- image: gcr.io/google_containers/addon-resizer:1.8.1
|
||||
- image: k8s.gcr.io/addon-resizer:1.8.1
|
||||
name: heapster-nanny
|
||||
resources:
|
||||
limits:
|
||||
@ -123,7 +111,7 @@ spec:
|
||||
- --container=heapster
|
||||
- --poll-period=300000
|
||||
- --estimator=exponential
|
||||
- image: gcr.io/google_containers/addon-resizer:1.8.1
|
||||
- image: k8s.gcr.io/addon-resizer:1.8.1
|
||||
name: eventer-nanny
|
||||
resources:
|
||||
limits:
|
||||
|
@ -22,6 +22,7 @@ spec:
|
||||
annotations:
|
||||
scheduler.alpha.kubernetes.io/critical-pod: ''
|
||||
spec:
|
||||
priorityClassName: system-cluster-critical
|
||||
tolerations:
|
||||
- key: node-role.kubernetes.io/master
|
||||
effect: NoSchedule
|
||||
@ -29,7 +30,7 @@ spec:
|
||||
operator: "Exists"
|
||||
containers:
|
||||
- name: influxdb
|
||||
image: gcr.io/google_containers/heapster-influxdb-amd64:v1.3.3
|
||||
image: k8s.gcr.io/heapster-influxdb-amd64:v1.3.3
|
||||
resources:
|
||||
limits:
|
||||
cpu: 100m
|
||||
@ -46,7 +47,7 @@ spec:
|
||||
- name: influxdb-persistent-storage
|
||||
mountPath: /data
|
||||
- name: grafana
|
||||
image: gcr.io/google_containers/heapster-grafana-amd64:v4.4.3
|
||||
image: k8s.gcr.io/heapster-grafana-amd64:v4.4.3
|
||||
env:
|
||||
resources:
|
||||
# keep request = limit to keep this container in guaranteed class
|
||||
@ -71,7 +72,7 @@ spec:
|
||||
- name: GF_AUTH_ANONYMOUS_ORG_ROLE
|
||||
value: Admin
|
||||
- name: GF_SERVER_ROOT_URL
|
||||
value: /api/v1/proxy/namespaces/kube-system/services/monitoring-grafana/
|
||||
value: /api/v1/namespaces/kube-system/services/monitoring-grafana/proxy/
|
||||
ports:
|
||||
- name: ui
|
||||
containerPort: 3000
|
||||
|
@ -1,14 +1,3 @@
|
||||
{% set base_metrics_memory = "140Mi" -%}
|
||||
{% set base_metrics_cpu = "80m" -%}
|
||||
{% set metrics_memory_per_node = 4 -%}
|
||||
{% set metrics_cpu_per_node = 0.5 -%}
|
||||
{% set num_nodes = pillar.get('num_nodes', -1) -%}
|
||||
{% set nanny_memory = "90Mi" -%}
|
||||
{% set nanny_memory_per_node = 200 -%}
|
||||
{% if num_nodes >= 0 -%}
|
||||
{% set nanny_memory = (90 * 1024 + num_nodes * nanny_memory_per_node)|string + "Ki" -%}
|
||||
{% endif -%}
|
||||
|
||||
apiVersion: v1
|
||||
kind: ServiceAccount
|
||||
metadata:
|
||||
@ -55,8 +44,9 @@ spec:
|
||||
annotations:
|
||||
scheduler.alpha.kubernetes.io/critical-pod: ''
|
||||
spec:
|
||||
priorityClassName: system-cluster-critical
|
||||
containers:
|
||||
- image: gcr.io/google_containers/heapster-amd64:v1.5.0
|
||||
- image: k8s.gcr.io/heapster-amd64:v1.5.0
|
||||
name: heapster
|
||||
livenessProbe:
|
||||
httpGet:
|
||||
@ -71,7 +61,7 @@ spec:
|
||||
- --sink=stackdriver:?cluster_name={{ cluster_name }}&use_old_resources={{ use_old_resources }}&use_new_resources={{ use_new_resources }}&min_interval_sec=100&batch_export_timeout_sec=110
|
||||
# BEGIN_PROMETHEUS_TO_SD
|
||||
- name: prom-to-sd
|
||||
image: gcr.io/google-containers/prometheus-to-sd:v0.2.2
|
||||
image: k8s.gcr.io/prometheus-to-sd:v0.2.4
|
||||
command:
|
||||
- /monitor
|
||||
- --source=heapster:http://localhost:8082?whitelisted=stackdriver_requests_count,stackdriver_timeseries_count
|
||||
@ -89,7 +79,7 @@ spec:
|
||||
fieldRef:
|
||||
fieldPath: metadata.namespace
|
||||
# END_PROMETHEUS_TO_SD
|
||||
- image: gcr.io/google_containers/addon-resizer:1.8.1
|
||||
- image: k8s.gcr.io/addon-resizer:1.8.1
|
||||
name: heapster-nanny
|
||||
resources:
|
||||
limits:
|
||||
|
@ -1,14 +1,3 @@
|
||||
{% set base_metrics_memory = "140Mi" -%}
|
||||
{% set metrics_memory_per_node = 4 -%}
|
||||
{% set base_metrics_cpu = "80m" -%}
|
||||
{% set metrics_cpu_per_node = 0.5 -%}
|
||||
{% set num_nodes = pillar.get('num_nodes', -1) -%}
|
||||
{% set nanny_memory = "90Mi" -%}
|
||||
{% set nanny_memory_per_node = 200 -%}
|
||||
{% if num_nodes >= 0 -%}
|
||||
{% set nanny_memory = (90 * 1024 + num_nodes * nanny_memory_per_node)|string + "Ki" -%}
|
||||
{% endif -%}
|
||||
|
||||
apiVersion: v1
|
||||
kind: ServiceAccount
|
||||
metadata:
|
||||
@ -55,8 +44,9 @@ spec:
|
||||
annotations:
|
||||
scheduler.alpha.kubernetes.io/critical-pod: ''
|
||||
spec:
|
||||
priorityClassName: system-cluster-critical
|
||||
containers:
|
||||
- image: gcr.io/google_containers/heapster-amd64:v1.5.0
|
||||
- image: k8s.gcr.io/heapster-amd64:v1.5.0
|
||||
name: heapster
|
||||
livenessProbe:
|
||||
httpGet:
|
||||
@ -68,7 +58,7 @@ spec:
|
||||
command:
|
||||
- /heapster
|
||||
- --source=kubernetes.summary_api:''
|
||||
- image: gcr.io/google_containers/addon-resizer:1.8.1
|
||||
- image: k8s.gcr.io/addon-resizer:1.8.1
|
||||
name: heapster-nanny
|
||||
resources:
|
||||
limits:
|
||||
|
Reference in New Issue
Block a user