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

Enable wireguard in calico-node if it is enabled

This commit is contained in:
AkiraFukushima 2020-10-11 15:42:17 +09:00
parent 4e4c4a1e16
commit 7ad4815fc9
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

@ -13100,6 +13100,9 @@ spec:
# Enable / Disable source/destination checks in AWS # Enable / Disable source/destination checks in AWS
- name: FELIX_AWSSRCDSTCHECK - name: FELIX_AWSSRCDSTCHECK
value: "{{- if and (eq .CloudProvider "aws") (.Networking.Calico.CrossSubnet) -}}Disable{{- else -}} {{- or .Networking.Calico.AwsSrcDstCheck "DoNothing" -}} {{- end -}}" value: "{{- if and (eq .CloudProvider "aws") (.Networking.Calico.CrossSubnet) -}}Disable{{- else -}} {{- or .Networking.Calico.AwsSrcDstCheck "DoNothing" -}} {{- end -}}"
# Enable WireGuard encryption for all on-the-wire pod-to-pod traffic
- name: FELIX_WIREGUARDENABLED
value: "{{ .Networking.Calico.WireguardEnabled }}"
securityContext: securityContext:
privileged: true privileged: true
resources: resources:

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

@ -3937,6 +3937,9 @@ spec:
# Enable / Disable source/destination checks in AWS # Enable / Disable source/destination checks in AWS
- name: FELIX_AWSSRCDSTCHECK - name: FELIX_AWSSRCDSTCHECK
value: "{{- if and (eq .CloudProvider "aws") (.Networking.Calico.CrossSubnet) -}}Disable{{- else -}} {{- or .Networking.Calico.AwsSrcDstCheck "DoNothing" -}} {{- end -}}" value: "{{- if and (eq .CloudProvider "aws") (.Networking.Calico.CrossSubnet) -}}Disable{{- else -}} {{- or .Networking.Calico.AwsSrcDstCheck "DoNothing" -}} {{- end -}}"
# Enable WireGuard encryption for all on-the-wire pod-to-pod traffic
- name: FELIX_WIREGUARDENABLED
value: "{{ .Networking.Calico.WireguardEnabled }}"
securityContext: securityContext:
privileged: true privileged: true
resources: resources:

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

@ -858,7 +858,7 @@ func (b *BootstrapChannelBuilder) buildAddons(c *fi.ModelBuilderContext) (*chann
"k8s-1.7": "2.6.12-kops.1", "k8s-1.7": "2.6.12-kops.1",
"k8s-1.7-v3": "3.8.0-kops.2", "k8s-1.7-v3": "3.8.0-kops.2",
"k8s-1.12": "3.9.6-kops.1", "k8s-1.12": "3.9.6-kops.1",
"k8s-1.16": "3.16.3-kops.1", "k8s-1.16": "3.16.3-kops.2",
} }
{ {