Merge pull request kubernetes#89971 from liggitt/automated-cherry-pick-of-#89970-upstream-release-1.18

k8s-ci-robot · web-flow · commit 0c7f1c515da3 · 2020-04-09T13:21:48.000-07:00
Automated cherry pick of kubernetes#89970: Fix priorityClass typo, add numeric priority to static pods
diff --git a/cluster/gce/manifests/etcd-empty-dir-cleanup.yaml b/cluster/gce/manifests/etcd-empty-dir-cleanup.yaml
@@ -9,6 +9,7 @@ metadata:
     k8s-app: etcd-empty-dir-cleanup
 spec:
   priorityClassName: system-node-critical
+  priority: 2000001000
   hostNetwork: true
   dnsPolicy: Default
   containers:
diff --git a/cluster/gce/manifests/etcd.manifest b/cluster/gce/manifests/etcd.manifest
@@ -9,7 +9,8 @@
   }
 },
 "spec":{
-"priorityClass": "system-node-critical",
+"priorityClassName": "system-node-critical",
+"priority": 2000001000,
 "hostNetwork": true,
 "containers":[
     {
diff --git a/cluster/gce/manifests/glbc.manifest b/cluster/gce/manifests/glbc.manifest
@@ -10,6 +10,8 @@ metadata:
     k8s-app: gcp-lb-controller
     kubernetes.io/name: "GLBC"
 spec:
+  priorityClassName: system-node-critical
+  priority: 2000001000
   terminationGracePeriodSeconds: 600
   hostNetwork: true
   containers:
diff --git a/cluster/gce/manifests/konnectivity-server.yaml b/cluster/gce/manifests/konnectivity-server.yaml
@@ -7,7 +7,8 @@ metadata:
     seccomp.security.alpha.kubernetes.io/pod: 'docker/default'
   component: konnectivity-server
 spec:
-  priorityClassName: system-cluster-critical
+  priorityClassName: system-node-critical
+  priority: 2000001000
   hostNetwork: true
   containers:
   - name: konnectivity-server-container
diff --git a/cluster/gce/manifests/kube-addon-manager.yaml b/cluster/gce/manifests/kube-addon-manager.yaml
@@ -9,6 +9,7 @@ metadata:
     component: kube-addon-manager
 spec:
   priorityClassName: system-node-critical
+  priority: 2000001000
   hostNetwork: true
   containers:
   - name: kube-addon-manager
diff --git a/cluster/gce/manifests/kube-apiserver.manifest b/cluster/gce/manifests/kube-apiserver.manifest
@@ -13,7 +13,8 @@
   }
 },
 "spec":{
-"priorityClass": "system-node-critical",
+"priorityClassName": "system-node-critical",
+"priority": 2000001000,
 "hostNetwork": true,
 "containers":[
     {
diff --git a/cluster/gce/manifests/kube-controller-manager.manifest b/cluster/gce/manifests/kube-controller-manager.manifest
@@ -13,7 +13,8 @@
   }
 },
 "spec":{
-"priorityClass": "system-node-critical",
+"priorityClassName": "system-node-critical",
+"priority": 2000001000,
 "hostNetwork": true,
 "containers":[
     {
diff --git a/cluster/gce/manifests/kube-proxy.manifest b/cluster/gce/manifests/kube-proxy.manifest
@@ -10,6 +10,7 @@ metadata:
     component: kube-proxy
 spec:
   priorityClassName: system-node-critical
+  priority: 2000001000
   hostNetwork: true
   tolerations:
   - operator: "Exists"
diff --git a/cluster/gce/manifests/kube-scheduler.manifest b/cluster/gce/manifests/kube-scheduler.manifest
@@ -13,7 +13,8 @@
   }
 },
 "spec":{
-"priorityClass": "system-node-critical",
+"priorityClassName": "system-node-critical",
+"priority": 2000001000,
 "hostNetwork": true,
 "containers":[
     {

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,8 @@`
`9`	`9`	`}`
`10`	`10`	`},`
`11`	`11`	`"spec":{`
`12`		`-"priorityClass": "system-node-critical",`
	`12`	`+"priorityClassName": "system-node-critical",`
	`13`	`+"priority": 2000001000,`
`13`	`14`	`"hostNetwork": true,`
`14`	`15`	`"containers":[`
`15`	`16`	`{`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,8 @@`
`13`	`13`	`}`
`14`	`14`	`},`
`15`	`15`	`"spec":{`
`16`		`-"priorityClass": "system-node-critical",`
	`16`	`+"priorityClassName": "system-node-critical",`
	`17`	`+"priority": 2000001000,`
`17`	`18`	`"hostNetwork": true,`
`18`	`19`	`"containers":[`
`19`	`20`	`{`