From 95b2b94b1bbcb9191ab8de42abb0f920551d6be2 Mon Sep 17 00:00:00 2001 From: tanshanshan Date: Fri, 2 Feb 2018 11:26:41 +0800 Subject: [PATCH] =?UTF-8?q?Change=20critical=20pods=E2=80=99=20template=20?= =?UTF-8?q?to=20use=20priority?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../addons/calico-policy-controller/calico-node-daemonset.yaml | 1 + .../calico-node-vertical-autoscaler-deployment.yaml | 1 + cluster/addons/calico-policy-controller/typha-deployment.yaml | 1 + .../typha-horizontal-autoscaler-deployment.yaml | 1 + .../typha-vertical-autoscaler-deployment.yaml | 1 + .../addons/cluster-monitoring/google/heapster-controller.yaml | 1 + .../googleinfluxdb/heapster-controller-combined.yaml | 1 + .../addons/cluster-monitoring/influxdb/heapster-controller.yaml | 1 + .../cluster-monitoring/influxdb/influxdb-grafana-controller.yaml | 1 + .../cluster-monitoring/stackdriver/heapster-controller.yaml | 1 + .../cluster-monitoring/standalone/heapster-controller.yaml | 1 + cluster/addons/dashboard/dashboard-controller.yaml | 1 + .../dns-horizontal-autoscaler/dns-horizontal-autoscaler.yaml | 1 + cluster/addons/dns/kube-dns.yaml.base | 1 + cluster/addons/dns/kube-dns.yaml.in | 1 + cluster/addons/dns/kube-dns.yaml.sed | 1 + .../addons/etcd-empty-dir-cleanup/etcd-empty-dir-cleanup.yaml | 1 + cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml | 1 + cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml | 1 + cluster/addons/ip-masq-agent/ip-masq-agent.yaml | 1 + cluster/addons/metadata-proxy/gce/metadata-proxy.yaml | 1 + cluster/addons/metrics-server/metrics-server-deployment.yaml | 1 + 22 files changed, 22 insertions(+) diff --git a/cluster/addons/calico-policy-controller/calico-node-daemonset.yaml b/cluster/addons/calico-policy-controller/calico-node-daemonset.yaml index 39abe2a9bf..c6394ade42 100644 --- a/cluster/addons/calico-policy-controller/calico-node-daemonset.yaml +++ b/cluster/addons/calico-policy-controller/calico-node-daemonset.yaml @@ -20,6 +20,7 @@ spec: annotations: scheduler.alpha.kubernetes.io/critical-pod: '' spec: + priorityClassName: system-node-critical nodeSelector: projectcalico.org/ds-ready: "true" hostNetwork: true diff --git a/cluster/addons/calico-policy-controller/calico-node-vertical-autoscaler-deployment.yaml b/cluster/addons/calico-policy-controller/calico-node-vertical-autoscaler-deployment.yaml index c66c3e0720..300a094f3b 100644 --- a/cluster/addons/calico-policy-controller/calico-node-vertical-autoscaler-deployment.yaml +++ b/cluster/addons/calico-policy-controller/calico-node-vertical-autoscaler-deployment.yaml @@ -16,6 +16,7 @@ spec: annotations: scheduler.alpha.kubernetes.io/critical-pod: '' spec: + priorityClassName: system-cluster-critical containers: - image: gcr.io/google_containers/cpvpa-amd64:v0.6.0 name: autoscaler diff --git a/cluster/addons/calico-policy-controller/typha-deployment.yaml b/cluster/addons/calico-policy-controller/typha-deployment.yaml index 01b32c9ca1..c69da082f6 100644 --- a/cluster/addons/calico-policy-controller/typha-deployment.yaml +++ b/cluster/addons/calico-policy-controller/typha-deployment.yaml @@ -16,6 +16,7 @@ spec: annotations: scheduler.alpha.kubernetes.io/critical-pod: '' spec: + priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly operator: Exists diff --git a/cluster/addons/calico-policy-controller/typha-horizontal-autoscaler-deployment.yaml b/cluster/addons/calico-policy-controller/typha-horizontal-autoscaler-deployment.yaml index 4f493b8bcf..5ba6fbb57a 100644 --- a/cluster/addons/calico-policy-controller/typha-horizontal-autoscaler-deployment.yaml +++ b/cluster/addons/calico-policy-controller/typha-horizontal-autoscaler-deployment.yaml @@ -16,6 +16,7 @@ spec: annotations: scheduler.alpha.kubernetes.io/critical-pod: '' spec: + priorityClassName: system-cluster-critical containers: - image: gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.1.2 name: autoscaler diff --git a/cluster/addons/calico-policy-controller/typha-vertical-autoscaler-deployment.yaml b/cluster/addons/calico-policy-controller/typha-vertical-autoscaler-deployment.yaml index c59be9af62..7f0fbe99b5 100644 --- a/cluster/addons/calico-policy-controller/typha-vertical-autoscaler-deployment.yaml +++ b/cluster/addons/calico-policy-controller/typha-vertical-autoscaler-deployment.yaml @@ -16,6 +16,7 @@ spec: annotations: scheduler.alpha.kubernetes.io/critical-pod: '' spec: + priorityClassName: system-cluster-critical containers: - image: gcr.io/google_containers/cpvpa-amd64:v0.6.0 name: autoscaler diff --git a/cluster/addons/cluster-monitoring/google/heapster-controller.yaml b/cluster/addons/cluster-monitoring/google/heapster-controller.yaml index 429be0da77..0ce9438be7 100644 --- a/cluster/addons/cluster-monitoring/google/heapster-controller.yaml +++ b/cluster/addons/cluster-monitoring/google/heapster-controller.yaml @@ -57,6 +57,7 @@ spec: annotations: scheduler.alpha.kubernetes.io/critical-pod: '' spec: + priorityClassName: system-cluster-critical containers: - image: gcr.io/google_containers/heapster-amd64:v1.5.0 name: heapster diff --git a/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml b/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml index 90e3ca3230..44f8fc4959 100644 --- a/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml +++ b/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml @@ -57,6 +57,7 @@ spec: annotations: scheduler.alpha.kubernetes.io/critical-pod: '' spec: + priorityClassName: system-cluster-critical containers: - image: gcr.io/google_containers/heapster-amd64:v1.5.0 diff --git a/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml b/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml index 46a8e36813..43e3b0e059 100644 --- a/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml +++ b/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml @@ -57,6 +57,7 @@ spec: annotations: scheduler.alpha.kubernetes.io/critical-pod: '' spec: + priorityClassName: system-cluster-critical containers: - image: gcr.io/google_containers/heapster-amd64:v1.5.0 name: heapster diff --git a/cluster/addons/cluster-monitoring/influxdb/influxdb-grafana-controller.yaml b/cluster/addons/cluster-monitoring/influxdb/influxdb-grafana-controller.yaml index d562c74847..1bd2a53e6b 100644 --- a/cluster/addons/cluster-monitoring/influxdb/influxdb-grafana-controller.yaml +++ b/cluster/addons/cluster-monitoring/influxdb/influxdb-grafana-controller.yaml @@ -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 diff --git a/cluster/addons/cluster-monitoring/stackdriver/heapster-controller.yaml b/cluster/addons/cluster-monitoring/stackdriver/heapster-controller.yaml index c035d51a7a..43bb182b51 100644 --- a/cluster/addons/cluster-monitoring/stackdriver/heapster-controller.yaml +++ b/cluster/addons/cluster-monitoring/stackdriver/heapster-controller.yaml @@ -44,6 +44,7 @@ spec: annotations: scheduler.alpha.kubernetes.io/critical-pod: '' spec: + priorityClassName: system-cluster-critical containers: - image: gcr.io/google_containers/heapster-amd64:v1.5.0 name: heapster diff --git a/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml b/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml index ff994966d5..affa89ed1d 100644 --- a/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml +++ b/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml @@ -44,6 +44,7 @@ spec: annotations: scheduler.alpha.kubernetes.io/critical-pod: '' spec: + priorityClassName: system-cluster-critical containers: - image: gcr.io/google_containers/heapster-amd64:v1.5.0 name: heapster diff --git a/cluster/addons/dashboard/dashboard-controller.yaml b/cluster/addons/dashboard/dashboard-controller.yaml index 0c7ca6b5d8..6c3b51036d 100644 --- a/cluster/addons/dashboard/dashboard-controller.yaml +++ b/cluster/addons/dashboard/dashboard-controller.yaml @@ -27,6 +27,7 @@ spec: annotations: scheduler.alpha.kubernetes.io/critical-pod: '' spec: + priorityClassName: system-cluster-critical containers: - name: kubernetes-dashboard image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.8.0 diff --git a/cluster/addons/dns-horizontal-autoscaler/dns-horizontal-autoscaler.yaml b/cluster/addons/dns-horizontal-autoscaler/dns-horizontal-autoscaler.yaml index cd89c6cd3f..669d7e752b 100644 --- a/cluster/addons/dns-horizontal-autoscaler/dns-horizontal-autoscaler.yaml +++ b/cluster/addons/dns-horizontal-autoscaler/dns-horizontal-autoscaler.yaml @@ -78,6 +78,7 @@ spec: annotations: scheduler.alpha.kubernetes.io/critical-pod: '' spec: + priorityClassName: system-cluster-critical containers: - name: autoscaler image: gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.1.2-r2 diff --git a/cluster/addons/dns/kube-dns.yaml.base b/cluster/addons/dns/kube-dns.yaml.base index edf77c3569..c81b830451 100644 --- a/cluster/addons/dns/kube-dns.yaml.base +++ b/cluster/addons/dns/kube-dns.yaml.base @@ -84,6 +84,7 @@ spec: annotations: scheduler.alpha.kubernetes.io/critical-pod: '' spec: + priorityClassName: system-cluster-critical tolerations: - key: "CriticalAddonsOnly" operator: "Exists" diff --git a/cluster/addons/dns/kube-dns.yaml.in b/cluster/addons/dns/kube-dns.yaml.in index ea20f6d0ff..e94b5c07ac 100644 --- a/cluster/addons/dns/kube-dns.yaml.in +++ b/cluster/addons/dns/kube-dns.yaml.in @@ -84,6 +84,7 @@ spec: annotations: scheduler.alpha.kubernetes.io/critical-pod: '' spec: + priorityClassName: system-cluster-critical tolerations: - key: "CriticalAddonsOnly" operator: "Exists" diff --git a/cluster/addons/dns/kube-dns.yaml.sed b/cluster/addons/dns/kube-dns.yaml.sed index af5772fc34..5512c8fa37 100644 --- a/cluster/addons/dns/kube-dns.yaml.sed +++ b/cluster/addons/dns/kube-dns.yaml.sed @@ -84,6 +84,7 @@ spec: annotations: scheduler.alpha.kubernetes.io/critical-pod: '' spec: + priorityClassName: system-cluster-critical tolerations: - key: "CriticalAddonsOnly" operator: "Exists" diff --git a/cluster/addons/etcd-empty-dir-cleanup/etcd-empty-dir-cleanup.yaml b/cluster/addons/etcd-empty-dir-cleanup/etcd-empty-dir-cleanup.yaml index e6ca6f9e2c..f61d0277ac 100644 --- a/cluster/addons/etcd-empty-dir-cleanup/etcd-empty-dir-cleanup.yaml +++ b/cluster/addons/etcd-empty-dir-cleanup/etcd-empty-dir-cleanup.yaml @@ -18,6 +18,7 @@ metadata: labels: k8s-app: etcd-empty-dir-cleanup spec: + priorityClassName: system-node-critical serviceAccountName: etcd-empty-dir-cleanup hostNetwork: true dnsPolicy: Default diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml b/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml index f390b3890a..a9ddc51cb6 100644 --- a/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml +++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml @@ -72,6 +72,7 @@ spec: annotations: scheduler.alpha.kubernetes.io/critical-pod: '' spec: + priorityClassName: system-node-critical serviceAccountName: fluentd-es containers: - name: fluentd-es diff --git a/cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml b/cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml index 130e84aacc..f83141032b 100644 --- a/cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml +++ b/cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml @@ -23,6 +23,7 @@ spec: annotations: scheduler.alpha.kubernetes.io/critical-pod: '' spec: + priorityClassName: system-node-critical serviceAccountName: fluentd-gcp dnsPolicy: Default containers: diff --git a/cluster/addons/ip-masq-agent/ip-masq-agent.yaml b/cluster/addons/ip-masq-agent/ip-masq-agent.yaml index f6bb21c01b..7f8f05c75c 100644 --- a/cluster/addons/ip-masq-agent/ip-masq-agent.yaml +++ b/cluster/addons/ip-masq-agent/ip-masq-agent.yaml @@ -24,6 +24,7 @@ spec: annotations: scheduler.alpha.kubernetes.io/critical-pod: '' spec: + priorityClassName: system-node-critical serviceAccountName: ip-masq-agent hostNetwork: true containers: diff --git a/cluster/addons/metadata-proxy/gce/metadata-proxy.yaml b/cluster/addons/metadata-proxy/gce/metadata-proxy.yaml index e537a7ff16..3e25a43a8a 100644 --- a/cluster/addons/metadata-proxy/gce/metadata-proxy.yaml +++ b/cluster/addons/metadata-proxy/gce/metadata-proxy.yaml @@ -33,6 +33,7 @@ spec: annotations: scheduler.alpha.kubernetes.io/critical-pod: '' spec: + priorityClassName: system-node-critical serviceAccountName: metadata-proxy hostNetwork: true dnsPolicy: Default diff --git a/cluster/addons/metrics-server/metrics-server-deployment.yaml b/cluster/addons/metrics-server/metrics-server-deployment.yaml index 1ed7dbc728..ad24688aa2 100644 --- a/cluster/addons/metrics-server/metrics-server-deployment.yaml +++ b/cluster/addons/metrics-server/metrics-server-deployment.yaml @@ -44,6 +44,7 @@ spec: annotations: scheduler.alpha.kubernetes.io/critical-pod: '' spec: + priorityClassName: system-cluster-critical serviceAccountName: metrics-server containers: - name: metrics-server