Merge pull request #7842 from EladDolev/flannel_priorityclass

add missing priorityClassName to flannel DaemonSet
kubernetes · Nov 11, 2019 · 40e2ef3 · 40e2ef3
2 parents 3fbcd12 + 16da5f1
commit 40e2ef3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/upup/models/cloudup/resources/addons/networking.flannel/k8s-1.12.yaml.template b/upup/models/cloudup/resources/addons/networking.flannel/k8s-1.12.yaml.template
@@ -106,6 +106,7 @@ spec:
         app: flannel
         role.kubernetes.io/networking: "1"
     spec:
+      priorityClassName: system-node-critical
       hostNetwork: true
       nodeSelector:
         beta.kubernetes.io/arch: amd64

diff --git a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
@@ -775,7 +775,7 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons {
 		versions := map[string]string{
 			"pre-k8s-1.6": "0.11.0-kops.1",
 			"k8s-1.6":     "0.11.0-kops.2",
-			"k8s-1.12":    "0.11.0-kops.2",
+			"k8s-1.12":    "0.11.0-kops.3",
 		}
 
 		{