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

Merge pull request #7899 from zacblazic/improve-calico-ipip-values 

Use correct values for CALICO_IPV4POOL_IPIP in Calico v3
This commit is contained in:
Kubernetes Prow Robot 2019-11-21 10:05:29 -08:00 committed by GitHub
parent 2528eff1b4 1b01f195cc
commit 3ab974f680
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -791,7 +791,7 @@ spec:
value: "autodetect" value: "autodetect"
# Enable IPIP # Enable IPIP
- name: CALICO_IPV4POOL_IPIP - name: CALICO_IPV4POOL_IPIP
value: "{{- if and (eq .CloudProvider "aws") (.Networking.Calico.CrossSubnet) -}}cross-subnet{{- else -}} {{- or .Networking.Calico.IPIPMode "always" -}} {{- end -}}" value: "{{- if and (eq .CloudProvider "aws") (.Networking.Calico.CrossSubnet) -}}CrossSubnet{{- else -}} {{- or .Networking.Calico.IPIPMode "Always" -}} {{- end -}}"
# Set MTU for tunnel device used if ipip is enabled # Set MTU for tunnel device used if ipip is enabled
- name: FELIX_IPINIPMTU - name: FELIX_IPINIPMTU
valueFrom: valueFrom:

2
upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.7-v3.yaml.template
View File

@ -235,7 +235,7 @@ spec:
- name: CALICO_IPV4POOL_CIDR - name: CALICO_IPV4POOL_CIDR
value: "{{ .KubeControllerManager.ClusterCIDR }}" value: "{{ .KubeControllerManager.ClusterCIDR }}"
- name: CALICO_IPV4POOL_IPIP - name: CALICO_IPV4POOL_IPIP
value: "{{- if and (eq .CloudProvider "aws") (.Networking.Calico.CrossSubnet) -}}cross-subnet{{- else -}}always{{- end -}}" value: "{{- if and (eq .CloudProvider "aws") (.Networking.Calico.CrossSubnet) -}}CrossSubnet{{- else -}}Always{{- end -}}"
# Disable IPv6 on Kubernetes. # Disable IPv6 on Kubernetes.
- name: FELIX_IPV6SUPPORT - name: FELIX_IPV6SUPPORT
value: "false" value: "false"

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

@ -827,8 +827,8 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons {
"pre-k8s-1.6": "2.4.2-kops.1", "pre-k8s-1.6": "2.4.2-kops.1",
"k8s-1.6": "2.6.9-kops.1", "k8s-1.6": "2.6.9-kops.1",
"k8s-1.7": "2.6.12-kops.1", "k8s-1.7": "2.6.12-kops.1",
"k8s-1.7-v3": "3.8.0-kops.1", "k8s-1.7-v3": "3.8.0-kops.2",
"k8s-1.12": "3.9.1-kops.2", "k8s-1.12": "3.9.1-kops.3",
} }
{ {