Add missing priorityClassName for critical pods

kubernetes · Jan 22, 2020 · 38aafc7 · 38aafc7
1 parent 3f34983
commit 38aafc7
Show file tree

Hide file tree

Showing 21 changed files with 54 additions and 37 deletions.
diff --git a/upup/models/cloudup/resources/addons/authentication.aws/k8s-1.12.yaml.template b/upup/models/cloudup/resources/addons/authentication.aws/k8s-1.12.yaml.template
@@ -25,6 +25,7 @@ spec:
       # run on each master node
       nodeSelector:
         node-role.kubernetes.io/master: ""
+      priorityClassName: system-node-critical
       tolerations:
       - effect: NoSchedule
         key: node-role.kubernetes.io/master

diff --git a/upup/models/cloudup/resources/addons/authentication.kope.io/k8s-1.12.yaml b/upup/models/cloudup/resources/addons/authentication.kope.io/k8s-1.12.yaml
@@ -48,6 +48,7 @@ spec:
       hostNetwork: true
       nodeSelector:
         node-role.kubernetes.io/master: ""
+      priorityClassName: system-node-critical
       tolerations:
       - effect: NoSchedule
         key: node-role.kubernetes.io/master

diff --git a/upup/models/cloudup/resources/addons/coredns.addons.k8s.io/k8s-1.12.yaml.template b/upup/models/cloudup/resources/addons/coredns.addons.k8s.io/k8s-1.12.yaml.template
@@ -116,6 +116,7 @@ spec:
           - --default-params={"linear":{"coresPerReplica":256,"nodesPerReplica":16,"preventSinglePointFailure":true}}
           - --logtostderr=true
           - --v=2
+      priorityClassName: system-cluster-critical
       tolerations:
       - key: "CriticalAddonsOnly"
         operator: "Exists"

diff --git a/...loudup/resources/addons/digitalocean-cloud-controller.addons.k8s.io/k8s-1.8.yaml.template b/...loudup/resources/addons/digitalocean-cloud-controller.addons.k8s.io/k8s-1.8.yaml.template
@@ -30,6 +30,7 @@ spec:
       serviceAccountName: cloud-controller-manager
       dnsPolicy: Default
       hostNetwork: true
+      priorityClassName: system-node-critical
       tolerations:
         - key: "node.cloudprovider.kubernetes.io/uninitialized"
           value: "true"

diff --git a/upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/k8s-1.12.yaml.template b/upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/k8s-1.12.yaml.template
@@ -21,6 +21,7 @@ spec:
       annotations:
         scheduler.alpha.kubernetes.io/critical-pod: ''
     spec:
+      priorityClassName: system-cluster-critical
       tolerations:
       - operator: Exists
       nodeSelector:

diff --git a/upup/models/cloudup/resources/addons/external-dns.addons.k8s.io/k8s-1.12.yaml.template b/upup/models/cloudup/resources/addons/external-dns.addons.k8s.io/k8s-1.12.yaml.template
@@ -21,6 +21,7 @@ spec:
       annotations:
         scheduler.alpha.kubernetes.io/critical-pod: ''
     spec:
+      priorityClassName: system-cluster-critical
       serviceAccount: external-dns
       tolerations:
       - key: "node-role.kubernetes.io/master"

diff --git a/upup/models/cloudup/resources/addons/kube-dns.addons.k8s.io/k8s-1.12.yaml.template b/upup/models/cloudup/resources/addons/kube-dns.addons.k8s.io/k8s-1.12.yaml.template
@@ -69,6 +69,7 @@ spec:
           - --default-params={"linear":{"coresPerReplica":256,"nodesPerReplica":16,"preventSinglePointFailure":true}}
           - --logtostderr=true
           - --v=2
+      priorityClassName: system-cluster-critical
       tolerations:
       - key: "CriticalAddonsOnly"
         operator: "Exists"
@@ -119,6 +120,7 @@ spec:
                         - kube-dns
                 topologyKey: kubernetes.io/hostname
       dnsPolicy: Default  # Don't use cluster DNS.
+      priorityClassName: system-cluster-critical
       serviceAccountName: kube-dns
       volumes:
       - name: kube-dns-config

diff --git a/upup/models/cloudup/resources/addons/networking.amazon-vpc-routed-eni/k8s-1.10.yaml.template b/upup/models/cloudup/resources/addons/networking.amazon-vpc-routed-eni/k8s-1.10.yaml.template
@@ -64,6 +64,7 @@ spec:
     spec:
       serviceAccountName: aws-node
       hostNetwork: true
