Commit 95b2b94b authored by tanshanshan's avatar tanshanshan

Change critical pods’ template to use priority

parent 68da4562
...@@ -20,6 +20,7 @@ spec: ...@@ -20,6 +20,7 @@ spec:
annotations: annotations:
scheduler.alpha.kubernetes.io/critical-pod: '' scheduler.alpha.kubernetes.io/critical-pod: ''
spec: spec:
priorityClassName: system-node-critical
nodeSelector: nodeSelector:
projectcalico.org/ds-ready: "true" projectcalico.org/ds-ready: "true"
hostNetwork: true hostNetwork: true
......
...@@ -16,6 +16,7 @@ spec: ...@@ -16,6 +16,7 @@ spec:
annotations: annotations:
scheduler.alpha.kubernetes.io/critical-pod: '' scheduler.alpha.kubernetes.io/critical-pod: ''
spec: spec:
priorityClassName: system-cluster-critical
containers: containers:
- image: gcr.io/google_containers/cpvpa-amd64:v0.6.0 - image: gcr.io/google_containers/cpvpa-amd64:v0.6.0
name: autoscaler name: autoscaler
......
...@@ -16,6 +16,7 @@ spec: ...@@ -16,6 +16,7 @@ spec:
annotations: annotations:
scheduler.alpha.kubernetes.io/critical-pod: '' scheduler.alpha.kubernetes.io/critical-pod: ''
spec: spec:
priorityClassName: system-cluster-critical
tolerations: tolerations:
- key: CriticalAddonsOnly - key: CriticalAddonsOnly
operator: Exists operator: Exists
......
...@@ -16,6 +16,7 @@ spec: ...@@ -16,6 +16,7 @@ spec:
annotations: annotations:
scheduler.alpha.kubernetes.io/critical-pod: '' scheduler.alpha.kubernetes.io/critical-pod: ''
spec: spec:
priorityClassName: system-cluster-critical
containers: containers:
- image: gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.1.2 - image: gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.1.2
name: autoscaler name: autoscaler
......
...@@ -16,6 +16,7 @@ spec: ...@@ -16,6 +16,7 @@ spec:
annotations: annotations:
scheduler.alpha.kubernetes.io/critical-pod: '' scheduler.alpha.kubernetes.io/critical-pod: ''
spec: spec:
priorityClassName: system-cluster-critical
containers: containers:
- image: gcr.io/google_containers/cpvpa-amd64:v0.6.0 - image: gcr.io/google_containers/cpvpa-amd64:v0.6.0
name: autoscaler name: autoscaler
......
...@@ -57,6 +57,7 @@ spec: ...@@ -57,6 +57,7 @@ spec:
annotations: annotations:
scheduler.alpha.kubernetes.io/critical-pod: '' scheduler.alpha.kubernetes.io/critical-pod: ''
spec: spec:
priorityClassName: system-cluster-critical
containers: containers:
- image: gcr.io/google_containers/heapster-amd64:v1.5.0 - image: gcr.io/google_containers/heapster-amd64:v1.5.0
name: heapster name: heapster
......
...@@ -57,6 +57,7 @@ spec: ...@@ -57,6 +57,7 @@ spec:
annotations: annotations:
scheduler.alpha.kubernetes.io/critical-pod: '' scheduler.alpha.kubernetes.io/critical-pod: ''
spec: spec:
priorityClassName: system-cluster-critical
containers: containers:
- image: gcr.io/google_containers/heapster-amd64:v1.5.0 - image: gcr.io/google_containers/heapster-amd64:v1.5.0
......
...@@ -57,6 +57,7 @@ spec: ...@@ -57,6 +57,7 @@ spec:
annotations: annotations:
scheduler.alpha.kubernetes.io/critical-pod: '' scheduler.alpha.kubernetes.io/critical-pod: ''
spec: spec:
priorityClassName: system-cluster-critical
containers: containers:
- image: gcr.io/google_containers/heapster-amd64:v1.5.0 - image: gcr.io/google_containers/heapster-amd64:v1.5.0
name: heapster name: heapster
......
...@@ -22,6 +22,7 @@ spec: ...@@ -22,6 +22,7 @@ spec:
annotations: annotations:
scheduler.alpha.kubernetes.io/critical-pod: '' scheduler.alpha.kubernetes.io/critical-pod: ''
spec: spec:
priorityClassName: system-cluster-critical
tolerations: tolerations:
- key: node-role.kubernetes.io/master - key: node-role.kubernetes.io/master
effect: NoSchedule effect: NoSchedule
......
...@@ -44,6 +44,7 @@ spec: ...@@ -44,6 +44,7 @@ spec:
annotations: annotations:
scheduler.alpha.kubernetes.io/critical-pod: '' scheduler.alpha.kubernetes.io/critical-pod: ''
spec: spec:
priorityClassName: system-cluster-critical
containers: containers:
- image: gcr.io/google_containers/heapster-amd64:v1.5.0 - image: gcr.io/google_containers/heapster-amd64:v1.5.0
name: heapster name: heapster
......
...@@ -44,6 +44,7 @@ spec: ...@@ -44,6 +44,7 @@ spec:
annotations: annotations:
scheduler.alpha.kubernetes.io/critical-pod: '' scheduler.alpha.kubernetes.io/critical-pod: ''
spec: spec:
priorityClassName: system-cluster-critical
containers: containers:
- image: gcr.io/google_containers/heapster-amd64:v1.5.0 - image: gcr.io/google_containers/heapster-amd64:v1.5.0
name: heapster name: heapster
......
...@@ -27,6 +27,7 @@ spec: ...@@ -27,6 +27,7 @@ spec:
annotations: annotations:
scheduler.alpha.kubernetes.io/critical-pod: '' scheduler.alpha.kubernetes.io/critical-pod: ''
spec: spec:
priorityClassName: system-cluster-critical
containers: containers:
- name: kubernetes-dashboard - name: kubernetes-dashboard
image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.8.0 image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.8.0
......
...@@ -78,6 +78,7 @@ spec: ...@@ -78,6 +78,7 @@ spec:
annotations: annotations:
scheduler.alpha.kubernetes.io/critical-pod: '' scheduler.alpha.kubernetes.io/critical-pod: ''
spec: spec:
priorityClassName: system-cluster-critical
containers: containers:
- name: autoscaler - name: autoscaler
image: gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.1.2-r2 image: gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.1.2-r2
......
...@@ -84,6 +84,7 @@ spec: ...@@ -84,6 +84,7 @@ spec:
annotations: annotations:
scheduler.alpha.kubernetes.io/critical-pod: '' scheduler.alpha.kubernetes.io/critical-pod: ''
spec: spec:
priorityClassName: system-cluster-critical
tolerations: tolerations:
- key: "CriticalAddonsOnly" - key: "CriticalAddonsOnly"
operator: "Exists" operator: "Exists"
......
...@@ -84,6 +84,7 @@ spec: ...@@ -84,6 +84,7 @@ spec:
annotations: annotations:
scheduler.alpha.kubernetes.io/critical-pod: '' scheduler.alpha.kubernetes.io/critical-pod: ''
spec: spec:
priorityClassName: system-cluster-critical
tolerations: tolerations:
- key: "CriticalAddonsOnly" - key: "CriticalAddonsOnly"
operator: "Exists" operator: "Exists"
......
...@@ -84,6 +84,7 @@ spec: ...@@ -84,6 +84,7 @@ spec:
annotations: annotations:
scheduler.alpha.kubernetes.io/critical-pod: '' scheduler.alpha.kubernetes.io/critical-pod: ''
spec: spec:
priorityClassName: system-cluster-critical
tolerations: tolerations:
- key: "CriticalAddonsOnly" - key: "CriticalAddonsOnly"
operator: "Exists" operator: "Exists"
......
...@@ -18,6 +18,7 @@ metadata: ...@@ -18,6 +18,7 @@ metadata:
labels: labels:
k8s-app: etcd-empty-dir-cleanup k8s-app: etcd-empty-dir-cleanup
spec: spec:
priorityClassName: system-node-critical
serviceAccountName: etcd-empty-dir-cleanup serviceAccountName: etcd-empty-dir-cleanup
hostNetwork: true hostNetwork: true
dnsPolicy: Default dnsPolicy: Default
......
...@@ -72,6 +72,7 @@ spec: ...@@ -72,6 +72,7 @@ spec:
annotations: annotations:
scheduler.alpha.kubernetes.io/critical-pod: '' scheduler.alpha.kubernetes.io/critical-pod: ''
spec: spec:
priorityClassName: system-node-critical
serviceAccountName: fluentd-es serviceAccountName: fluentd-es
containers: containers:
- name: fluentd-es - name: fluentd-es
......
...@@ -23,6 +23,7 @@ spec: ...@@ -23,6 +23,7 @@ spec:
annotations: annotations:
scheduler.alpha.kubernetes.io/critical-pod: '' scheduler.alpha.kubernetes.io/critical-pod: ''
spec: spec:
priorityClassName: system-node-critical
serviceAccountName: fluentd-gcp serviceAccountName: fluentd-gcp
dnsPolicy: Default dnsPolicy: Default
containers: containers:
......
...@@ -24,6 +24,7 @@ spec: ...@@ -24,6 +24,7 @@ spec:
annotations: annotations:
scheduler.alpha.kubernetes.io/critical-pod: '' scheduler.alpha.kubernetes.io/critical-pod: ''
spec: spec:
priorityClassName: system-node-critical
serviceAccountName: ip-masq-agent serviceAccountName: ip-masq-agent
hostNetwork: true hostNetwork: true
containers: containers:
......
...@@ -33,6 +33,7 @@ spec: ...@@ -33,6 +33,7 @@ spec:
annotations: annotations:
scheduler.alpha.kubernetes.io/critical-pod: '' scheduler.alpha.kubernetes.io/critical-pod: ''
spec: spec:
priorityClassName: system-node-critical
serviceAccountName: metadata-proxy serviceAccountName: metadata-proxy
hostNetwork: true hostNetwork: true
dnsPolicy: Default dnsPolicy: Default
......
...@@ -44,6 +44,7 @@ spec: ...@@ -44,6 +44,7 @@ spec:
annotations: annotations:
scheduler.alpha.kubernetes.io/critical-pod: '' scheduler.alpha.kubernetes.io/critical-pod: ''
spec: spec:
priorityClassName: system-cluster-critical
serviceAccountName: metrics-server serviceAccountName: metrics-server
containers: containers:
- name: metrics-server - name: metrics-server
......
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