Allow custom labels without labels.nais.io prefix

data/k8s/dev/devteam/bigquerydataset.yaml

@@ -6,7 +6,7 @@ metadata:
     - bqrator.nais.io/finalizer
   generation: 1
   labels:
-    labels.nais.io/key: value
+    key: value
     app: app-w-all-storage
     team: devteam
   name: app-w-all-storage-deleteme_bq-23424asf324

data/k8s/dev/devteam/cm.yaml

@@ -8,7 +8,7 @@ metadata:
     console.nais.io/last-modified-by: bob.ross@nais.io
     reloader.stakater.com/match: "true"
   labels:
-    labels.nais.io/key: value
+    key: value
     app.kubernetes.io/managed-by: console
     nais.io/managed-by: console
   name: asdadasd

data/k8s/dev/devteam/deploy-canary.yaml

@@ -2,7 +2,7 @@ apiVersion: nais.io/v1alpha1
 kind: Application
 metadata:
   labels:
-    labels.nais.io/key: value
+    key: value
   annotations:
     deploy.nais.io/client-version: 2023-01-23-7071cd7
     nais.io/deploymentCorrelationID: f8c04f82-6a84-4a8e-9f8b-563b5894d0cf

data/k8s/dev/devteam/job_running.yaml

@@ -3,7 +3,7 @@ apiVersion: nais.io/v1
 kind: Naisjob
 metadata:
   labels:
-    labels.nais.io/key: value
+    key: value
   annotations:
     deploy.nais.io/client-version: 2023-12-19-bbbb39b
     deploy.nais.io/github-actor: jhrv

data/k8s/dev/devteam/opensearch.yaml

@@ -17,7 +17,7 @@ metadata:
       name: app-w-all-storage
       uid: 5d684281-5621-4c87-aee7-fca257550790
   labels:
-    labels.nais.io/key: value
+    key: value
     team: devteam
     app: app-w-all-storage
     "nais.io/managed-by": console

data/k8s/dev/devteam/postgres.yaml

@@ -4,7 +4,7 @@ metadata:
   name: postgres-1
   namespace: devteam
   labels:
-    labels.nais.io/key: value
+    key: value
     team: devteam
 spec:
   cluster:

data/k8s/dev/devteam/secrets.yaml

@@ -12,7 +12,7 @@ metadata:
     console.nais.io/last-modified-at: "2021-01-01T00:00:00Z"
     console.nais.io/last-modified-by: "dev.usersen@example.com"
   labels:
-    labels.nais.io/key: value
+    key: value
     nais.io/managed-by: console
     foo: bar
     bar: baz

data/k8s/dev/devteam/sqlinstance.yaml

@@ -10,7 +10,7 @@ metadata:
     cnrm.cloud.google.com/state-into-spec: merge
     nais.io/deploymentCorrelationID: c53778c4-f03f-41a5-ae2f-0ca6a833019e
   labels:
-    labels.nais.io/key: value
+    key: value
     app: app-w-all-storage
     app.kubernetes.io/instance: app-w-all-storage
     app.kubernetes.io/managed-by: Helm

data/k8s/dev/devteam/storagebucket.yaml

@@ -15,7 +15,7 @@ metadata:
   labels:
     app: app-w-all-storage
     team: devteam
-    labels.nais.io/key: value
+    key: value
   name: uniquebucketname-bucket
   namespace: dev
 spec:

data/k8s/dev/devteam/topic.yaml

@@ -19,7 +19,7 @@ metadata:
   generation: 215
   labels:
     team: devteam
-    labels.nais.io/key: value
+    key: value
   name: rapido.the.first
   namespace: devteam
   resourceVersion: "4941946441"

data/k8s/dev/devteam/valkey.yaml

@@ -7,7 +7,7 @@ metadata:
     controllers.aiven.io/instance-is-running: "true"
     nais.io/deploymentCorrelationID: 61ad0b73-e30f-401a-949c-b8810c2b509a
   labels:
-    labels.nais.io/key: value
+    key: value
     app: app-w-all-storage
     team: devteam
   name: valkey-devteam-contests

integration_tests/configs.lua

@@ -1513,15 +1513,15 @@ Test.gql("Update config labels", function(t)
 		},
 	}
 