+      priorityClassName: system-node-critical
       tolerations:
       - operator: Exists
       containers:

diff --git a/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.12.yaml.template b/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.12.yaml.template
@@ -461,6 +461,7 @@ spec:
           name: bpf-maps
         - mountPath: /var/run/cilium
           name: cilium-run
+      priorityClassName: system-cluster-critical
       restartPolicy: Always
       serviceAccount: cilium
       serviceAccountName: cilium

diff --git a/upup/models/cloudup/resources/addons/networking.kope.io/k8s-1.12.yaml b/upup/models/cloudup/resources/addons/networking.kope.io/k8s-1.12.yaml
@@ -44,6 +44,7 @@ spec:
               fieldRef:
                 fieldPath: spec.nodeName
       serviceAccountName: kopeio-networking-agent
+      priorityClassName: system-node-critical
       tolerations:
       - effect: NoSchedule
         operator: Exists

diff --git a/upup/models/cloudup/resources/addons/networking.kuberouter/k8s-1.12.yaml.template b/upup/models/cloudup/resources/addons/networking.kuberouter/k8s-1.12.yaml.template
@@ -92,6 +92,7 @@ spec:
         - name: kube-router-cfg
           mountPath: /etc/kube-router
       hostNetwork: true
+      priorityClassName: system-node-critical
       serviceAccountName: kube-router
       tolerations:
       - key: CriticalAddonsOnly

diff --git a/upup/models/cloudup/resources/addons/node-authorizer.addons.k8s.io/k8s-1.12.yaml.template b/upup/models/cloudup/resources/addons/node-authorizer.addons.k8s.io/k8s-1.12.yaml.template
@@ -139,6 +139,7 @@ spec:
       hostNetwork: true
       nodeSelector:
         kubernetes.io/role: master
+      priorityClassName: system-node-critical
       serviceAccount: {{ $name }}
       securityContext:
         fsGroup: 1000

diff --git a/upup/models/cloudup/resources/addons/openstack.addons.k8s.io/k8s-1.13.yaml.template b/upup/models/cloudup/resources/addons/openstack.addons.k8s.io/k8s-1.13.yaml.template
@@ -180,6 +180,7 @@ spec:
       # run on each master node
       nodeSelector:
         node-role.kubernetes.io/master: ""
+      priorityClassName: system-node-critical
       securityContext:
         runAsUser: 1001
       serviceAccountName: cloud-controller-manager

