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

Provide dual-stack support to canal #209

Merged
merged 1 commit into from
Jan 14, 2022
Merged

Provide dual-stack support to canal #209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 14 additions & 1 deletion packages/rke2-canal/charts/templates/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,20 @@ data:
"mtu": __CNI_MTU__,
"ipam": {
"type": "host-local",
"subnet": "usePodCidr"
"ranges": [
[
{
"subnet": "usePodCidr"
}
{{- if coalesce .Values.global.clusterCIDRv6 .Values.podCidrv6 }}
],
[
{
"subnet": "usePodCidrIPv6"
}
{{- end }}
]
]
},
"policy": {
"type": "k8s"
Expand Down
6 changes: 3 additions & 3 deletions packages/rke2-canal/charts/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@ calico:
# CNI installation image.
cniImage:
repository: rancher/hardened-calico
tag: v3.20.2-build20211119
tag: v3.20.3-build20220114
# Canal node image.
nodeImage:
repository: rancher/hardened-calico
tag: v3.20.2-build20211119
tag: v3.20.3-build20220114
# Flexvol Image.
flexvolImage:
repository: rancher/hardened-calico
tag: v3.20.2-build20211119
tag: v3.20.3-build20220114
# Datastore type for canal. It can be either kuberentes or etcd.
datastoreType: kubernetes
# Wait for datastore to initialize.
Expand Down
4 changes: 1 addition & 3 deletions packages/rke2-canal/package.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
url: local
packageVersion: 04
# This repository does not use releaseCandidateVersions, so you can leave this as 00.
releaseCandidateVersion: 00
packageVersion: 05