-	-- Update labels successfully (fully qualified)
+	-- Update labels successfully with a custom label (non-reserved)
 	t.query [[
 		mutation {
 			updateConfig(input: {
 				name: "labels-test-config"
 				environmentName: "dev"
 				teamSlug: "myteam"
 				labels: [
-					{ key: "labels.nais.io/tag", value: "testing" }
+					{ key: "my-custom-key", value: "testing" }
 				]
 			}) {
 				config { name labels { key value } }
@@ -1535,22 +1535,22 @@ Test.gql("Update config labels", function(t)
 				config = {
 					name = "labels-test-config",
 					labels = {
-						{ key = "labels.nais.io/tag", value = "testing" },
+						{ key = "my-custom-key", value = "testing" },
 					},
 				},
 			},
 		},
 	}
 
-	-- Try updating with an invalid key (no prefix) -> should fail validation
+	-- Try updating with a reserved key -> should fail validation
 	t.query [[
 		mutation {
 			updateConfig(input: {
 				name: "labels-test-config"
 				environmentName: "dev"
 				teamSlug: "myteam"
 				labels: [
-					{ key: "tag", value: "invalid" }
+					{ key: "app", value: "invalid" }
 				]
 			}) {
 				config { name }
@@ -1562,12 +1562,86 @@ Test.gql("Update config labels", function(t)
 		errors = {
 			{
 				locations = NotNull(),
-				message = Contains("label key \"tag\" must be prefixed with \"labels.nais.io/\""),
+				message = Contains("is reserved"),
 				path = {
 					"updateConfig",
 				},
 			},
 		},
 		data = Null,
 	}
+
+	-- Update labels and explicitly specify app.kubernetes.io/managed-by: Helm (value is not console, so it's a valid user label and gets set)
+	t.query [[
+		mutation {
+			updateConfig(input: {
+				name: "labels-test-config"
+				environmentName: "dev"
+				teamSlug: "myteam"
+				labels: [
+					{ key: "app.kubernetes.io/managed-by", value: "Helm" }
+				]
+			}) {
+				config { name labels { key value } }
+			}
+		}
+	]]
+
+	t.check {
+		data = {
+			updateConfig = {
+				config = {
+					name = "labels-test-config",
+					labels = {
+						{ key = "app.kubernetes.io/managed-by", value = "Helm" },
+					},
+				},
+			},
+		},
+	}
+
+	-- Update labels again with another custom label -> app.kubernetes.io/managed-by: Helm must be removed because value is not console!
+	t.query [[
+		mutation {
+			updateConfig(input: {
+				name: "labels-test-config"
+				environmentName: "dev"
+				teamSlug: "myteam"
+				labels: [
+					{ key: "my-custom-key", value: "second-test" }
+				]
+			}) {
+				config { name labels { key value } }
+			}
+		}
+	]]
+
+	t.check {
+		data = {
+			updateConfig = {
+				config = {
+					name = "labels-test-config",
+					labels = {
+						{ key = "my-custom-key", value = "second-test" },
+					},
+				},
+			},
+		},
+	}
+end)
+
+Test.k8s("Validate config labels after update", function(t)
+	t.check("v1", "configmaps", "dev", "myteam", "labels-test-config", {
+		apiVersion = Ignore(),
+		kind = Ignore(),
+		metadata = {
+			name = "labels-test-config",
+			namespace = "myteam",
+			annotations = Ignore(),
+			labels = {
+				["nais.io/managed-by"] = "console",
+				["my-custom-key"] = "second-test",
+			},
+		},
+	})
 end)

integration_tests/k8s_resources/label_selectors/dev/labelteam/applications.yaml

@@ -5,8 +5,8 @@ metadata:
   name: app-one
   namespace: labelteam
   labels:
-    labels.nais.io/tag: target
-    labels.nais.io/priority: high
+    tag: target
+    priority: high
 spec:
   image: navikt/app-one:latest
 ---
@@ -16,7 +16,7 @@ metadata:
   name: app-two
   namespace: labelteam
   labels:
-    labels.nais.io/tag: target
+    tag: target
 spec:
   image: navikt/app-two:latest
 ---
@@ -26,6 +26,6 @@ metadata:
   name: app-three
   namespace: labelteam
   labels:
-    labels.nais.io/tag: other
+    tag: other
 spec:
   image: navikt/app-three:latest

integration_tests/k8s_resources/label_selectors/dev/labelteam/jobs.yaml

@@ -5,8 +5,8 @@ metadata:
   name: job-one
   namespace: labelteam
   labels:
-    labels.nais.io/tag: target
-    labels.nais.io/priority: high
+    tag: target
+    priority: high
 spec:
   image: navikt/job-one:latest
 ---
@@ -16,7 +16,7 @@ metadata:
   name: job-two
   namespace: labelteam
   labels:
-    labels.nais.io/tag: target
+    tag: target
 spec:
   image: navikt/job-two:latest
 ---
@@ -26,6 +26,6 @@ metadata:
   name: job-three
   namespace: labelteam
   labels:
-    labels.nais.io/tag: other
+    tag: other
 spec:
   image: navikt/job-three:latest

integration_tests/k8s_resources/label_selectors/dev/labelteam/postgres.yaml

@@ -5,8 +5,8 @@ metadata:
   name: postgres-one
   namespace: labelteam
   labels:
-    labels.nais.io/tag: target
-    labels.nais.io/priority: high
+    tag: target
+    priority: high
 spec:
   cluster:
     majorVersion: "17"
@@ -23,7 +23,7 @@ metadata:
   name: postgres-two
   namespace: labelteam
   labels:
-    labels.nais.io/tag: target
+    tag: target
 spec:
   cluster:
     majorVersion: "17"
@@ -40,7 +40,7 @@ metadata:
   name: postgres-three
   namespace: labelteam
   labels:
-    labels.nais.io/tag: other
+    tag: other
 spec:
   cluster:
     majorVersion: "17"

integration_tests/k8s_resources/label_selectors/dev/labelteam/valkeys.yaml

@@ -5,8 +5,8 @@ metadata:
   name: valkey-one
   namespace: labelteam
   labels:
-    labels.nais.io/tag: target
-    labels.nais.io/priority: high
+    tag: target
+    priority: high
 spec:
   plan: startup-4
 ---
@@ -16,7 +16,7 @@ metadata:
   name: valkey-two
   namespace: labelteam
   labels:
-    labels.nais.io/tag: target
+    tag: target
 spec:
   plan: startup-4
 ---
@@ -26,6 +26,6 @@ metadata:
   name: valkey-three
   namespace: labelteam
   labels:
-    labels.nais.io/tag: other
+    tag: other
 spec:
   plan: startup-4