fix labels in the examples

cnoe-io · Aug 17, 2023 · 61f1d05 · 61f1d05
1 parent a9b7d22
commit 61f1d05
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/examples/scaffolder/SparkAppArgoWorkflow/templates/ArgoWorkflowsManifest/catalog-info.yaml b/examples/scaffolder/SparkAppArgoWorkflow/templates/ArgoWorkflowsManifest/catalog-info.yaml
@@ -6,9 +6,10 @@ metadata:
   annotations:
     backstage.io/kubernetes-id: "${{values.clusterName}}"
     apache-spark.cnoe.io/cluster-name: "${{values.clusterName}}"
+    apache-spark.cnoe.io/label-selector: "backstage.io/component-id=${{values.name}}"
+    argo-workflows.cnoe.io/label-selector: "backstage.io/component-id=${{values.name}}"
     argo-workflows.cnoe.io/cluster-name: "${{values.clusterName}}"
     backstage.io/kubernetes-namespace: "${{values.namespace}}"
-    backstage.io/kubernetes-label-selector: "backstage.io/component-id=${{values.name}}"
 spec:
   type: job
   lifecycle: experimental

diff --git a/examples/scaffolder/SparkAppArgoWorkflow/templates/catalog-info.yaml b/examples/scaffolder/SparkAppArgoWorkflow/templates/catalog-info.yaml
@@ -6,9 +6,10 @@ metadata:
   annotations:
     backstage.io/kubernetes-id: "${{values.clusterName}}"
     apache-spark.cnoe.io/cluster-name: "${{values.clusterName}}"
+    apache-spark.cnoe.io/label-selector: "backstage.io/component-id=${{values.name}}"
     argo-workflows.cnoe.io/cluster-name: "${{values.clusterName}}"
+    argo-workflows.cnoe.io/label-selector: "backstage.io/component-id=${{values.name}}"
     backstage.io/kubernetes-namespace: "${{values.namespace}}"
-    backstage.io/kubernetes-label-selector: "backstage.io/component-id=${{values.name}}"
 spec:
   type: job
   lifecycle: experimental

diff --git a/examples/scaffolder/SparkAppUI/templates/catalog-info.yaml b/examples/scaffolder/SparkAppUI/templates/catalog-info.yaml
@@ -6,9 +6,10 @@ metadata:
   annotations:
     backstage.io/kubernetes-id: "${{values.clusterName}}"
     apache-spark.cnoe.io/cluster-name: "${{values.clusterName}}"
+    apache-spark.cnoe.io/label-selector: "backstage.io/component-id=${{values.name}}"
+    argo-workflows.cnoe.io/label-selector: "backstage.io/component-id=${{values.name}}"
     argo-workflows.cnoe.io/cluster-name: "${{values.clusterName}}"
     backstage.io/kubernetes-namespace: "${{values.namespace}}"
-    backstage.io/kubernetes-label-selector: "backstage.io/component-id=${{values.name}}"
 spec:
   type: job
   lifecycle: experimental

diff --git a/src/consts.ts b/src/consts.ts
@@ -1,6 +1,4 @@
 export const APACHE_SPARK_LABEL_SELECTOR_ANNOTATION =
   'apache-spark.cnoe.io/label-selector';
 export const CLUSTER_NAME_ANNOTATION = 'apache-spark.cnoe.io/cluster-name';
-export const K8S_LABEL_SELECTOR_ANNOTATION =
-  'backstage.io/kubernetes-label-selector';
 export const K8S_NAMESPACE_ANNOTATION = 'backstage.io/kubernetes-namespace';