From 9da88af27099c5f0477fe01411b841e3135ebc85 Mon Sep 17 00:00:00 2001 From: Leo Li Date: Tue, 5 Mar 2024 16:04:39 -0500 Subject: [PATCH 1/3] Fix the naming convention in the config-features.yaml, to prevent error in yq when yaml parsing happens Signed-off-by: Leo Li --- pkg/apis/feature/flag_names.go | 2 +- pkg/apis/feature/testdata/config-features.yaml | 6 +++--- pkg/reconciler/apiserversource/apiserversource_test.go | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/apis/feature/flag_names.go b/pkg/apis/feature/flag_names.go index 454cadc6f48..db4c34488e8 100644 --- a/pkg/apis/feature/flag_names.go +++ b/pkg/apis/feature/flag_names.go @@ -25,5 +25,5 @@ const ( TransportEncryption = "transport-encryption" EvenTypeAutoCreate = "eventtype-auto-create" OIDCAuthentication = "authentication-oidc" - NodeSelectorLabel = "apiserversources.nodeselector." + NodeSelectorLabel = "apiserversources-nodeselector-" ) diff --git a/pkg/apis/feature/testdata/config-features.yaml b/pkg/apis/feature/testdata/config-features.yaml index 31a747cf484..4e5684c5562 100644 --- a/pkg/apis/feature/testdata/config-features.yaml +++ b/pkg/apis/feature/testdata/config-features.yaml @@ -25,6 +25,6 @@ data: my-enabled-flag: "enabled" my-disabled-flag: "disabled" my-allowed-flag: "allowed" - apiserversources.nodeselector.testkey: testvalue - apiserversources.nodeselector.testkey1: testvalue1 - apiserversources.nodeselector.testkey2: testvalue2 + apiserversources-nodeselector-testkey: testvalue + apiserversources.nodeselector-testkey1: testvalue1 + apiserversources.nodeselector-testkey2: testvalue2 diff --git a/pkg/reconciler/apiserversource/apiserversource_test.go b/pkg/reconciler/apiserversource/apiserversource_test.go index 4743af0d253..2e15aefd591 100644 --- a/pkg/reconciler/apiserversource/apiserversource_test.go +++ b/pkg/reconciler/apiserversource/apiserversource_test.go @@ -1089,8 +1089,8 @@ func TestReconcile(t *testing.T) { Name: "Valid with nodeSelector", Ctx: feature.ToContext(context.Background(), feature.Flags{ - "apiserversources.nodeselector.testkey1": "testvalue1", - "apiserversources.nodeselector.testkey2": "testvalue2", + "apiserversources-nodeselector-testkey1": "testvalue1", + "apiserversources-nodeselector-testkey2": "testvalue2", }), Objects: []runtime.Object{ rttestingv1.NewApiServerSource(sourceName, testNS, From 7b9baf945c8901236b480712f3c8894a6fe86ee6 Mon Sep 17 00:00:00 2001 From: Leo Li Date: Tue, 5 Mar 2024 16:07:10 -0500 Subject: [PATCH 2/3] Fix the naming convention in the config-features.yaml, to prevent error in yq when yaml parsing happens Signed-off-by: Leo Li --- test/rekt/resources/configmap/config-features.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/rekt/resources/configmap/config-features.yaml b/test/rekt/resources/configmap/config-features.yaml index 017d7574d5e..6dd98e50f9d 100644 --- a/test/rekt/resources/configmap/config-features.yaml +++ b/test/rekt/resources/configmap/config-features.yaml @@ -11,7 +11,7 @@ data: my-enabled-flag: "enabled" my-disabled-flag: "disabled" my-allowed-flag: "allowed" - apiserversources.nodeselector.testkey: testvalue - apiserversources.nodeselector.testkey1: testvalue1 - apiserversources.nodeselector.testkey2: testvalue2 + apiserversources-nodeselector-testkey: testvalue + apiserversources-nodeselector-testkey1: testvalue1 + apiserversources-nodeselector-testkey2: testvalue2 From 87a2ea9ac8b58f2f0a8d20440a7c1a0ecec5966e Mon Sep 17 00:00:00 2001 From: Leo Li Date: Wed, 6 Mar 2024 10:56:12 -0500 Subject: [PATCH 3/3] fix the failing unit tests Signed-off-by: Leo Li --- pkg/apis/feature/testdata/config-features.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/apis/feature/testdata/config-features.yaml b/pkg/apis/feature/testdata/config-features.yaml index 4e5684c5562..108b17851eb 100644 --- a/pkg/apis/feature/testdata/config-features.yaml +++ b/pkg/apis/feature/testdata/config-features.yaml @@ -26,5 +26,5 @@ data: my-disabled-flag: "disabled" my-allowed-flag: "allowed" apiserversources-nodeselector-testkey: testvalue - apiserversources.nodeselector-testkey1: testvalue1 - apiserversources.nodeselector-testkey2: testvalue2 + apiserversources-nodeselector-testkey1: testvalue1 + apiserversources-nodeselector-testkey2: testvalue2