Merge pull request #10446 from hakman/automated-cherry-pick-of-#10442…

…-upstream-release-1.18 Automated cherry pick of #10442: Allow Calico to run on systems with loose reverse path
kubernetes · Dec 18, 2020 · 3410b42 · 3410b42
2 parents a9e6b64 + 32df224
commit 3410b42
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/upup/models/bindata.go b/upup/models/bindata.go
diff --git a/upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.12.yaml.template b/upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.12.yaml.template
@@ -809,6 +809,9 @@ spec:
             # Set Felix endpoint to host default action to ACCEPT.
             - name: FELIX_DEFAULTENDPOINTTOHOSTACTION
               value: "ACCEPT"
+            # Allow Felix to run on systems with loose reverse path forwarding (RPF)
+            - name: FELIX_IGNORELOOSERPF
+              value: "true"
             # Disable IPv6 on Kubernetes.
             - name: FELIX_IPV6SUPPORT
               value: "false"

diff --git a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
@@ -725,7 +725,7 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons {
 		versions := map[string]string{
 			"k8s-1.7":    "2.6.12-kops.1",
 			"k8s-1.7-v3": "3.8.0-kops.2",
-			"k8s-1.12":   "3.9.6-kops.1",
+			"k8s-1.12":   "3.9.6-kops.2",
 			"k8s-1.16":   "3.15.3-kops.3",
 		}