diff --git a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
@@ -199,7 +199,7 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons {
 	if b.cluster.Spec.NodeAuthorization != nil {
 		{
 			key := "node-authorizer.addons.k8s.io"
-			version := "v0.0.4-kops.1"
+			version := "v0.0.4-kops.2"
 
 			{
 				location := key + "/k8s-1.10.yaml"
@@ -236,7 +236,7 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons {
 
 		{
 			key := "kube-dns.addons.k8s.io"
-			version := "1.14.13-kops.1"
+			version := "1.14.13-kops.2"
 
 			{
 				location := key + "/pre-k8s-1.6.yaml"
@@ -304,7 +304,7 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons {
 
 		{
 			key := "coredns.addons.k8s.io"
-			version := "1.3.1-kops.5"
+			version := "1.3.1-kops.6"
 
 			{
 				location := key + "/k8s-1.12.yaml"
@@ -445,7 +445,7 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons {
 	if featureflag.EnableExternalDNS.Enabled() {
 		{
 			key := "external-dns.addons.k8s.io"
-			version := "0.4.4"
+			version := "0.4.5-kops.1"
 
 			{
 				location := key + "/pre-k8s-1.6.yaml"
@@ -540,7 +540,7 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons {
 
 	if kops.CloudProviderID(b.cluster.Spec.CloudProvider) == kops.CloudProviderDO {
 		key := "digitalocean-cloud-controller.addons.k8s.io"
-		version := "1.8"
+		version := "1.8.1-kops.1"
 
 		{
 			id := "k8s-1.8"
@@ -660,7 +660,7 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons {
 
 	if b.cluster.Spec.Networking.Kopeio != nil {
 		key := "networking.kope.io"
-		version := "1.0.20181028-kops.1"
+		version := "1.0.20181028-kops.2"
 
 		{
 			location := key + "/pre-k8s-1.6.yaml"
@@ -1029,7 +1029,7 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons {
 
 	if b.cluster.Spec.Networking.Kuberouter != nil {
 		key := "networking.kuberouter"
-		version := "0.3.1-kops.1"
+		version := "0.3.1-kops.2"
 
 		{
 			location := key + "/k8s-1.6.yaml"
@@ -1099,7 +1099,7 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons {
 		versions := map[string]string{
 			"k8s-1.7":  "1.5.0-kops.1",
 			"k8s-1.8":  "1.5.0-kops.1",
-			"k8s-1.10": "1.5.0-kops.1",
+			"k8s-1.10": "1.5.0-kops.2",
 			"k8s-1.12": "1.5.5-kops.1",
 		}
 
@@ -1162,7 +1162,7 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons {
 
 	if b.cluster.Spec.Networking.Cilium != nil {
 		key := "networking.cilium.io"
-		version := "1.6.4-kops.2"
+		version := "1.6.4-kops.3"
 
 		{
 			id := "k8s-1.7"
@@ -1198,7 +1198,7 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons {
 	if b.cluster.Spec.Authentication != nil {
 		if b.cluster.Spec.Authentication.Kopeio != nil {
 			key := "authentication.kope.io"
-			version := "1.0.20171125"
+			version := "1.0.20181028-kops.1"
 
 			{
 				location := key + "/k8s-1.8.yaml"
@@ -1230,7 +1230,7 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons {
 		}
 		if b.cluster.Spec.Authentication.Aws != nil {
 			key := "authentication.aws"
-			version := "0.4.0-kops.1"
+			version := "0.4.0-kops.2"
 
 			{
 				location := key + "/k8s-1.10.yaml"
@@ -1283,7 +1283,7 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons {
 			}
 			{
 				key := "openstack.addons.k8s.io"
-				version := "1.13.0"
+				version := "1.13.1-kops.1"
 
 				location := key + "/k8s-1.13.yaml"
 				id := "k8s-1.13-ccm"

diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml
@@ -25,23 +25,23 @@ spec:
     name: kube-dns.addons.k8s.io
     selector:
       k8s-addon: kube-dns.addons.k8s.io
-    version: 1.14.13-kops.1
+    version: 1.14.13-kops.2
   - id: k8s-1.6
     kubernetesVersion: '>=1.6.0 <1.12.0'
     manifest: kube-dns.addons.k8s.io/k8s-1.6.yaml
     manifestHash: 555f952a8b955ce7a5dd0bcd06a5be9e72bd2895
     name: kube-dns.addons.k8s.io
     selector:
       k8s-addon: kube-dns.addons.k8s.io
-    version: 1.14.13-kops.1
+    version: 1.14.13-kops.2
   - id: k8s-1.12
     kubernetesVersion: '>=1.12.0'
     manifest: kube-dns.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: b4dff071aa340fd71650c96f213fdf4b4f799c71
+    manifestHash: 15ade04df128488a534141bd5b8593d078f4953f
     name: kube-dns.addons.k8s.io
     selector:
       k8s-addon: kube-dns.addons.k8s.io
-    version: 1.14.13-kops.1
+    version: 1.14.13-kops.2
   - id: k8s-1.8
     kubernetesVersion: '>=1.8.0'
     manifest: rbac.addons.k8s.io/k8s-1.8.yaml
@@ -83,7 +83,7 @@ spec:
   - id: k8s-1.12
     kubernetesVersion: '>=1.12.0'
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: a304440f4f7d2e289eb12c37adeac04253d84906
+    manifestHash: 4d19a9d30591c09243539c4022003d2f875818fc
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
@@ -131,11 +131,11 @@ spec:
   - id: k8s-1.10
     kubernetesVersion: '>=1.10.0 <1.12.0'
     manifest: networking.amazon-vpc-routed-eni/k8s-1.10.yaml
-    manifestHash: 672f2fdfc6286512e9918014f7853728db2f6dad
+    manifestHash: eddd81f1dc347b3ae4566f5aa098106f14597f7c
     name: networking.amazon-vpc-routed-eni
     selector:
       role.kubernetes.io/networking: "1"
-    version: 1.5.0-kops.1
+    version: 1.5.0-kops.2
   - id: k8s-1.12
     kubernetesVersion: '>=1.12.0'
     manifest: networking.amazon-vpc-routed-eni/k8s-1.12.yaml

diff --git a/...i/cloudup/tests/bootstrapchannelbuilder/cilium/dns-controller.addons.k8s.io-k8s-1.12.yaml b/...i/cloudup/tests/bootstrapchannelbuilder/cilium/dns-controller.addons.k8s.io-k8s-1.12.yaml
@@ -42,6 +42,7 @@ spec:
       hostNetwork: true
       nodeSelector:
         node-role.kubernetes.io/master: ""
+      priorityClassName: system-cluster-critical
       serviceAccount: dns-controller
       tolerations:
       - operator: Exists

diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml
@@ -25,23 +25,23 @@ spec:
     name: kube-dns.addons.k8s.io
     selector:
       k8s-addon: kube-dns.addons.k8s.io
-    version: 1.14.13-kops.1
+    version: 1.14.13-kops.2
   - id: k8s-1.6
     kubernetesVersion: '>=1.6.0 <1.12.0'
     manifest: kube-dns.addons.k8s.io/k8s-1.6.yaml
     manifestHash: c74ca65f461c764fc9682c6d9ec171b241bec335
     name: kube-dns.addons.k8s.io
     selector:
       k8s-addon: kube-dns.addons.k8s.io
-    version: 1.14.13-kops.1
+    version: 1.14.13-kops.2
   - id: k8s-1.12
     kubernetesVersion: '>=1.12.0'
     manifest: kube-dns.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: 4da6501bd5ad16fab9e05fbfe7c6d587441a8ec4
+    manifestHash: 1af655a2947a56b55f67bff73a06cfe9e7b12c35
     name: kube-dns.addons.k8s.io
     selector:
       k8s-addon: kube-dns.addons.k8s.io
-    version: 1.14.13-kops.1
+    version: 1.14.13-kops.2
   - id: k8s-1.8
     kubernetesVersion: '>=1.8.0'
     manifest: rbac.addons.k8s.io/k8s-1.8.yaml
@@ -83,7 +83,7 @@ spec:
   - id: k8s-1.12
     kubernetesVersion: '>=1.12.0'
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: a304440f4f7d2e289eb12c37adeac04253d84906
+    manifestHash: 4d19a9d30591c09243539c4022003d2f875818fc
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
@@ -119,12 +119,12 @@ spec:
     name: networking.cilium.io
     selector:
       role.kubernetes.io/networking: "1"
-    version: 1.6.4-kops.2
+    version: 1.6.4-kops.3
   - id: k8s-1.12
     kubernetesVersion: '>=1.12.0'
     manifest: networking.cilium.io/k8s-1.12.yaml
-    manifestHash: 2d40b9ab7453b4a0a413196fae4c8bdcd62c69ce
+    manifestHash: b36181e5522a41b1726362e138ad87df87839a68
     name: networking.cilium.io
     selector:
       role.kubernetes.io/networking: "1"
-    version: 1.6.4-kops.2
+    version: 1.6.4-kops.3
diff --git a/...i/cloudup/tests/bootstrapchannelbuilder/simple/dns-controller.addons.k8s.io-k8s-1.12.yaml b/...i/cloudup/tests/bootstrapchannelbuilder/simple/dns-controller.addons.k8s.io-k8s-1.12.yaml
@@ -42,6 +42,7 @@ spec:
       hostNetwork: true
       nodeSelector:
         node-role.kubernetes.io/master: ""
+      priorityClassName: system-cluster-critical
       serviceAccount: dns-controller
       tolerations:
       - operator: Exists

diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml
@@ -25,23 +25,23 @@ spec:
     name: kube-dns.addons.k8s.io
     selector:
       k8s-addon: kube-dns.addons.k8s.io
-    version: 1.14.13-kops.1
+    version: 1.14.13-kops.2
   - id: k8s-1.6
     kubernetesVersion: '>=1.6.0 <1.12.0'
     manifest: kube-dns.addons.k8s.io/k8s-1.6.yaml
     manifestHash: 555f952a8b955ce7a5dd0bcd06a5be9e72bd2895
     name: kube-dns.addons.k8s.io
     selector:
       k8s-addon: kube-dns.addons.k8s.io
-    version: 1.14.13-kops.1
+    version: 1.14.13-kops.2
   - id: k8s-1.12
     kubernetesVersion: '>=1.12.0'
     manifest: kube-dns.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: b4dff071aa340fd71650c96f213fdf4b4f799c71
+    manifestHash: 15ade04df128488a534141bd5b8593d078f4953f
     name: kube-dns.addons.k8s.io
     selector:
       k8s-addon: kube-dns.addons.k8s.io
-    version: 1.14.13-kops.1
+    version: 1.14.13-kops.2
   - id: k8s-1.8
     kubernetesVersion: '>=1.8.0'
     manifest: rbac.addons.k8s.io/k8s-1.8.yaml
@@ -83,7 +83,7 @@ spec:
   - id: k8s-1.12
     kubernetesVersion: '>=1.12.0'
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: a304440f4f7d2e289eb12c37adeac04253d84906
+    manifestHash: 4d19a9d30591c09243539c4022003d2f875818fc
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io