Skip to content

Commit 273e926

Browse files
authored
Merge pull request kubernetes#80342 from draveness/feature/remove-critical-pod-annotation
feat: cleanup pod critical pod annotations feature
2 parents f2dd248 + 495faa2 commit 273e926

File tree

59 files changed

+101
-311
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+101
-311
lines changed

cluster/addons/calico-policy-controller/calico-node-daemonset.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ spec:
1717
metadata:
1818
labels:
1919
k8s-app: calico-node
20-
annotations:
21-
scheduler.alpha.kubernetes.io/critical-pod: ''
2220
spec:
2321
priorityClassName: system-node-critical
2422
nodeSelector:

cluster/addons/calico-policy-controller/calico-node-vertical-autoscaler-deployment.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ spec:
1616
metadata:
1717
labels:
1818
k8s-app: calico-node-autoscaler
19-
annotations:
20-
scheduler.alpha.kubernetes.io/critical-pod: ''
2119
spec:
2220
priorityClassName: system-cluster-critical
2321
containers:

cluster/addons/calico-policy-controller/typha-deployment.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ spec:
1616
metadata:
1717
labels:
1818
k8s-app: calico-typha
19-
annotations:
20-
scheduler.alpha.kubernetes.io/critical-pod: ''
2119
spec:
2220
priorityClassName: system-cluster-critical
2321
tolerations:

cluster/addons/calico-policy-controller/typha-horizontal-autoscaler-deployment.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ spec:
1616
metadata:
1717
labels:
1818
k8s-app: calico-typha-autoscaler
19-
annotations:
20-
scheduler.alpha.kubernetes.io/critical-pod: ''
2119
spec:
2220
priorityClassName: system-cluster-critical
2321
securityContext:

cluster/addons/calico-policy-controller/typha-vertical-autoscaler-deployment.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ spec:
1616
metadata:
1717
labels:
1818
k8s-app: calico-typha-autoscaler
19-
annotations:
20-
scheduler.alpha.kubernetes.io/critical-pod: ''
2119
spec:
2220
priorityClassName: system-cluster-critical
2321
containers:

cluster/addons/cluster-monitoring/google/heapster-controller.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ spec:
5151
k8s-app: heapster
5252
version: v1.6.0-beta.1
5353
annotations:
54-
scheduler.alpha.kubernetes.io/critical-pod: ''
5554
seccomp.security.alpha.kubernetes.io/pod: 'docker/default'
5655
spec:
5756
priorityClassName: system-cluster-critical

cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ spec:
5151
k8s-app: heapster
5252
version: v1.6.0-beta.1
5353
annotations:
54-
scheduler.alpha.kubernetes.io/critical-pod: ''
5554
seccomp.security.alpha.kubernetes.io/pod: 'docker/default'
5655
spec:
5756
priorityClassName: system-cluster-critical

cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ spec:
5151
k8s-app: heapster
5252
version: v1.6.0-beta.1
5353
annotations:
54-
scheduler.alpha.kubernetes.io/critical-pod: ''
5554
seccomp.security.alpha.kubernetes.io/pod: 'docker/default'
5655
spec:
5756
priorityClassName: system-cluster-critical

cluster/addons/cluster-monitoring/influxdb/influxdb-grafana-controller.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ spec:
1919
k8s-app: influxGrafana
2020
version: v4
2121
annotations:
22-
scheduler.alpha.kubernetes.io/critical-pod: ''
2322
seccomp.security.alpha.kubernetes.io/pod: 'docker/default'
2423
spec:
2524
priorityClassName: system-cluster-critical

cluster/addons/cluster-monitoring/stackdriver/heapster-controller.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ spec:
3939
k8s-app: heapster
4040
version: v1.6.0-beta.1
4141
annotations:
42-
scheduler.alpha.kubernetes.io/critical-pod: ''
4342
seccomp.security.alpha.kubernetes.io/pod: 'docker/default'
4443
spec:
4544
priorityClassName: system-cluster-critical

0 commit comments

Comments
 (0)