Merge pull request kubernetes#7874 from jochen42/feature/kubernetes#7873

-weave-pods-node-critical mark weavenet-pod as system-critical
ReillyTevera · Dec 30, 2019 · 114323b · 114323b
1 parent eb50e5e
commit 114323b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/upup/models/cloudup/resources/addons/networking.weave/k8s-1.12.yaml.template b/upup/models/cloudup/resources/addons/networking.weave/k8s-1.12.yaml.template
@@ -257,5 +257,6 @@ spec:
           hostPath:
             path: /run/xtables.lock
             type: FileOrCreate
+      priorityClassName: system-node-critical
   updateStrategy:
     type: RollingUpdate
diff --git a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
@@ -675,7 +675,7 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons {
 			"k8s-1.6":     "2.3.0-kops.3",
 			"k8s-1.7":     "2.5.2-kops.2",
 			"k8s-1.8":     "2.5.2-kops.2",
-			"k8s-1.12":    "2.5.2-kops.2",
+			"k8s-1.12":    "2.5.2-kops.3",
 		}
 
 		{

diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml
@@ -139,8 +139,8 @@ spec:
   - id: k8s-1.12
     kubernetesVersion: '>=1.12.0'
     manifest: networking.weave/k8s-1.12.yaml
-    manifestHash: 11e566a259bbb5f066cf2b06cd8832e74072a900
+    manifestHash: 96334bfcfa6a3ec9791b50c94674a8821cb6ad67
     name: networking.weave
     selector:
       role.kubernetes.io/networking: "1"
-    version: 2.5.2-kops.2
+    version: 2.5.2-kops.3