From 5e133c1b13d38c0fd4e8d35339a90526e638db7c Mon Sep 17 00:00:00 2001 From: Dennis van Kekem <38350840+dennisvankekem@users.noreply.github.com> Date: Fri, 1 Nov 2024 10:34:41 +0100 Subject: [PATCH] fix: remove additional cluster logic (#1787) Co-authored-by: Sander Rodenhuis --- chart/otomi/values.schema.json | 23 ----------------------- tests/fixtures/env/settings.yaml | 4 ---- values-changes.yaml | 1 + values-schema.yaml | 16 ---------------- 4 files changed, 1 insertion(+), 43 deletions(-) diff --git a/chart/otomi/values.schema.json b/chart/otomi/values.schema.json index a07a4ccad4..b8ceccb113 100644 --- a/chart/otomi/values.schema.json +++ b/chart/otomi/values.schema.json @@ -4271,29 +4271,6 @@ "otomi": { "additionalProperties": false, "properties": { - "additionalClusters": { - "type": "array", - "items": { - "title": "Additional cluster", - "description": "A k8s cluster managed by Otomi.", - "properties": { - "domainSuffix": { - "$ref": "#/definitions/domain" - }, - "name": { - "$ref": "#/definitions/idName" - }, - "provider": { - "$ref": "#/definitions/provider" - } - }, - "required": [ - "domainSuffix", - "name", - "provider" - ] - } - }, "adminPassword": { "type": "string", "x-secret": "{{ randAlphaNum 20 }}" diff --git a/tests/fixtures/env/settings.yaml b/tests/fixtures/env/settings.yaml index 573f712368..3d56b460c2 100644 --- a/tests/fixtures/env/settings.yaml +++ b/tests/fixtures/env/settings.yaml @@ -63,10 +63,6 @@ oidc: allTeamsAdminGroupID: xxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx teamAdminGroupID: xxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx otomi: - additionalClusters: - - domainSuffix: demo.eks.otomi.cloud - name: demo - provider: custom globalPullSecret: username: otomi hasExternalDNS: true diff --git a/values-changes.yaml b/values-changes.yaml index 25b3bb96d2..f359b3321b 100644 --- a/values-changes.yaml +++ b/values-changes.yaml @@ -315,3 +315,4 @@ changes: - version: 31 deletions: - 'teamConfig.{team}.managedMonitoring.private' + - 'otomi.additionalClusters' diff --git a/values-schema.yaml b/values-schema.yaml index 557adc9fdd..58c9f8abd0 100644 --- a/values-schema.yaml +++ b/values-schema.yaml @@ -2989,22 +2989,6 @@ properties: otomi: additionalProperties: false properties: - additionalClusters: - type: array - items: - title: Additional cluster - description: A k8s cluster managed by Otomi. - properties: - domainSuffix: - $ref: '#/definitions/domain' - name: - $ref: '#/definitions/idName' - provider: - $ref: '#/definitions/provider' - required: - - domainSuffix - - name - - provider adminPassword: type: string x-secret: '{{ randAlphaNum 20 }}'