From 3967adde6e8164deac73b5b4a0658a97af31d0d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Charles-Edouard=20Br=C3=A9t=C3=A9ch=C3=A9?=
 <charles.edouard@nirmata.com>
Date: Mon, 11 Sep 2023 18:57:18 +0200
Subject: [PATCH] fix: allow any type in cli test global values (#8305)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Charles-Edouard Brétéché <charles.edouard@nirmata.com>
---
 cmd/cli/kubectl-kyverno/apis/values/values.go        |  8 ++++----
 .../commands/create/values/command.go                |  2 +-
 cmd/cli/kubectl-kyverno/variables/new_test.go        | 12 ++++++------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/cmd/cli/kubectl-kyverno/apis/values/values.go b/cmd/cli/kubectl-kyverno/apis/values/values.go
index 438ba8601b..3bbc803231 100644
--- a/cmd/cli/kubectl-kyverno/apis/values/values.go
+++ b/cmd/cli/kubectl-kyverno/apis/values/values.go
@@ -1,8 +1,8 @@
 package values
 
 type Values struct {
-	Policies           []Policy            `json:"policies"`
-	GlobalValues       map[string]string   `json:"globalValues"`
-	NamespaceSelectors []NamespaceSelector `json:"namespaceSelector"`
-	Subresources       []Subresource       `json:"subresources"`
+	Policies           []Policy               `json:"policies"`
+	GlobalValues       map[string]interface{} `json:"globalValues"`
+	NamespaceSelectors []NamespaceSelector    `json:"namespaceSelector"`
+	Subresources       []Subresource          `json:"subresources"`
 }
diff --git a/cmd/cli/kubectl-kyverno/commands/create/values/command.go b/cmd/cli/kubectl-kyverno/commands/create/values/command.go
index 5e3c98af27..8dcf02d2bf 100644
--- a/cmd/cli/kubectl-kyverno/commands/create/values/command.go
+++ b/cmd/cli/kubectl-kyverno/commands/create/values/command.go
@@ -34,7 +34,7 @@ func Command() *cobra.Command {
 				output = file
 			}
 			values := valuesapi.Values{
-				GlobalValues: map[string]string{},
+				GlobalValues: map[string]interface{}{},
 			}
 			for _, result := range namespaceSelector {
 				result := parseNamespaceSelector(result)
diff --git a/cmd/cli/kubectl-kyverno/variables/new_test.go b/cmd/cli/kubectl-kyverno/variables/new_test.go
index 90d91e2a1b..1b64623b95 100644
--- a/cmd/cli/kubectl-kyverno/variables/new_test.go
+++ b/cmd/cli/kubectl-kyverno/variables/new_test.go
@@ -48,14 +48,14 @@ func TestNew(t *testing.T) {
 		resourcePath: "",
 		path:         "",
 		vals: &valuesapi.Values{
-			GlobalValues: map[string]string{
+			GlobalValues: map[string]interface{}{
 				"bar": "baz",
 			},
 		},
 		vars: nil,
 		want: &Variables{
 			values: &valuesapi.Values{
-				GlobalValues: map[string]string{
+				GlobalValues: map[string]interface{}{
 					"bar": "baz",
 				},
 			},
@@ -67,7 +67,7 @@ func TestNew(t *testing.T) {
 		resourcePath: "",
 		path:         "",
 		vals: &valuesapi.Values{
-			GlobalValues: map[string]string{
+			GlobalValues: map[string]interface{}{
 				"bar": "baz",
 			},
 		},
@@ -76,7 +76,7 @@ func TestNew(t *testing.T) {
 		},
 		want: &Variables{
 			values: &valuesapi.Values{
-				GlobalValues: map[string]string{
+				GlobalValues: map[string]interface{}{
 					"bar": "baz",
 				},
 			},
@@ -169,14 +169,14 @@ func TestNew(t *testing.T) {
 		resourcePath: "",
 		path:         "../_testdata/values/limit-configmap-for-sa.yaml",
 		vals: &valuesapi.Values{
-			GlobalValues: map[string]string{
+			GlobalValues: map[string]interface{}{
 				"bar": "baz",
 			},
 		},
 		vars: nil,
 		want: &Variables{
 			values: &valuesapi.Values{
-				GlobalValues: map[string]string{
+				GlobalValues: map[string]interface{}{
 					"bar": "baz",
 				},
 			},