Merge branch 'main' into APL-288

linode · Nov 1, 2024 · 84650c9 · 84650c9
2 parents c9dcd08 + 5e133c1
commit 84650c9
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 43 deletions.
diff --git 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
@@ -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
@@ -315,3 +315,4 @@ changes:
   - version: 31
     deletions:
       - 'teamConfig.{team}.managedMonitoring.private'
+      - 'otomi.additionalClusters'
diff --git 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 }}'