From 0abb03135cf88ce954f404c6caf7b2831a5440db Mon Sep 17 00:00:00 2001 From: Zac Blazic Date: Fri, 8 Nov 2019 17:14:57 +0200 Subject: [PATCH 1/3] Prefer CrossSubnet as a value for CALICO_IPV4POOL_IPIP Because the accepted values have changed since v3.0: https://docs.projectcalico.org/v3.0/reference/node/configuration#environment-variables --- .../addons/networking.projectcalico.org/k8s-1.12.yaml.template | 2 +- .../networking.projectcalico.org/k8s-1.7-v3.yaml.template | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 cacdef16da..26644ab1cd 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 @@ -791,7 +791,7 @@ spec: value: "autodetect" # Enable 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 - name: FELIX_IPINIPMTU valueFrom: diff --git a/upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.7-v3.yaml.template b/upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.7-v3.yaml.template index 9c363aba93..e6d3235076 100644 --- a/upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.7-v3.yaml.template +++ b/upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.7-v3.yaml.template @@ -235,7 +235,7 @@ spec: - name: CALICO_IPV4POOL_CIDR value: "{{ .KubeControllerManager.ClusterCIDR }}" - 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. - name: FELIX_IPV6SUPPORT value: "false" From 3c7564cbaba15506512e841fa1f99b9ea12cb922 Mon Sep 17 00:00:00 2001 From: Zac Blazic Date: Fri, 8 Nov 2019 17:20:51 +0200 Subject: [PATCH 2/3] Prefer Always as a value for CALICO_IPV4POOL_IPIP Because the accepted values have changed since v3.0: https://docs.projectcalico.org/v3.0/reference/node/configuration#environment-variables --- .../addons/networking.projectcalico.org/k8s-1.12.yaml.template | 2 +- .../networking.projectcalico.org/k8s-1.7-v3.yaml.template | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 26644ab1cd..72f192c1ca 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 @@ -791,7 +791,7 @@ spec: value: "autodetect" # Enable IPIP - name: CALICO_IPV4POOL_IPIP - value: "{{- if and (eq .CloudProvider "aws") (.Networking.Calico.CrossSubnet) -}}CrossSubnet{{- 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 - name: FELIX_IPINIPMTU valueFrom: diff --git a/upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.7-v3.yaml.template b/upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.7-v3.yaml.template index e6d3235076..120cf6342b 100644 --- a/upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.7-v3.yaml.template +++ b/upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.7-v3.yaml.template @@ -235,7 +235,7 @@ spec: - name: CALICO_IPV4POOL_CIDR value: "{{ .KubeControllerManager.ClusterCIDR }}" - name: CALICO_IPV4POOL_IPIP - value: "{{- if and (eq .CloudProvider "aws") (.Networking.Calico.CrossSubnet) -}}CrossSubnet{{- else -}}always{{- end -}}" + value: "{{- if and (eq .CloudProvider "aws") (.Networking.Calico.CrossSubnet) -}}CrossSubnet{{- else -}}Always{{- end -}}" # Disable IPv6 on Kubernetes. - name: FELIX_IPV6SUPPORT value: "false" From 1b01f195cccb9b1f0d0c8c297745861d9de7e01c Mon Sep 17 00:00:00 2001 From: Zac Blazic Date: Fri, 8 Nov 2019 17:26:43 +0200 Subject: [PATCH 3/3] Update kops version of calico manifest --- upup/pkg/fi/cloudup/bootstrapchannelbuilder.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go index 43f4fff96a..7d18af41ee 100644 --- a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go +++ b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go @@ -827,8 +827,8 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons { "pre-k8s-1.6": "2.4.2-kops.1", "k8s-1.6": "2.6.9-kops.1", "k8s-1.7": "2.6.12-kops.1", - "k8s-1.7-v3": "3.8.0-kops.1", - "k8s-1.12": "3.9.1-kops.2", + "k8s-1.7-v3": "3.8.0-kops.2", + "k8s-1.12": "3.9.1-kops.3", } {