kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10445 from hakman/automated-cherry-pick-of-#10442-upstream-release-1.19 

Automated cherry pick of #10442: Allow Calico to run on systems with loose reverse path
This commit is contained in:
Kubernetes Prow Robot 2020-12-18 03:26:25 -08:00 committed by GitHub
parent 17b63df9f7 bccd15bdb2
commit 69ee44ada3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
upup/models/bindata.go
View File

@ -8985,6 +8985,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"

3
upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.12.yaml.template
View File

@ -813,6 +813,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"

2
upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
View File

@ -857,7 +857,7 @@ func (b *BootstrapChannelBuilder) buildAddons(c *fi.ModelBuilderContext) (*chann
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.17.1-kops.1",
}