chore: remove annotations from labels (#35)

* chore: new cluster updates * chore: cluster alias * chore: remove annotations from labels
demeter-run · Aug 29, 2023 · 9527721 · 9527721
1 parent 2670716
commit 9527721
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 7 deletions.
diff --git a/operator/src/backend-with-storage/handlers.ts b/operator/src/backend-with-storage/handlers.ts
@@ -87,7 +87,7 @@ export async function updateResource(
     // patch resource
     const patchBody = {
         metadata: {
-            labels: {
+            annotations: {
                 ...spec.annotations,
             },
         },
@@ -263,7 +263,9 @@ function sts(
             labels: {
                 'demeter.run/version': owner.apiVersion!.split('/')[1],
                 'demeter.run/kind': owner.kind!,
-                ...spec.annotations,
+            },
+            annotations: {
+                ...spec.annotations
             },
             ownerReferences: [
                 {

diff --git a/operator/src/backend/handlers.ts b/operator/src/backend/handlers.ts
@@ -77,7 +77,7 @@ export async function updateResource(
     // patch resource
     const patchBody = {
         metadata: {
-            labels: {
+            annotations: {
                 ...spec.annotations,
             },
             ownerReferences: [
@@ -178,7 +178,9 @@ function deployment(
             labels: {
                 'demeter.run/version': owner.apiVersion!.split('/')[1],
                 'demeter.run/kind': owner.kind!,
-                ...spec.annotations,
+            },
+            annotations: {
+                ...spec.annotations
             },
             ownerReferences: [
                 {

diff --git a/operator/src/frontend/handlers.ts b/operator/src/frontend/handlers.ts
@@ -70,7 +70,7 @@ export async function updateResource(ns: string, name: string, spec: Frontend.Sp
     // patch resource
     const patchBody = {
         metadata: {
-            labels: {
+            annotations: {
                 ...spec.annotations,
             },
         },
@@ -163,6 +163,8 @@ function deployment(
             labels: {
                 'demeter.run/version': owner.apiVersion!.split('/')[1],
                 'demeter.run/kind': owner.kind!,
+            },
+            annotations: {
                 ...spec.annotations,
             },
             ownerReferences: [

diff --git a/operator/src/workspaces/handlers.ts b/operator/src/workspaces/handlers.ts
@@ -100,7 +100,9 @@ export async function updateResource(
             labels: {
                 'demeter.run/version': owner.apiVersion!.split('/')[1],
                 'demeter.run/kind': owner.kind!,
-                ...spec.annotations,
+            },
+            annotations: {
+                ...spec.annotations
             },
             // needed for migration from old wks
             ownerReferences: [
@@ -319,7 +321,9 @@ function sts(
             labels: {
                 'demeter.run/version': owner.apiVersion!.split('/')[1],
                 'demeter.run/kind': owner.kind!,
-                ...spec.annotations,
+            },
+            annotations: {
+                ...spec.annotations
             },
             ownerReferences: [
                 {