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

Merge pull request #14685 from johngmyers/revert-flatcar-workaround 

Revert "Calico: Work around host port/conntrack problem"
This commit is contained in:
Kubernetes Prow Robot 2022-11-28 11:51:43 -08:00 committed by GitHub
parent d1459d1581 0ce9877eb4
commit 8e3b7c3a67
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4709,12 +4709,6 @@ spec:
# Controls the log level used by the BPF programs # Controls the log level used by the BPF programs
- name: FELIX_BPFLOGLEVEL - name: FELIX_BPFLOGLEVEL
value: "{{- or .Networking.Calico.BPFLogLevel "Off" }}" value: "{{- or .Networking.Calico.BPFLogLevel "Off" }}"
# Temporary workaround for https://github.com/projectcalico/calico/issues/6522,
# allowing reply packets from containers using host ports to flow through DNAT reversal properly.
{{- if .Networking.Calico.BPFEnabled }}
- name: FELIX_BPFHostConntrackBypass
value: "false"
{{- end }}
# Controls whether Felix inserts rules to the top of iptables chains, or appends to the bottom # Controls whether Felix inserts rules to the top of iptables chains, or appends to the bottom
- name: FELIX_CHAININSERTMODE - name: FELIX_CHAININSERTMODE
value: "{{- or .Networking.Calico.ChainInsertMode "insert" }}" value: "{{- or .Networking.Calico.ChainInsertMode "insert" }}"

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

@ -4674,12 +4674,6 @@ spec:
# Controls the log level used by the BPF programs # Controls the log level used by the BPF programs
- name: FELIX_BPFLOGLEVEL - name: FELIX_BPFLOGLEVEL
value: "{{- or .Networking.Calico.BPFLogLevel "Off" }}" value: "{{- or .Networking.Calico.BPFLogLevel "Off" }}"
# Temporary workaround for https://github.com/projectcalico/calico/issues/6522,
# allowing reply packets from containers using host ports to flow through DNAT reversal properly.
{{- if .Networking.Calico.BPFEnabled }}
- name: FELIX_BPFHostConntrackBypass
value: "false"
{{- end }}
# Controls whether Felix inserts rules to the top of iptables chains, or appends to the bottom # Controls whether Felix inserts rules to the top of iptables chains, or appends to the bottom
- name: FELIX_CHAININSERTMODE - name: FELIX_CHAININSERTMODE
value: "{{- or .Networking.Calico.ChainInsertMode "insert" }}" value: "{{- or .Networking.Calico.ChainInsertMode "insert" }}"