From 7be68551321e8b56aa94d4634d3e77881336d1e3 Mon Sep 17 00:00:00 2001
From: Michal Rostecki <mrostecki@opensuse.org>
Date: Fri, 10 Sep 2021 18:56:04 +0200
Subject: [PATCH] cilium: Fix the eni value

The upstream Cilium chart changed the type of `eni` value to a nested
object. Adjust our rke2-cilium chart to that change.

Ref: rancher/rke2#1615

Signed-off-by: Michal Rostecki <mrostecki@opensuse.org>
---
 packages/rke2-cilium/charts/values.schema.json | 7 ++++++-
 packages/rke2-cilium/charts/values.yaml        | 4 +++-
 packages/rke2-cilium/package.yaml              | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/packages/rke2-cilium/charts/values.schema.json b/packages/rke2-cilium/charts/values.schema.json
index 928d273..7cdf91c 100644
--- a/packages/rke2-cilium/charts/values.schema.json
+++ b/packages/rke2-cilium/charts/values.schema.json
@@ -25,7 +25,12 @@
                     }
                 },
                 "eni": {
-                    "type": "boolean"
+                    "type": "object",
+                    "properties": {
+                        "enabled": {
+                            "type": "boolean"
+                        }
+                    }
                 },
                 "image": {
                     "type": "object",
diff --git a/packages/rke2-cilium/charts/values.yaml b/packages/rke2-cilium/charts/values.yaml
index 0316f68..d0080fe 100644
--- a/packages/rke2-cilium/charts/values.yaml
+++ b/packages/rke2-cilium/charts/values.yaml
@@ -40,7 +40,9 @@ cilium:
   #
   # Enable Elastic Network Interface (ENI) for AWS integration.
   #
-  eni: false
+  eni:
+    enabled: false
+
   ipam:
     # Set mode to "eni" for ENI AWS intetgration.
     mode: "kubernetes"
diff --git a/packages/rke2-cilium/package.yaml b/packages/rke2-cilium/package.yaml
index 0774348..5605d61 100644
--- a/packages/rke2-cilium/package.yaml
+++ b/packages/rke2-cilium/package.yaml
@@ -1,3 +1,3 @@
 url: local
-packageVersion: 01
+packageVersion: 02
 releaseCandidateVersion: 00