Fix label pattern to prefix/label-key: label-value

project-codeflare · Nov 10, 2023 · a24f2f9 · a24f2f9
1 parent 9c3918e
commit a24f2f9
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 13 deletions.
diff --git a/pkg/controller/queuejobresources/genericresource/genericresource.go b/pkg/controller/queuejobresources/genericresource/genericresource.go
@@ -44,7 +44,7 @@ import (
 )
 
 var appwrapperJobLabelName = "workload.codeflare.dev/appwrapper"
-var appwrapperJobLabelNamespace = "workload.codeflare.dev/appwrapper/namespace"
+var appwrapperJobLabelNamespace = "workload.codeflare.dev/appwrapper-namespace"
 var resourceName = "workload.codeflare.dev/resourceName"
 var appWrapperKind = arbv1.SchemeGroupVersion.WithKind("AppWrapper")
 

diff --git a/test/e2e-kuttl-deployment-01/steps/01-assert.yaml b/test/e2e-kuttl-deployment-01/steps/01-assert.yaml
@@ -15,7 +15,7 @@ metadata:
   labels:
       app:  no-quota-deployment-01
       workload.codeflare.dev/appwrapper: no-quota-deployment-01
-      workload.codeflare.dev/appwrapper/namespace: start-up
+      workload.codeflare.dev/appwrapper-namespace: start-up
       workload.codeflare.dev/resourceName: no-quota-deployment-01
 status:
     availableReplicas: 1

diff --git a/test/e2e-kuttl-deployment-01/steps/03-assert.yaml b/test/e2e-kuttl-deployment-01/steps/03-assert.yaml
@@ -13,7 +13,7 @@ metadata:
   namespace: start-up
   labels:
     workload.codeflare.dev/appwrapper: hold-completion-job-03
-    workload.codeflare.dev/appwrapper/namespace: start-up
+    workload.codeflare.dev/appwrapper-namespace: start-up
     workload.codeflare.dev/resourceName: hold-completion-job-03-01
 status:
   conditions:
@@ -27,8 +27,8 @@ metadata:
   namespace: start-up
   labels:
      workload.codeflare.dev/appwrapper: hold-completion-job-03
-     workload.codeflare.dev/appwrapper/namespace: start-up
-     workload.codeflare.dev/job-name: hold-completion-job-03-01
+     workload.codeflare.dev/appwrapper-namespace: start-up
+     job-name: hold-completion-job-03-01
      workload.codeflare.dev/resourceName: hold-completion-job-03-01
 ---
 apiVersion: v1
@@ -37,6 +37,6 @@ metadata:
   namespace: start-up
   labels:
      workload.codeflare.dev/appwrapper: hold-completion-job-03
-     workload.codeflare.dev/appwrapper/namespace: start-up
-     workload.codeflare.dev/job-name: hold-completion-job-03-02
+     workload.codeflare.dev/appwrapper-namespace: start-up
+     job-name: hold-completion-job-03-02
      workload.codeflare.dev/resourceName: hold-completion-job-03-02
diff --git a/test/e2e-kuttl-deployment-01/steps/07-assert.yaml b/test/e2e-kuttl-deployment-01/steps/07-assert.yaml
@@ -13,6 +13,6 @@ metadata:
   namespace: start-up
   labels:
      workload.codeflare.dev/appwrapper: no-quota-job-06
-     workload.codeflare.dev/appwrapper/namespace: start-up
-     workload.codeflare.dev/job-name: no-quota-job-06
+     workload.codeflare.dev/appwrapper-namespace: start-up
+     job-name: no-quota-job-06
      workload.codeflare.dev/resourceName: no-quota-job-06
diff --git a/test/e2e-kuttl-deployment-02/steps/02-assert.yaml b/test/e2e-kuttl-deployment-02/steps/02-assert.yaml
@@ -15,7 +15,7 @@ metadata:
   labels:
       app:  no-quota-deployment-02
       workload.codeflare.dev/appwrapper: no-quota-deployment-02
-      workload.codeflare.dev/appwrapper/namespace: start-up-02
+      workload.codeflare.dev/appwrapper-namespace: start-up-02
       workload.codeflare.dev/resourceName: no-quota-deployment-02
 status:
     availableReplicas: 1

diff --git a/test/e2e-kuttl-deployment-03/steps/02-assert.yaml b/test/e2e-kuttl-deployment-03/steps/02-assert.yaml
@@ -15,7 +15,7 @@ metadata:
   labels:
       app:  no-quota-deployment-02
       workload.codeflare.dev/appwrapper: no-quota-deployment-02
-      workload.codeflare.dev/appwrapper/namespace: start-up-03
+      workload.codeflare.dev/appwrapper-namespace: start-up-03
       workload.codeflare.dev/resourceName: no-quota-deployment-02
 status:
     availableReplicas: 1
diff --git a/test/e2e-kuttl/quota-errors/03-assert.yaml b/test/e2e-kuttl/quota-errors/03-assert.yaml
@@ -18,7 +18,7 @@ metadata:
   labels:
       app: deployment-silver-lo-pri-1replica
       workload.codeflare.dev/appwrapper: deployment-silver-lo-pri-1replica
-      workload.codeflare.dev/appwrapper/namespace: quota-errors
+      workload.codeflare.dev/appwrapper-namespace: quota-errors
       workload.codeflare.dev/resourceName: deployment-silver-lo-pri-1replica
 status:
     availableReplicas: 1

diff --git a/test/e2e/util.go b/test/e2e/util.go
@@ -1513,7 +1513,7 @@ func createGenericServiceAWWithNoStatus(context *context, name string) *arbv1.Ap
 		"metadata": {
 			"labels": {
 				"workload.codeflare.dev/appwrapper": "test-dep-job-item",
-				"workload.codeflare.dev/appwrapper/namespace": "test",
+				"workload.codeflare.dev/appwrapper-namespace": "test",
 				"workload.codeflare.dev/resourceName": "test-dep-job-item-svc"
 			},
 			"name": "test-dep-job-item-svc",