mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-31 23:37:01 +00:00
Merge pull request #30995 from piosz/critical-pods
Automatic merge from submit-queue Make DNS and Heapster critical pods ref #29023 ```release-note DNS, Heapster and UI are critical addons ```
This commit is contained in:
commit
878e06a71c
@ -37,6 +37,9 @@ spec:
|
||||
labels:
|
||||
k8s-app: heapster
|
||||
version: v1.2.0-beta.1
|
||||
annotations:
|
||||
scheduler.alpha.kubernetes.io/critical-pod: ''
|
||||
scheduler.alpha.kubernetes.io/tolerations: '[{"key":"CriticalAddonsOnly", "operator":"Exists"}]'
|
||||
spec:
|
||||
containers:
|
||||
- image: gcr.io/google_containers/heapster:v1.2.0-beta.1
|
||||
|
@ -37,6 +37,9 @@ spec:
|
||||
labels:
|
||||
k8s-app: heapster
|
||||
version: v1.2.0-beta.1
|
||||
annotations:
|
||||
scheduler.alpha.kubernetes.io/critical-pod: ''
|
||||
scheduler.alpha.kubernetes.io/tolerations: '[{"key":"CriticalAddonsOnly", "operator":"Exists"}]'
|
||||
spec:
|
||||
containers:
|
||||
- image: gcr.io/google_containers/heapster:v1.2.0-beta.1
|
||||
|
@ -37,6 +37,9 @@ spec:
|
||||
labels:
|
||||
k8s-app: heapster
|
||||
version: v1.2.0-beta.1
|
||||
annotations:
|
||||
scheduler.alpha.kubernetes.io/critical-pod: ''
|
||||
scheduler.alpha.kubernetes.io/tolerations: '[{"key":"CriticalAddonsOnly", "operator":"Exists"}]'
|
||||
spec:
|
||||
containers:
|
||||
- image: gcr.io/google_containers/heapster:v1.2.0-beta.1
|
||||
|
@ -33,6 +33,9 @@ spec:
|
||||
labels:
|
||||
k8s-app: heapster
|
||||
version: v1.2.0-beta.1
|
||||
annotations:
|
||||
scheduler.alpha.kubernetes.io/critical-pod: ''
|
||||
scheduler.alpha.kubernetes.io/tolerations: '[{"key":"CriticalAddonsOnly", "operator":"Exists"}]'
|
||||
spec:
|
||||
containers:
|
||||
- image: gcr.io/google_containers/heapster:v1.2.0-beta.1
|
||||
|
@ -18,6 +18,9 @@ spec:
|
||||
k8s-app: kubernetes-dashboard
|
||||
version: v1.1.1
|
||||
kubernetes.io/cluster-service: "true"
|
||||
annotations:
|
||||
scheduler.alpha.kubernetes.io/critical-pod: ''
|
||||
scheduler.alpha.kubernetes.io/tolerations: '[{"key":"CriticalAddonsOnly", "operator":"Exists"}]'
|
||||
spec:
|
||||
containers:
|
||||
- name: kubernetes-dashboard
|
||||
|
@ -38,6 +38,9 @@ spec:
|
||||
k8s-app: kube-dns
|
||||
version: v19
|
||||
kubernetes.io/cluster-service: "true"
|
||||
annotations:
|
||||
scheduler.alpha.kubernetes.io/critical-pod: ''
|
||||
scheduler.alpha.kubernetes.io/tolerations: '[{"key":"CriticalAddonsOnly", "operator":"Exists"}]'
|
||||
spec:
|
||||
containers:
|
||||
- name: kubedns
|
||||
|
@ -38,6 +38,9 @@ spec:
|
||||
k8s-app: kube-dns
|
||||
version: v19
|
||||
kubernetes.io/cluster-service: "true"
|
||||
annotations:
|
||||
scheduler.alpha.kubernetes.io/critical-pod: ''
|
||||
scheduler.alpha.kubernetes.io/tolerations: '[{"key":"CriticalAddonsOnly", "operator":"Exists"}]'
|
||||
spec:
|
||||
containers:
|
||||
- name: kubedns
|
||||
|
@ -38,6 +38,9 @@ spec:
|
||||
k8s-app: kube-dns
|
||||
version: v19
|
||||
kubernetes.io/cluster-service: "true"
|
||||
annotations:
|
||||
scheduler.alpha.kubernetes.io/critical-pod: ''
|
||||
scheduler.alpha.kubernetes.io/tolerations: '[{"key":"CriticalAddonsOnly", "operator":"Exists"}]'
|
||||
spec:
|
||||
containers:
|
||||
- name: kubedns
|
||||
|
Loading…
Reference in New Issue
Block a user