Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Calico to v3.19.2 #1583

Merged
merged 3 commits into from
Aug 10, 2021
Merged

Update Calico to v3.19.2 #1583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7413ad2
Update Calico to v3.19.2
Aug 4, 2021
fb2acf3
Add AzureClusterIdentity to private cluster and self-hosted tests
Aug 4, 2021
81c417e
Fix MTU to be under 1400
Aug 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions scripts/ci-e2e.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,6 @@ defaultTag=$(date -u '+%Y%m%d%H%M%S')
export TAG="${defaultTag:-dev}"
export GINKGO_NODES=3

# TODO: remove these variables once Calico 3.20 fixes https://github.com/kubernetes-sigs/cluster-api-provider-azure/issues/1448
AZURE_SUBSCRIPTION_ID_B64="$(echo -n "$AZURE_SUBSCRIPTION_ID" | base64 | tr -d '\n')"
AZURE_TENANT_ID_B64="$(echo -n "$AZURE_TENANT_ID" | base64 | tr -d '\n')"
AZURE_CLIENT_ID_B64="$(echo -n "$AZURE_CLIENT_ID" | base64 | tr -d '\n')"
AZURE_CLIENT_SECRET_B64="$(echo -n "$AZURE_CLIENT_SECRET" | base64 | tr -d '\n')"
export AZURE_SUBSCRIPTION_ID_B64 AZURE_TENANT_ID_B64 AZURE_CLIENT_ID_B64 AZURE_CLIENT_SECRET_B64

export AZURE_LOCATION="${AZURE_LOCATION:-$(get_random_region)}"
export AZURE_CONTROL_PLANE_MACHINE_TYPE="${AZURE_CONTROL_PLANE_MACHINE_TYPE:-"Standard_D2s_v3"}"
export AZURE_NODE_MACHINE_TYPE="${AZURE_NODE_MACHINE_TYPE:-"Standard_D2s_v3"}"
Expand Down
10 changes: 5 additions & 5 deletions templates/addons/calico-ipv6.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3622,7 +3622,7 @@ spec:
# This container installs the CNI binaries
# and CNI network config file on each node.
- name: install-cni
image: calico/cni:v3.19.1
image: calico/cni:v3.19.2
command: ["/opt/cni/bin/install"]
env:
# Name of the CNI config file to create.
Expand Down Expand Up @@ -3652,7 +3652,7 @@ spec:
# Adds a Flex Volume Driver that creates a per-pod Unix Domain Socket to allow Dikastes
# to communicate with Felix over the Policy Sync API.
- name: flexvol-driver
image: calico/pod2daemon-flexvol:v3.19.1
image: calico/pod2daemon-flexvol:v3.19.2
volumeMounts:
- name: flexvol-driver-host
mountPath: /host/driver
Expand All @@ -3663,7 +3663,7 @@ spec:
# container programs network policy and routes on each
# host.
- name: calico-node
image: calico/node:v3.19.1
image: calico/node:v3.19.2
env:
# Use Kubernetes API as the backing datastore.
- name: DATASTORE_TYPE
Expand Down Expand Up @@ -3708,7 +3708,7 @@ spec:
- name: FELIX_IPV6SUPPORT
value: "true"
- name: FELIX_FEATUREDETECTOVERRIDE
value: "MASQFullyRandom=false"
value: "ChecksumOffloadBroken=true"
- name: FELIX_HEALTHENABLED
value: "true"
securityContext:
Expand Down Expand Up @@ -3846,7 +3846,7 @@ spec:
priorityClassName: system-cluster-critical
containers:
- name: calico-kube-controllers
image: calico/kube-controllers:v3.19.1
image: calico/kube-controllers:v3.19.2
env:
# Choose which controllers to run.
- name: ENABLED_CONTROLLERS
Expand Down
25 changes: 12 additions & 13 deletions templates/addons/calico.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,12 @@ data:
typha_service_name: "none"
# Configure the backend to use.
calico_backend: "vxlan"
# Configure the MTU to use for workload interfaces and tunnels.
# - If Wireguard is enabled, set to your network MTU - 60
# - Otherwise, if VXLAN or BPF mode is enabled, set to your network MTU - 50
# - Otherwise, if IPIP is enabled, set to your network MTU - 20
# - Otherwise, if not using any encapsulation, set to your network MTU.
veth_mtu: "1440"

