fix: Move white glove to labels (#2294)

redhat-cop · Dec 4, 2024 · fa54968 · fa54968
1 parent 34c12d2
commit fa54968
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/catalog/ui/src/app/Services/ServicesItem.tsx b/catalog/ui/src/app/Services/ServicesItem.tsx
@@ -978,7 +978,7 @@ const ServicesItemComponent: React.FC<{
                             mutate(
                               await patchResourceClaim(resourceClaim.metadata.namespace, resourceClaim.metadata.name, {
                                 metadata: {
-                                  annotations: {
+                                  labels: {
                                     [`${DEMO_DOMAIN}/white-glove`]: String(isChecked),
                                   },
                                 },

diff --git a/catalog/ui/src/app/Workshops/WorkshopsItemDetails.tsx b/catalog/ui/src/app/Workshops/WorkshopsItemDetails.tsx
@@ -183,7 +183,7 @@ const WorkshopsItemDetails: React.FC<{
   async function handleWhiteGloveChange(_: any, isChecked: boolean) {
     const patchObj = {
       metadata: {
-        annotations: {
+        labels: {
           [`${DEMO_DOMAIN}/white-glove`]: String(isChecked),
         },
       },

diff --git a/catalog/ui/src/app/api.ts b/catalog/ui/src/app/api.ts
@@ -389,7 +389,6 @@ export async function createServiceRequest({
         ...(catalogItem.spec.multiuser && catalogItem.spec.messageTemplates?.user
           ? { [`${DEMO_DOMAIN}/user-message-template`]: JSON.stringify(catalogItem.spec.messageTemplates.user) }
           : {}),
-        [`${DEMO_DOMAIN}/white-glove`]: String(whiteGloved),
       },
       labels: {
         [`${BABYLON_DOMAIN}/catalogItemName`]: catalogItem.metadata.name,
@@ -398,6 +397,7 @@ export async function createServiceRequest({
           ? { 'gpte.redhat.com/asset-uuid': catalogItem.metadata.labels['gpte.redhat.com/asset-uuid'] }
           : {}),
         ...(catalogItem.spec.bookbag ? { [`${BABYLON_DOMAIN}/labUserInterface`]: 'bookbag' } : {}),
+        [`${DEMO_DOMAIN}/white-glove`]: String(whiteGloved),
       },
       name: `${catalogItem.metadata.name}-${suffix}`,
       namespace: serviceNamespace.name,
@@ -523,6 +523,7 @@ export async function createWorkshop({
         ...(catalogItem.metadata.labels?.['gpte.redhat.com/asset-uuid']
           ? { 'gpte.redhat.com/asset-uuid': catalogItem.metadata.labels['gpte.redhat.com/asset-uuid'] }
           : {}),
+        [`${DEMO_DOMAIN}/white-glove`]: String(whiteGloved),
       },
       annotations: {
         [`${BABYLON_DOMAIN}/category`]: catalogItem.spec.category,
@@ -535,7 +536,6 @@ export async function createWorkshop({
           startDate && startDate.getTime() + parseDuration('6h') > Date.now() ? 'true' : 'false',
         [`${DEMO_DOMAIN}/requester`]: serviceNamespace.requester || email,
         [`${DEMO_DOMAIN}/orderedBy`]: session.user,
-        [`${DEMO_DOMAIN}/white-glove`]: String(whiteGloved),
       },
     },
     spec: {

diff --git a/catalog/ui/src/app/util.ts b/catalog/ui/src/app/util.ts
@@ -334,8 +334,8 @@ export function getCostTracker(resourceClaim?: ResourceClaim): CostTracker {
 }
 
 export function getWhiteGloved(d?: ResourceClaim | Workshop): boolean {
-  if (!d || !d.metadata?.annotations?.[`${DEMO_DOMAIN}/white-glove`]) return false;
-  return d.metadata?.annotations?.[`${DEMO_DOMAIN}/white-glove`] === 'true';
+  if (!d || !d.metadata?.labels?.[`${DEMO_DOMAIN}/white-glove`]) return false;
+  return d.metadata?.labels?.[`${DEMO_DOMAIN}/white-glove`] === 'true';
 }
 
 export function compareStringDates(stringDate1: string, stringDate2: string): number {

diff --git a/workshop-manager/operator/babylon.py b/workshop-manager/operator/babylon.py
@@ -23,7 +23,7 @@ class Babylon():
     lab_ui_urls_annotation = f"{babylon_domain}/labUserInterfaceUrls"
     notifier_annotation = f"{babylon_domain}/notifier"
     ordered_by_annotation = f"{demo_domain}/orderedBy"
-    white_glove_annotation = f"{demo_domain}/white-glove"
+    white_glove_label = f"{demo_domain}/white-glove"
     purpose_annotation = f"{demo_domain}/purpose"
     purpose_activity_annotation = f"{demo_domain}/purpose-activity"
     requester_annotation = f"{demo_domain}/requester"

diff --git a/workshop-manager/operator/workshop.py b/workshop-manager/operator/workshop.py
@@ -80,7 +80,7 @@ def ordered_by(self):
 
     @property
     def white_gloved(self):
-        return self.annotations.get(Babylon.white_glove_annotation)
+        return self.labels.get(Babylon.white_glove_label)
 
     @property
     def service_url(self):

diff --git a/workshop-manager/operator/workshopprovision.py b/workshop-manager/operator/workshopprovision.py
@@ -167,7 +167,7 @@ async def create_resource_claim(self, logger, workshop):
             resource_claim_definition['metadata']['annotations'][Babylon.ordered_by_annotation] = workshop.ordered_by
 
         if workshop.white_gloved:
-            resource_claim_definition['metadata']['annotations'][Babylon.white_glove_annotation] = workshop.white_gloved
+            resource_claim_definition['metadata']['labels'][Babylon.white_glove_label] = workshop.white_gloved
 
         if catalog_item.lab_ui_type:
             resource_claim_definition['metadata']['labels'][Babylon.lab_ui_label] = catalog_item.lab_ui_type