fix the label cannot be number (#531)

Signed-off-by: Zhiwei Yin <zyin@redhat.com>
open-cluster-management-io · Jun 19, 2024 · 12baec9 · 12baec9
1 parent 74f4c92
commit 12baec9
Show file tree

Hide file tree

Showing 28 changed files with 31 additions and 31 deletions.
diff --git a/manifests/klusterlet/managed/klusterlet-registration-clusterrole-addon-management.yaml b/manifests/klusterlet/managed/klusterlet-registration-clusterrole-addon-management.yaml
@@ -10,7 +10,7 @@ metadata:
   labels:
     {{ if gt (len .Labels) 0 }}
     {{ range $key, $value := .Labels }}
-    {{ $key }}: {{ $value }}
+    "{{ $key }}": "{{ $value }}"
     {{ end }}
     {{ end }}
 rules:

diff --git a/manifests/klusterlet/managed/klusterlet-registration-clusterrole.yaml b/manifests/klusterlet/managed/klusterlet-registration-clusterrole.yaml
@@ -7,7 +7,7 @@ metadata:
   labels:
     {{ if gt (len .Labels) 0 }}
     {{ range $key, $value := .Labels }}
-    {{ $key }}: {{ $value }}
+    "{{ $key }}": "{{ $value }}"
     {{ end }}
     {{ end }}
 rules:

diff --git a/...fests/klusterlet/managed/klusterlet-registration-clusterrolebinding-addon-management.yaml b/...fests/klusterlet/managed/klusterlet-registration-clusterrolebinding-addon-management.yaml
@@ -10,7 +10,7 @@ metadata:
   labels:
     {{ if gt (len .Labels) 0 }}
     {{ range $key, $value := .Labels }}
-    {{ $key }}: {{ $value }}
+    "{{ $key }}": "{{ $value }}"
     {{ end }}
     {{ end }}
 roleRef:

diff --git a/manifests/klusterlet/managed/klusterlet-registration-clusterrolebinding.yaml b/manifests/klusterlet/managed/klusterlet-registration-clusterrolebinding.yaml
@@ -6,7 +6,7 @@ metadata:
   labels:
     {{ if gt (len .Labels) 0 }}
     {{ range $key, $value := .Labels }}
-    {{ $key }}: {{ $value }}
+    "{{ $key }}": "{{ $value }}"
     {{ end }}
     {{ end }}
 roleRef:

diff --git a/manifests/klusterlet/managed/klusterlet-registration-serviceaccount.yaml b/manifests/klusterlet/managed/klusterlet-registration-serviceaccount.yaml
@@ -6,7 +6,7 @@ metadata:
   labels:
     {{ if gt (len .Labels) 0 }}
     {{ range $key, $value := .Labels }}
-    {{ $key }}: {{ $value }}
+    "{{ $key }}": "{{ $value }}"
     {{ end }}
     {{ end }}
 imagePullSecrets:

diff --git a/manifests/klusterlet/managed/klusterlet-work-clusterrole-execution.yaml b/manifests/klusterlet/managed/klusterlet-work-clusterrole-execution.yaml
@@ -8,7 +8,7 @@ metadata:
     open-cluster-management.io/aggregate-to-work: "true"
     {{ if gt (len .Labels) 0 }}
     {{ range $key, $value := .Labels }}
-    {{ $key }}: {{ $value }}
+    "{{ $key }}": "{{ $value }}"
     {{ end }}
     {{ end }}
 rules:

diff --git a/manifests/klusterlet/managed/klusterlet-work-clusterrole.yaml b/manifests/klusterlet/managed/klusterlet-work-clusterrole.yaml
@@ -7,7 +7,7 @@ metadata:
   labels:
     {{ if gt (len .Labels) 0 }}
     {{ range $key, $value := .Labels }}
-    {{ $key }}: {{ $value }}
+    "{{ $key }}": "{{ $value }}"
     {{ end }}
     {{ end }}
 rules:

diff --git a/manifests/klusterlet/managed/klusterlet-work-clusterrolebinding-aggregate.yaml b/manifests/klusterlet/managed/klusterlet-work-clusterrolebinding-aggregate.yaml
@@ -7,7 +7,7 @@ metadata:
   labels:
     {{ if gt (len .Labels) 0 }}
     {{ range $key, $value := .Labels }}
-    {{ $key }}: {{ $value }}
+    "{{ $key }}": "{{ $value }}"
     {{ end }}
     {{ end }}
 roleRef:

diff --git a/manifests/klusterlet/managed/klusterlet-work-clusterrolebinding-execution-admin.yaml b/manifests/klusterlet/managed/klusterlet-work-clusterrolebinding-execution-admin.yaml
@@ -7,7 +7,7 @@ metadata:
   labels:
     {{ if gt (len .Labels) 0 }}
     {{ range $key, $value := .Labels }}
-    {{ $key }}: {{ $value }}
+    "{{ $key }}": "{{ $value }}"
     {{ end }}
     {{ end }}
 roleRef:

diff --git a/manifests/klusterlet/managed/klusterlet-work-clusterrolebinding-execution.yaml b/manifests/klusterlet/managed/klusterlet-work-clusterrolebinding-execution.yaml
@@ -6,7 +6,7 @@ metadata:
   labels:
     {{ if gt (len .Labels) 0 }}
     {{ range $key, $value := .Labels }}
-    {{ $key }}: {{ $value }}
+    "{{ $key }}": "{{ $value }}"
     {{ end }}
     {{ end }}
 roleRef:

diff --git a/manifests/klusterlet/managed/klusterlet-work-clusterrolebinding.yaml b/manifests/klusterlet/managed/klusterlet-work-clusterrolebinding.yaml
@@ -6,7 +6,7 @@ metadata:
   labels:
     {{ if gt (len .Labels) 0 }}
     {{ range $key, $value := .Labels }}
-    {{ $key }}: {{ $value }}
+    "{{ $key }}": "{{ $value }}"
     {{ end }}
     {{ end }}
 roleRef:

diff --git a/manifests/klusterlet/managed/klusterlet-work-serviceaccount.yaml b/manifests/klusterlet/managed/klusterlet-work-serviceaccount.yaml
@@ -6,7 +6,7 @@ metadata:
   labels:
     {{ if gt (len .Labels) 0 }}
     {{ range $key, $value := .Labels }}
-    {{ $key }}: {{ $value }}
+    "{{ $key }}": "{{ $value }}"
     {{ end }}
     {{ end }}
 imagePullSecrets:

diff --git a/manifests/klusterlet/management/klusterlet-agent-deployment.yaml b/manifests/klusterlet/management/klusterlet-agent-deployment.yaml
@@ -7,7 +7,7 @@ metadata:
     app: klusterlet-agent
     {{ if gt (len .Labels) 0 }}
     {{ range $key, $value := .Labels }}
-    {{ $key }}: {{ $value }}
+    "{{ $key }}": "{{ $value }}"
     {{ end }}
     {{ end }}
 spec:
@@ -23,7 +23,7 @@ spec:
         app: klusterlet-agent
         {{ if gt (len .Labels) 0 }}
         {{ range $key, $value := .Labels }}
-        {{ $key }}: {{ $value }}
+        "{{ $key }}": "{{ $value }}"
         {{ end }}
         {{ end }}
     spec:

diff --git a/manifests/klusterlet/management/klusterlet-registration-clusterrole-addon-management.yaml b/manifests/klusterlet/management/klusterlet-registration-clusterrole-addon-management.yaml
@@ -7,7 +7,7 @@ metadata:
   labels:
     {{ if gt (len .Labels) 0 }}
     {{ range $key, $value := .Labels }}
-    {{ $key }}: {{ $value }}
+    "{{ $key }}": "{{ $value }}"
     {{ end }}
     {{ end }}
 rules:

diff --git a/...ts/klusterlet/management/klusterlet-registration-clusterrolebinding-addon-management.yaml b/...ts/klusterlet/management/klusterlet-registration-clusterrolebinding-addon-management.yaml
@@ -8,7 +8,7 @@ metadata:
   labels:
     {{ if gt (len .Labels) 0 }}
     {{ range $key, $value := .Labels }}
-    {{ $key }}: {{ $value }}
+    "{{ $key }}": "{{ $value }}"
     {{ end }}
     {{ end }}
 roleRef:

diff --git a/manifests/klusterlet/management/klusterlet-registration-deployment.yaml b/manifests/klusterlet/management/klusterlet-registration-deployment.yaml
@@ -7,7 +7,7 @@ metadata:
     app: klusterlet-registration-agent
     {{ if gt (len .Labels) 0 }}
     {{ range $key, $value := .Labels }}
-    {{ $key }}: {{ $value }}
+    "{{ $key }}": "{{ $value }}"
     {{ end }}
     {{ end }}
 spec:
@@ -23,7 +23,7 @@ spec:
         app: klusterlet-registration-agent
         {{ if gt (len .Labels) 0 }}
         {{ range $key, $value := .Labels }}
-        {{ $key }}: {{ $value }}
+        "{{ $key }}": "{{ $value }}"
         {{ end }}
         {{ end }}
     spec:

diff --git a/manifests/klusterlet/management/klusterlet-registration-role.yaml b/manifests/klusterlet/management/klusterlet-registration-role.yaml
@@ -8,7 +8,7 @@ metadata:
   labels:
     {{ if gt (len .Labels) 0 }}
     {{ range $key, $value := .Labels }}
-    {{ $key }}: {{ $value }}
+    "{{ $key }}": "{{ $value }}"
     {{ end }}
     {{ end }}
 rules:

diff --git a/manifests/klusterlet/management/klusterlet-registration-rolebinding-extension-apiserver.yaml b/manifests/klusterlet/management/klusterlet-registration-rolebinding-extension-apiserver.yaml
@@ -6,7 +6,7 @@ metadata:
   labels:
     {{ if gt (len .Labels) 0 }}
     {{ range $key, $value := .Labels }}
-    {{ $key }}: {{ $value }}
+    "{{ $key }}": "{{ $value }}"
     {{ end }}
     {{ end }}
 roleRef:

diff --git a/manifests/klusterlet/management/klusterlet-registration-rolebinding.yaml b/manifests/klusterlet/management/klusterlet-registration-rolebinding.yaml
@@ -7,7 +7,7 @@ metadata:
   labels:
     {{ if gt (len .Labels) 0 }}
     {{ range $key, $value := .Labels }}
-    {{ $key }}: {{ $value }}
+    "{{ $key }}": "{{ $value }}"
     {{ end }}
     {{ end }}
 roleRef:

diff --git a/manifests/klusterlet/management/klusterlet-registration-serviceaccount.yaml b/manifests/klusterlet/management/klusterlet-registration-serviceaccount.yaml
@@ -6,7 +6,7 @@ metadata:
   labels:
     {{ if gt (len .Labels) 0 }}
     {{ range $key, $value := .Labels }}
-    {{ $key }}: {{ $value }}
+    "{{ $key }}": "{{ $value }}"
     {{ end }}
     {{ end }}
 imagePullSecrets:

diff --git a/manifests/klusterlet/management/klusterlet-role-extension-apiserver.yaml b/manifests/klusterlet/management/klusterlet-role-extension-apiserver.yaml
@@ -10,7 +10,7 @@ metadata:
   labels:
     {{ if gt (len .Labels) 0 }}
     {{ range $key, $value := .Labels }}
-    {{ $key }}: {{ $value }}
+    "{{ $key }}": "{{ $value }}"
     {{ end }}
     {{ end }}
 rules:

diff --git a/manifests/klusterlet/management/klusterlet-work-deployment.yaml b/manifests/klusterlet/management/klusterlet-work-deployment.yaml
@@ -7,7 +7,7 @@ metadata:
     app: klusterlet-manifestwork-agent
     {{ if gt (len .Labels) 0 }}
     {{ range $key, $value := .Labels }}
-    {{ $key }}: {{ $value }}
+    "{{ $key }}": "{{ $value }}"
     {{ end }}
     {{ end }}
 spec:
@@ -23,7 +23,7 @@ spec:
         app: klusterlet-manifestwork-agent
         {{ if gt (len .Labels) 0 }}
         {{ range $key, $value := .Labels }}
-        {{ $key }}: {{ $value }}
+        "{{ $key }}": "{{ $value }}"
         {{ end }}
         {{ end }}
     spec:

diff --git a/manifests/klusterlet/management/klusterlet-work-role.yaml b/manifests/klusterlet/management/klusterlet-work-role.yaml
@@ -8,7 +8,7 @@ metadata:
   labels:
     {{ if gt (len .Labels) 0 }}
     {{ range $key, $value := .Labels }}
-    {{ $key }}: {{ $value }}
+    "{{ $key }}": "{{ $value }}"
     {{ end }}
     {{ end }}
 rules:

diff --git a/manifests/klusterlet/management/klusterlet-work-rolebinding-extension-apiserver.yaml b/manifests/klusterlet/management/klusterlet-work-rolebinding-extension-apiserver.yaml
@@ -6,7 +6,7 @@ metadata:
   labels:
     {{ if gt (len .Labels) 0 }}
     {{ range $key, $value := .Labels }}
-    {{ $key }}: {{ $value }}
+    "{{ $key }}": "{{ $value }}"
     {{ end }}
     {{ end }}
 roleRef:

diff --git a/manifests/klusterlet/management/klusterlet-work-rolebinding.yaml b/manifests/klusterlet/management/klusterlet-work-rolebinding.yaml
@@ -7,7 +7,7 @@ metadata:
   labels:
     {{ if gt (len .Labels) 0 }}
     {{ range $key, $value := .Labels }}
-    {{ $key }}: {{ $value }}
+    "{{ $key }}": "{{ $value }}"
     {{ end }}
     {{ end }}
 roleRef:

diff --git a/manifests/klusterlet/management/klusterlet-work-serviceaccount.yaml b/manifests/klusterlet/management/klusterlet-work-serviceaccount.yaml
@@ -6,7 +6,7 @@ metadata:
   labels:
     {{ if gt (len .Labels) 0 }}
     {{ range $key, $value := .Labels }}
-    {{ $key }}: {{ $value }}
+    "{{ $key }}": "{{ $value }}"
     {{ end }}
     {{ end }}
 imagePullSecrets:

diff --git a/...rator/operators/klusterlet/controllers/klusterletcontroller/klusterlet_controller_test.go b/...rator/operators/klusterlet/controllers/klusterletcontroller/klusterlet_controller_test.go
@@ -600,7 +600,7 @@ func TestSyncDeploySingleton(t *testing.T) {
 
 	for _, c := range cases {
 		klusterlet := newKlusterlet("klusterlet", "testns", "cluster1")
-		klusterlet.SetLabels(map[string]string{"test": "test", "abc": "abc"})
+		klusterlet.SetLabels(map[string]string{"test": "123", "abc": "abc", "123": "213"})
 		klusterlet.Spec.DeployOption.Mode = operatorapiv1.InstallModeSingleton
 		bootStrapSecret := newSecret(helpers.BootstrapHubKubeConfig, "testns")
 		hubKubeConfigSecret := newSecret(helpers.HubKubeConfig, "testns")

diff --git a/test/integration/operator/klusterlet_test.go b/test/integration/operator/klusterlet_test.go
@@ -65,7 +65,7 @@ var _ = ginkgo.Describe("Klusterlet", func() {
 		klusterlet = &operatorapiv1.Klusterlet{
 			ObjectMeta: metav1.ObjectMeta{
 				Name:   fmt.Sprintf("klusterlet-%s", rand.String(6)),
-				Labels: map[string]string{"test": "test", "component": "klusterlet"},
+				Labels: map[string]string{"test": "123", "component": "klusterlet", "123": "312"},
 			},
 			Spec: operatorapiv1.KlusterletSpec{
 				RegistrationImagePullSpec: "quay.io/open-cluster-management/registration",