From 6c85fd8b527b3afb9367ffcca49325971e1b1a2b Mon Sep 17 00:00:00 2001 From: Elad Dolev Date: Tue, 29 Oct 2019 12:10:31 +0200 Subject: [PATCH 1/2] add missing priorityClassName to flannel DaemonSet --- .../resources/addons/networking.flannel/k8s-1.12.yaml.template | 1 + 1 file changed, 1 insertion(+) 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 index 12d1dab798705..2d9daad7c5adb 100644 --- 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 From 16da5f1967ce00468e4ad4421033b4098e2489c3 Mon Sep 17 00:00:00 2001 From: Elad Dolev Date: Tue, 29 Oct 2019 12:32:47 +0200 Subject: [PATCH 2/2] bump version --- upup/pkg/fi/cloudup/bootstrapchannelbuilder.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go index cdd235a0c50d0..726b34f3ff187 100644 --- 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", } {