From a24f2f9beb240b60f5a151aecc2c8485265bec46 Mon Sep 17 00:00:00 2001 From: ChristianZaccaria Date: Fri, 10 Nov 2023 16:09:12 +0000 Subject: [PATCH] Fix label pattern to prefix/label-key: label-value --- .../genericresource/genericresource.go | 2 +- test/e2e-kuttl-deployment-01/steps/01-assert.yaml | 2 +- test/e2e-kuttl-deployment-01/steps/03-assert.yaml | 10 +++++----- test/e2e-kuttl-deployment-01/steps/07-assert.yaml | 4 ++-- test/e2e-kuttl-deployment-02/steps/02-assert.yaml | 2 +- test/e2e-kuttl-deployment-03/steps/02-assert.yaml | 2 +- test/e2e-kuttl/quota-errors/03-assert.yaml | 2 +- test/e2e/util.go | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pkg/controller/queuejobresources/genericresource/genericresource.go b/pkg/controller/queuejobresources/genericresource/genericresource.go index 59d777f4..d5e59e1e 100644 --- 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 index 092eaf86..347a5710 100644 --- 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 index 4405fb3f..f6e97c24 100644 --- 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 index 46012093..cddab300 100644 --- 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 index 3fe08632..0833b6cf 100644 --- 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 index ffd22acc..550196cc 100644 --- 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 index b462062f..6cd15881 100644 --- 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 index 781d36cf..8b7c582e 100644 --- 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",