# On Azure, the underlying network has an MTU of 1400, even though the network interface will have an MTU of 1500.
# We set this value to 1350 for “physical network MTU size minus 50” since we use VXLAN, which uses a 50-byte header.
# If enabling Wireguard, this value should be changed to 1340 (Wireguard uses a 60-byte header).
# https://docs.projectcalico.org/networking/mtu#determine-mtu-size
veth_mtu: "1350"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/assign @jsturtevant

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm


# The CNI network configuration to install on each node. The special
# values in this config will be automatically populated.
cni_network_config: |-
Expand Down Expand Up @@ -3628,7 +3627,7 @@ spec:
# It can be deleted if this is a fresh installation, or if you have already
# upgraded to use calico-ipam.
- name: upgrade-ipam
image: calico/cni:v3.19.1
image: calico/cni:v3.19.2
command: ["/opt/cni/bin/calico-ipam", "-upgrade"]
envFrom:
- configMapRef:
Expand All @@ -3655,7 +3654,7 @@ spec:
# This container installs the CNI binaries
# and CNI network config file on each node.
- name: install-cni
image: calico/cni:v3.19.1
image: calico/cni:v3.19.2
command: ["/opt/cni/bin/install"]
envFrom:
- configMapRef:
Expand Down Expand Up @@ -3696,7 +3695,7 @@ spec:
# Adds a Flex Volume Driver that creates a per-pod Unix Domain Socket to allow Dikastes
# to communicate with Felix over the Policy Sync API.
- name: flexvol-driver
image: calico/pod2daemon-flexvol:v3.19.1
image: calico/pod2daemon-flexvol:v3.19.2
volumeMounts:
- name: flexvol-driver-host
mountPath: /host/driver
Expand All @@ -3707,7 +3706,7 @@ spec:
# container programs network policy and routes on each
# host.
- name: calico-node
image: calico/node:v3.19.1
image: calico/node:v3.19.2
envFrom:
- configMapRef:
# Allow KUBERNETES_SERVICE_HOST and KUBERNETES_SERVICE_PORT to be overridden for eBPF mode.
Expand Down Expand Up @@ -3773,7 +3772,7 @@ spec:
- name: FELIX_IPV6SUPPORT
value: "false"
- name: FELIX_FEATUREDETECTOVERRIDE
value: "MASQFullyRandom=false"
value: "ChecksumOffloadBroken=true"
- name: FELIX_HEALTHENABLED
value: "true"
securityContext:
Expand Down Expand Up @@ -3911,7 +3910,7 @@ spec:
priorityClassName: system-cluster-critical
containers:
- name: calico-kube-controllers
image: calico/kube-controllers:v3.19.1
image: calico/kube-controllers:v3.19.2
env:
# Choose which controllers to run.
- name: ENABLED_CONTROLLERS
Expand Down
20 changes: 20 additions & 0 deletions templates/cluster-template-private.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ metadata:
spec:
bastionSpec:
azureBastion: {}
identityRef:
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha4
kind: AzureClusterIdentity
name: ${CLUSTER_IDENTITY_NAME}
location: ${AZURE_LOCATION}
networkSpec:
apiServerLB:
Expand Down Expand Up @@ -209,3 +213,19 @@ spec:
cloud-config: /etc/kubernetes/azure.json
cloud-provider: azure
name: '{{ ds.meta_data["local_hostname"] }}'
---
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha4
kind: AzureClusterIdentity
metadata:
labels:
clusterctl.cluster.x-k8s.io/move-hierarchy: "true"
name: ${CLUSTER_IDENTITY_NAME}
namespace: default
spec:
allowedNamespaces: {}
clientID: ${AZURE_CLIENT_ID}
clientSecret:
name: ${AZURE_CLUSTER_IDENTITY_SECRET_NAME}
namespace: ${AZURE_CLUSTER_IDENTITY_SECRET_NAMESPACE}
tenantID: ${AZURE_TENANT_ID}
type: ServicePrincipal
3 changes: 3 additions & 0 deletions templates/flavors/private/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@ namespace: default
resources:
- ../base
- ../default/machine-deployment.yaml
- ../../azure-cluster-identity

patchesStrategicMerge:
- ../../azure-cluster-identity/azurecluster-identity-ref.yaml
- patches/private-lb.yaml
- patches/apiserver-host-dns.yaml
- patches/azure-bastion.yaml
Expand Down
Loading