From 98eab4f3be96a2266de5e12874d9703fecd73aa7 Mon Sep 17 00:00:00 2001 From: Matthias Erll Date: Wed, 27 May 2026 15:29:26 +0200 Subject: [PATCH 1/5] chore: remove team service fields without functionality --- helmfile.d/snippets/defaults.yaml | 2 +- tests/fixtures/env/settings/versions.yaml | 2 +- .../env/teams/admin/services/hello-admin.yaml | 2 - .../env/teams/demo/services/has-cert-svc.yaml | 1 - .../env/teams/demo/services/hello-auth.yaml | 2 - .../teams/demo/services/hello-blue-green.yaml | 1 - .../env/teams/demo/services/hello-cname.yaml | 4 +- .../env/teams/demo/services/hello.yaml | 4 +- values-changes.yaml | 7 +++ values-schema.yaml | 57 ------------------- 10 files changed, 11 insertions(+), 71 deletions(-) diff --git a/helmfile.d/snippets/defaults.yaml b/helmfile.d/snippets/defaults.yaml index 2f1e830993..14c58a6592 100644 --- a/helmfile.d/snippets/defaults.yaml +++ b/helmfile.d/snippets/defaults.yaml @@ -1169,4 +1169,4 @@ environments: aiEnabled: false users: [] versions: - specVersion: 68 + specVersion: 69 diff --git a/tests/fixtures/env/settings/versions.yaml b/tests/fixtures/env/settings/versions.yaml index 865548e1be..73f80a670f 100644 --- a/tests/fixtures/env/settings/versions.yaml +++ b/tests/fixtures/env/settings/versions.yaml @@ -3,4 +3,4 @@ metadata: name: versions labels: {} spec: - specVersion: 68 + specVersion: 69 diff --git a/tests/fixtures/env/teams/admin/services/hello-admin.yaml b/tests/fixtures/env/teams/admin/services/hello-admin.yaml index ea3b4d9a17..4cced16ebf 100644 --- a/tests/fixtures/env/teams/admin/services/hello-admin.yaml +++ b/tests/fixtures/env/teams/admin/services/hello-admin.yaml @@ -5,6 +5,4 @@ metadata: apl.io/teamId: admin spec: auth: true - domain: hello.team-admin.dev.linode-apl.net - ownHost: true port: 80 diff --git a/tests/fixtures/env/teams/demo/services/has-cert-svc.yaml b/tests/fixtures/env/teams/demo/services/has-cert-svc.yaml index 14e7227133..560eea290d 100644 --- a/tests/fixtures/env/teams/demo/services/has-cert-svc.yaml +++ b/tests/fixtures/env/teams/demo/services/has-cert-svc.yaml @@ -4,6 +4,5 @@ metadata: labels: apl.io/teamId: demo spec: - hasCert: true paths: - /jeho diff --git a/tests/fixtures/env/teams/demo/services/hello-auth.yaml b/tests/fixtures/env/teams/demo/services/hello-auth.yaml index c58f79043b..7da80aceb9 100644 --- a/tests/fixtures/env/teams/demo/services/hello-auth.yaml +++ b/tests/fixtures/env/teams/demo/services/hello-auth.yaml @@ -4,9 +4,7 @@ metadata: labels: apl.io/teamId: demo spec: - domain: tlspass.dev.linode-apl.net ksvc: predeployed: true - ownHost: true paths: [] port: 80 diff --git a/tests/fixtures/env/teams/demo/services/hello-blue-green.yaml b/tests/fixtures/env/teams/demo/services/hello-blue-green.yaml index 0b8b7085b9..d681b2e147 100644 --- a/tests/fixtures/env/teams/demo/services/hello-blue-green.yaml +++ b/tests/fixtures/env/teams/demo/services/hello-blue-green.yaml @@ -7,7 +7,6 @@ spec: ingressClassName: platform ksvc: predeployed: false - ownHost: true paths: [] port: 80 trafficControl: diff --git a/tests/fixtures/env/teams/demo/services/hello-cname.yaml b/tests/fixtures/env/teams/demo/services/hello-cname.yaml index 1cf89fe9c6..5e54f3a265 100644 --- a/tests/fixtures/env/teams/demo/services/hello-cname.yaml +++ b/tests/fixtures/env/teams/demo/services/hello-cname.yaml @@ -7,8 +7,7 @@ spec: auth: true cname: domain: hello-demo.cname.com - tlsSecretName: 'hello-cert' - domain: hello-demo.dev.linode-apl.net + tlsSecretName: hello-cert headers: response: set: @@ -18,7 +17,6 @@ spec: value: same-origin ksvc: predeployed: true - ownHost: true port: 80 trafficControl: enabled: true diff --git a/tests/fixtures/env/teams/demo/services/hello.yaml b/tests/fixtures/env/teams/demo/services/hello.yaml index a88127124d..d027a31697 100644 --- a/tests/fixtures/env/teams/demo/services/hello.yaml +++ b/tests/fixtures/env/teams/demo/services/hello.yaml @@ -7,8 +7,7 @@ spec: auth: true cname: domain: hello-demo.cname.com - tslSecretName: '' - domain: hello-demo.dev.linode-apl.net + tslSecretName: "" headers: response: set: @@ -18,7 +17,6 @@ spec: value: same-origin ksvc: predeployed: true - ownHost: true port: 80 trafficControl: enabled: true diff --git a/values-changes.yaml b/values-changes.yaml index fd6fff5d32..196effea51 100644 --- a/values-changes.yaml +++ b/values-changes.yaml @@ -494,3 +494,10 @@ changes: - version: 68 deletions: - apps.loki.enableOpenTelemetry + - version: 69 + deletions: + - 'teamConfig.{team}.services[].domain' + - 'teamConfig.{team}.services[].forwardPath' + - 'teamConfig.{team}.services[].hasCert' + - 'teamConfig.{team}.services[].namespace' + - 'teamConfig.{team}.services[].ownHost' diff --git a/values-schema.yaml b/values-schema.yaml index 8a5ad7a162..adfb6c567f 100644 --- a/values-schema.yaml +++ b/values-schema.yaml @@ -867,16 +867,6 @@ definitions: service: additionalProperties: false properties: - authz: - additionalProperties: false - description: Identifies a workload to authorize. - properties: - forwardOriginalToken: - default: false - description: If true istio will forward the bearer token instead of removing it from the headers. - type: boolean - workload: - $ref: '#/definitions/labelsAnnotations' trafficControl: title: Traffic Control description: Split traffic between multiple services (blue/green, canary) @@ -890,21 +880,6 @@ definitions: weightV2: type: integer default: 10 - certName: - description: The name of a TLS secret known to exist in the team namespace. - example: www-example-com - type: string - domain: - description: A custom service domain name (max 64 bytes). - maxLength: 64 - $ref: '#/definitions/wordCharacterPattern' - forwardPath: - default: false - description: Whether to forward the path into the service, or 'terminate' it. - type: boolean - hasCert: - description: Select when a certificate exists and should not be generated. - type: boolean headers: properties: response: @@ -935,21 +910,6 @@ definitions: required: - name - value - hide: - description: Used by otomi console to determine wether to render it on screen or not. Only used by core services. - type: boolean - host: - description: Reference to another core service name. Used by otomi console to show a variation of a core service with a different path (i.e. Loki). Only used by core services. - $ref: '#/definitions/wordCharacterPattern' - id: - description: Unique identifier created by and used in API. Optional. - type: string - auth: - description: Available only for core apps. - type: boolean - isShared: - description: When true the service will get it's own domain by prefixing the app name to the cluster domain. Mostly used by core apps. - type: boolean ksvc: type: object properties: @@ -957,26 +917,9 @@ definitions: description: Set this flag it the service is managed by knative service type: boolean default: false - logo: - description: Used by otomi-console as an override mechanism to display another logo. - properties: - name: - type: string - required: - - name name: $ref: '#/definitions/idName' description: Short name. Will be used for generation of knative service name, as well as service URL. - namespace: - $ref: '#/definitions/idName' - description: A kubernetes namespace. Only used by core services, so should be disallowed for non-admins. - ownHost: - default: true - description: When true the service will get it's own domain by prefixing the app name to the team domain. Mostly set to true. This will probably be removed soon. - type: boolean - path: - description: Used by otomi-console to render a path for the app. Only used by core services. - $ref: '#/definitions/wordCharacterPattern' paths: items: description: | From 1c5685b92442f85695be875308ef2daab9ed01d3 Mon Sep 17 00:00:00 2001 From: Matthias Erll Date: Wed, 27 May 2026 15:39:46 +0200 Subject: [PATCH 2/5] fix: drop auth field --- tests/fixtures/env/teams/admin/services/hello-admin.yaml | 1 - tests/fixtures/env/teams/demo/services/hello-cname.yaml | 1 - tests/fixtures/env/teams/demo/services/hello.yaml | 1 - values-changes.yaml | 1 + 4 files changed, 1 insertion(+), 3 deletions(-) diff --git a/tests/fixtures/env/teams/admin/services/hello-admin.yaml b/tests/fixtures/env/teams/admin/services/hello-admin.yaml index 4cced16ebf..8b8ad4b437 100644 --- a/tests/fixtures/env/teams/admin/services/hello-admin.yaml +++ b/tests/fixtures/env/teams/admin/services/hello-admin.yaml @@ -4,5 +4,4 @@ metadata: labels: apl.io/teamId: admin spec: - auth: true port: 80 diff --git a/tests/fixtures/env/teams/demo/services/hello-cname.yaml b/tests/fixtures/env/teams/demo/services/hello-cname.yaml index 5e54f3a265..22b0f4e413 100644 --- a/tests/fixtures/env/teams/demo/services/hello-cname.yaml +++ b/tests/fixtures/env/teams/demo/services/hello-cname.yaml @@ -4,7 +4,6 @@ metadata: labels: apl.io/teamId: demo spec: - auth: true cname: domain: hello-demo.cname.com tlsSecretName: hello-cert diff --git a/tests/fixtures/env/teams/demo/services/hello.yaml b/tests/fixtures/env/teams/demo/services/hello.yaml index d027a31697..9c3a40dea9 100644 --- a/tests/fixtures/env/teams/demo/services/hello.yaml +++ b/tests/fixtures/env/teams/demo/services/hello.yaml @@ -4,7 +4,6 @@ metadata: labels: apl.io/teamId: demo spec: - auth: true cname: domain: hello-demo.cname.com tslSecretName: "" diff --git a/values-changes.yaml b/values-changes.yaml index 196effea51..da9dee1059 100644 --- a/values-changes.yaml +++ b/values-changes.yaml @@ -496,6 +496,7 @@ changes: - apps.loki.enableOpenTelemetry - version: 69 deletions: + - 'teamConfig.{team}.services[].auth' - 'teamConfig.{team}.services[].domain' - 'teamConfig.{team}.services[].forwardPath' - 'teamConfig.{team}.services[].hasCert' From 6f7908f679910fe99a4e2704de44cacb57be8ce0 Mon Sep 17 00:00:00 2001 From: Matthias Erll Date: Thu, 28 May 2026 14:49:56 +0200 Subject: [PATCH 3/5] test: typo in field name --- tests/fixtures/env/teams/demo/services/hello.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/fixtures/env/teams/demo/services/hello.yaml b/tests/fixtures/env/teams/demo/services/hello.yaml index 9c3a40dea9..cd9ec58e48 100644 --- a/tests/fixtures/env/teams/demo/services/hello.yaml +++ b/tests/fixtures/env/teams/demo/services/hello.yaml @@ -6,7 +6,7 @@ metadata: spec: cname: domain: hello-demo.cname.com - tslSecretName: "" + tlsSecretName: "" headers: response: set: From 37b3a2198bda7d5c705ed4162874fd9d3e6dea61 Mon Sep 17 00:00:00 2001 From: Matthias Erll Date: Thu, 28 May 2026 14:50:32 +0200 Subject: [PATCH 4/5] revert: restore namespace field --- values-changes.yaml | 1 - values-schema.yaml | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/values-changes.yaml b/values-changes.yaml index da9dee1059..df2d89b9d6 100644 --- a/values-changes.yaml +++ b/values-changes.yaml @@ -500,5 +500,4 @@ changes: - 'teamConfig.{team}.services[].domain' - 'teamConfig.{team}.services[].forwardPath' - 'teamConfig.{team}.services[].hasCert' - - 'teamConfig.{team}.services[].namespace' - 'teamConfig.{team}.services[].ownHost' diff --git a/values-schema.yaml b/values-schema.yaml index adfb6c567f..d8867aa2c2 100644 --- a/values-schema.yaml +++ b/values-schema.yaml @@ -920,6 +920,9 @@ definitions: name: $ref: '#/definitions/idName' description: Short name. Will be used for generation of knative service name, as well as service URL. + namespace: + $ref: '#/definitions/idName' + description: A kubernetes namespace. Only used by core services, so should be disallowed for non-admins. paths: items: description: | From fe10d0c3aff5f3a66139d2edc9b59f7c253f3847 Mon Sep 17 00:00:00 2001 From: Matthias Erll Date: Thu, 28 May 2026 15:11:11 +0200 Subject: [PATCH 5/5] test: set valid field content --- tests/fixtures/env/teams/demo/services/hello.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/fixtures/env/teams/demo/services/hello.yaml b/tests/fixtures/env/teams/demo/services/hello.yaml index cd9ec58e48..1e08c40ceb 100644 --- a/tests/fixtures/env/teams/demo/services/hello.yaml +++ b/tests/fixtures/env/teams/demo/services/hello.yaml @@ -6,7 +6,7 @@ metadata: spec: cname: domain: hello-demo.cname.com - tlsSecretName: "" + tlsSecretName: "hello-crt" headers: response: set: