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 manifests to v3.22.0 #2128

Merged
merged 2 commits into from
Mar 1, 2022
Merged

Update Calico manifests to v3.22.0 #2128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
032fd9d
Update Calico to v3.22.0
Feb 25, 2022
6f93bbd
Add patch for ipv6 calico config
Feb 28, 2022
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
381 changes: 357 additions & 24 deletions templates/addons/calico-ipv6.yaml
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion templates/addons/calico-ipv6/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- https://docs.projectcalico.org/v3.20/manifests/calico-policy-only.yaml
- https://docs.projectcalico.org/v3.22/manifests/calico-policy-only.yaml
patchesStrategicMerge:
- patches/azure-mtu.yaml
- patches/calico-config.yaml
patches:
- target:
group: apps
Expand Down
40 changes: 40 additions & 0 deletions templates/addons/calico-ipv6/patches/calico-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
kind: ConfigMap
apiVersion: v1
metadata:
name: calico-config
namespace: kube-system
data:
cni_network_config: |-
{
"name": "k8s-pod-network",
"cniVersion": "0.3.1",
"plugins": [
{
"type": "calico",
"log_level": "info",
"log_file_path": "/var/log/calico/cni/cni.log",
"datastore_type": "kubernetes",
"nodename": "__KUBERNETES_NODE_NAME__",
"mtu": 1500,
"ipam": {
"type": "host-local",
"subnet": "usePodCidrIPv6"
},
"policy": {
"type": "k8s"
},
"kubernetes": {
"kubeconfig": "__KUBECONFIG_FILEPATH__"
}
},
{
"type": "portmap",
"snat": true,
"capabilities": {"portMappings": true}
},
{
"type": "bandwidth",
"capabilities": {"bandwidth": true}
}
]
}
377 changes: 354 additions & 23 deletions templates/addons/calico.yaml
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 1 addition & 7 deletions templates/addons/calico/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,13 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- https://docs.projectcalico.org/v3.20/manifests/calico-vxlan.yaml
- https://docs.projectcalico.org/v3.22/manifests/calico-vxlan.yaml
patchesStrategicMerge:
- patches/azure-mtu.yaml
patches:
- path: patches/calico-node.yaml
target:
kind: DaemonSet
- target:
version: v1
kind: DaemonSet
name: calico-node
namespace: kube-system
path: patches/remove-aws-reference.yaml
- path: patches/control-plane-tolerations.yaml
target:
kind: Deployment
Expand Down
5 changes: 0 additions & 5 deletions templates/addons/calico/patches/remove-aws-reference.yaml
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions templates/addons/windows/calico/calico.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ spec:
# This container installs the CNI binaries
# and CNI network config file on each node.
- name: install-cni
image: sigwindowstools/calico-install:v3.20.4-hostprocess
image: sigwindowstools/calico-install:v3.22.0-hostprocess
args: ["$env:CONTAINER_SANDBOX_MOUNT_POINT/calico/install.ps1"]
imagePullPolicy: Always
env:
Expand Down Expand Up @@ -205,7 +205,7 @@ spec:
runAsUserName: "NT AUTHORITY\\system"
containers:
- name: calico-node-startup
image: sigwindowstools/calico-node:v3.20.4-hostprocess
image: sigwindowstools/calico-node:v3.22.0-hostprocess
args: ["$env:CONTAINER_SANDBOX_MOUNT_POINT/calico/node-service.ps1"]
workingDir: "$env:CONTAINER_SANDBOX_MOUNT_POINT/calico/"
imagePullPolicy: Always
Expand All @@ -232,7 +232,7 @@ spec:
- name: VXLAN_VNI
value: "4096"
- name: calico-node-felix
image: sigwindowstools/calico-node:v3.20.4-hostprocess
image: sigwindowstools/calico-node:v3.22.0-hostprocess
args: ["$env:CONTAINER_SANDBOX_MOUNT_POINT/calico/felix-service.ps1"]
imagePullPolicy: Always
workingDir: "$env:CONTAINER_SANDBOX_MOUNT_POINT/calico/"
Expand Down
Loading