From 63c6ad90058a44f07f84a0f618b5a1dbe96560b4 Mon Sep 17 00:00:00 2001
From: Matt Nikkel <matt.nikkel@rancherfederal.com>
Date: Thu, 7 Oct 2021 16:28:09 -0500
Subject: [PATCH] Allow enabling Calico WireGuard encryption

Provide Helm values and templates to allow easy Helm-based configuration
of Calico WireGuard encryption.

Signed-off-by: Matt Nikkel <matt.nikkel@rancherfederal.com>
---
 .../generated-changes/overlay/templates/felixconfig.yaml     | 1 +
 .../rke2-calico/generated-changes/patch/values.yaml.patch    | 5 +++--
 packages/rke2-calico/package.yaml                            | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/rke2-calico/generated-changes/overlay/templates/felixconfig.yaml b/packages/rke2-calico/generated-changes/overlay/templates/felixconfig.yaml
index 9d030ba..4194c97 100644
--- a/packages/rke2-calico/generated-changes/overlay/templates/felixconfig.yaml
+++ b/packages/rke2-calico/generated-changes/overlay/templates/felixconfig.yaml
@@ -3,4 +3,5 @@ kind: FelixConfiguration
 metadata:
   name: default
 spec:
+  wireguardEnabled: {{ .Values.felixConfiguration.wireguardEnabled }}
   featureDetectOverride: {{ .Values.felixConfiguration.featureDetectOverride }}
diff --git a/packages/rke2-calico/generated-changes/patch/values.yaml.patch b/packages/rke2-calico/generated-changes/patch/values.yaml.patch
index e83ea69..74ce96b 100644
--- a/packages/rke2-calico/generated-changes/patch/values.yaml.patch
+++ b/packages/rke2-calico/generated-changes/patch/values.yaml.patch
@@ -25,7 +25,7 @@
  
  apiServer:
    enabled: true
-@@ -20,9 +36,23 @@
+@@ -20,9 +36,24 @@
  
  # Configuration for the tigera operator
  tigeraOperator:
@@ -49,6 +49,7 @@
 +  strictAffinity: true
 +  autoAllocateBlocks: true
 +
-+# Config required to fix RKE2 issue #1541
 +felixConfiguration:
++  wireguardEnabled: false
++  # Config required to fix RKE2 issue #1541
 +  featureDetectOverride: "ChecksumOffloadBroken=true"
diff --git a/packages/rke2-calico/package.yaml b/packages/rke2-calico/package.yaml
index 9f94fcb..58c48a4 100644
--- a/packages/rke2-calico/package.yaml
+++ b/packages/rke2-calico/package.yaml
@@ -1,5 +1,5 @@
 url: https://github.com/projectcalico/calico/releases/download/v3.20.1/tigera-operator-v3.20.1.tgz
-packageVersion: 01
+packageVersion: 02
 additionalCharts:
   - workingDir: charts-crd
     crdOptions: