From 9ac27413d46fa29fe12d5b25d793164d1f4ac1b8 Mon Sep 17 00:00:00 2001
From: Manuel Buil <mbuil@suse.com>
Date: Fri, 14 Jan 2022 13:16:05 +0100
Subject: [PATCH] Provide dual-stack support to canal

Signed-off-by: Manuel Buil <mbuil@suse.com>
---
 packages/rke2-canal/charts/templates/config.yaml | 15 ++++++++++++++-
 packages/rke2-canal/charts/values.yaml           |  6 +++---
 packages/rke2-canal/package.yaml                 |  4 +---
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/packages/rke2-canal/charts/templates/config.yaml b/packages/rke2-canal/charts/templates/config.yaml
index 1a005ca46..02e0ac78e 100644
--- a/packages/rke2-canal/charts/templates/config.yaml
+++ b/packages/rke2-canal/charts/templates/config.yaml
@@ -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"
diff --git a/packages/rke2-canal/charts/values.yaml b/packages/rke2-canal/charts/values.yaml
index 1be44bf1d..21567093e 100644
--- a/packages/rke2-canal/charts/values.yaml
+++ b/packages/rke2-canal/charts/values.yaml
@@ -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.
diff --git a/packages/rke2-canal/package.yaml b/packages/rke2-canal/package.yaml
index a1524f3fb..ae382fdea 100644
--- a/packages/rke2-canal/package.yaml
+++ b/packages/rke2-canal/package.yaml
@@ -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