From 32df224b5029b20970a546f64d7ac779efbc3c2d Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Thu, 17 Dec 2020 14:15:38 +0200 Subject: [PATCH] Allow Calico to run on systems with loose reverse path forwarding --- upup/models/bindata.go | 3 +++ .../addons/networking.projectcalico.org/k8s-1.12.yaml.template | 3 +++ upup/pkg/fi/cloudup/bootstrapchannelbuilder.go | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/upup/models/bindata.go b/upup/models/bindata.go index a0618fd98b791..92ba3b3e903f5 100644 --- a/upup/models/bindata.go +++ b/upup/models/bindata.go @@ -7635,6 +7635,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/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 index ca487961249bc..408440c23bd44 100644 --- 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 index 8bf43643cb777..836b84812dd98 100644 --- 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", }