fix: values changes (#1652)

srodenhuis · web-flow · commit 6bedd2a57cc2 · 2024-07-19T10:46:56.000+02:00
diff --git a/chart/otomi/values.schema.json b/chart/otomi/values.schema.json
diff --git a/helmfile.d/snippets/defaults.yaml b/helmfile.d/snippets/defaults.yaml
@@ -694,7 +694,7 @@ environments:
         obj:
           provider:
             type: disabled
-          bucket:
+          buckets:
               loki: loki
               cnpg: cnpg
               velero: velero
diff --git a/src/cmd/bootstrap.test.ts b/src/cmd/bootstrap.test.ts
@@ -72,14 +72,13 @@ describe('Bootstrapping values', () => {
     const res = await getStoredClusterSecrets(deps)
     expect(res).toEqual(undefined)
   })
-  it('should set apiName, k8sContext and owner if needed', async () => {
+  it('should set k8sContext and owner if needed', async () => {
     deps.processValues.mockReturnValue(values)
     deps.hfValues.mockReturnValue(values)
     await bootstrap(deps)
     expect(deps.writeValues).toHaveBeenCalledWith(
       expect.objectContaining({
         cluster: expect.objectContaining({
-          apiName: expect.any(String),
           k8sContext: expect.any(String),
           owner: expect.any(String),
         }),
diff --git a/src/cmd/bootstrap.ts b/src/cmd/bootstrap.ts
@@ -371,19 +371,15 @@ export const bootstrap = async (
   }
   const finalValues = (await deps.hfValues()) as Record<string, any>
   const {
-    cluster: { apiName, k8sContext, name, owner, provider },
+    cluster: { k8sContext, name, owner, provider },
   } = finalValues
   // we can derive defaults for the following values
   // that we want to end up in the files, so the api can access them
-  if (!k8sContext || !apiName || !owner) {
+  if (!k8sContext || !owner) {
     const add: Record<string, any> = { cluster: {} }
     const engine = providerMap(provider as string)
-    const defaultOwner = 'otomi'
+    const defaultOwner = 'apl'
     const defaultName = `${owner || defaultOwner}-${engine}-${name}`
-    if (!apiName) {
-      d.info(`No value for cluster.apiName found, providing default one: ${defaultName}`)
-      add.cluster.apiName = defaultName
-    }
     if (!k8sContext) {
       d.info(`No value for cluster.k8sContext found, providing default one: ${defaultName}`)
       add.cluster.k8sContext = defaultName
diff --git a/tests/fixtures/env/cluster.yaml b/tests/fixtures/env/cluster.yaml
@@ -1,7 +1,7 @@
 cluster:
     apiServer: https://1.1.1.1:8443
-    domainSuffix: demo.eks.otomi.cloud
-    k8sContext: otomi-eks-demo
+    domainSuffix: dev.linode-apl.net
+    k8sContext: linode-dev
     name: demo
-    owner: redkubes
+    owner: akamai
     provider: linode
diff --git a/tests/fixtures/env/settings.yaml b/tests/fixtures/env/settings.yaml
@@ -88,12 +88,12 @@ platformBackups:
         gitea:
             enabled: false
 obj:
-    bucket:
-        loki: loki
-        cnpg: cnpg
-        velero: velero
-        harbor: harbor
-        tempo: tempo
+    buckets:
+        loki: my-clusterid-loki
+        cnpg: my-clusterid-cnpg
+        velero: my-clusterid-velero
+        harbor: my-clusterid-harbor
+        tempo: my-clusterid-tempo
     provider:
         # type: minioLocal
         linode:
diff --git a/tests/fixtures/env/teams/services.admin.yaml b/tests/fixtures/env/teams/services.admin.yaml
@@ -2,7 +2,7 @@ teamConfig:
     admin:
         services:
             - auth: true
-              domain: hello.team-admin.demo.eks.otomi.cloud
+              domain: hello.team-admin.dev.linode-apl.net
               id: cb5149c4-8ea5-4c5a-be04-a37258658bd0
               name: hello-admin
               ownHost: true
diff --git a/tests/fixtures/env/teams/services.demo.yaml b/tests/fixtures/env/teams/services.demo.yaml
@@ -2,7 +2,7 @@ teamConfig:
     demo:
         services:
             - auth: true
-              domain: hello.team-demo.demo.eks.otomi.cloud
+              domain: hello.team-demo.dev.linode-apl.net
               headers:
                   response:
                       set:
@@ -26,7 +26,7 @@ teamConfig:
                   enabled: true
                   weightV1: 70
                   weightV2: 30
-            - domain: tlspass.eks.dev.otomi.cloud
+            - domain: tlspass.dev.linode-apl.net
               id: cb5149c4-8ea5-4c5a-be04-a37258658bd4
               ksvc:
                   predeployed: true
diff --git a/values-changes.yaml b/values-changes.yaml
@@ -250,4 +250,24 @@ changes:
       - 'teamConfig.{team}.apps.prometheus.shortcuts'
       - 'teamConfig.{team}.apps.rabbitmq.shortcuts'
       - 'teamConfig.{team}.apps.sealed-secrets.shortcuts'
-      - 'teamConfig.{team}.apps.tempo.shortcuts'
+      - 'teamConfig.{team}.apps.tempo.shortcuts'
+  - version: 25
+    deletions:
+      - 'ingress.platformClass.loadBalancerRG'
+      - 'ingress.platformClass.loadBalancerSubnet'
+      - 'azure.monitor'
+      - 'cluster.apiName'
+      - 'cluster.region'
+      - 'teamConfig.{team}.azureMonitor'
+      - 'apps.cluster-autoscaler'
+      - 'apps.cluster-overprovisioner'
+      - 'apps.harbor.persistence'
+      - 'apps.ingress-azure'
+      - 'apps.kube-descheduler'
+      - 'apps.loki.storage'
+      - 'apps.tempo.storage'
+      - 'apps.velero.cloud'
+      - 'apps.velero.storage'
+      - 'platformBackups.persistentVolumes.drone'
+      - 'platformBackups.persistentVolumes.harbor'
+      - 'platformBackups.persistentVolumes.keycloak'
diff --git a/values-schema.yaml b/values-schema.yaml
@@ -2959,7 +2959,28 @@ properties:
               - linode
               - disabled
             default: disabled
-
+      buckets:
+        properties:
+          loki:
+            type: string
+            $ref: '#/definitions/wordCharacterPattern'
+            default: loki
+          cnpg:
+            type: string
+            $ref: '#/definitions/wordCharacterPattern'
+            default: cnpg
+          velero:
+            type: string
+            $ref: '#/definitions/wordCharacterPattern'
+            default: velero
+          harbor:
+            type: string
+            $ref: '#/definitions/wordCharacterPattern'
+            default: harbor
+          tempo:
+            type: string
+            $ref: '#/definitions/wordCharacterPattern'
+            default: tempo
   databases:
     properties:
       keycloak:
diff --git a/values/gitea/gitea-otomi-db.gotmpl b/values/gitea/gitea-otomi-db.gotmpl
@@ -3,7 +3,7 @@
 {{- $cnpg := $v.apps.cnpg }}
 {{- $gdb := $v.databases.gitea }}
 {{- $obj := $v.obj.provider }}
-{{- $bu := $v.obj.bucket }}
+{{- $bu := $v.obj.buckets }}
 {{- $b := $v.platformBackups.database.gitea }}
 
 name: gitea-db
diff --git a/values/harbor/harbor-otomi-db.gotmpl b/values/harbor/harbor-otomi-db.gotmpl
@@ -2,7 +2,7 @@
 {{- $hdb := $v.databases.harbor }}
 {{- $cnpg := $v.apps.cnpg }}
 {{- $obj := $v.obj.provider }}
-{{- $bu := $v.obj.bucket }}
+{{- $bu := $v.obj.buckets }}
 {{- $b := $v.platformBackups.database.harbor }}
 
 name: harbor-otomi-db
diff --git a/values/harbor/harbor.gotmpl b/values/harbor/harbor.gotmpl
@@ -2,7 +2,7 @@
 {{- $h := $v.apps.harbor }}
 {{- $db := $v.databases.harbor }}
 {{- $obj := $v.obj.provider }}
-{{- $bu := $v.obj.bucket }}
+{{- $bu := $v.obj.buckets }}
 {{- $harborDomain := printf "harbor.%s" $v.cluster.domainSuffix }}
 {{- $notaryDomain := printf "notary.%s" $v.cluster.domainSuffix }}
 {{- $harborSecretName := ($harborDomain | replace "." "-") }}
diff --git a/values/keycloak/keycloak-otomi-db.gotmpl b/values/keycloak/keycloak-otomi-db.gotmpl
@@ -4,7 +4,7 @@
 {{- $sp := $cnpg.storage }}
 {{- $kdb := $v.databases.keycloak }}
 {{- $obj := $v.obj.provider }}
-{{- $bu := $v.obj.bucket }}
+{{- $bu := $v.obj.buckets }}
 {{- $b := $v.platformBackups.database.keycloak }}
 
 name: keycloak-db
diff --git a/values/loki/loki.gotmpl b/values/loki/loki.gotmpl
@@ -1,7 +1,7 @@
 {{- $v := .Values -}}
 {{- $l:= $v.apps.loki }}
 {{- $obj := $v.obj.provider }}
-{{- $bu := $v.obj.bucket }}
+{{- $bu := $v.obj.buckets }}
 
 nameOverride: loki
 
diff --git a/values/tempo/tempo.gotmpl b/values/tempo/tempo.gotmpl
@@ -1,7 +1,7 @@
 {{- $v := .Values -}}
 {{- $t:= $v.apps.tempo }}
 {{- $obj := $v.obj.provider }}
-{{- $bu := $v.obj.bucket }}
+{{- $bu := $v.obj.buckets }}
 
 
 fullnameOverride: tempo
diff --git a/values/velero/velero.gotmpl b/values/velero/velero.gotmpl
@@ -1,7 +1,7 @@
 {{- $v := .Values }}
 {{- $vl := $v.apps.velero }}
 {{- $obj := $v.obj.provider }}
-{{- $bu := $v.obj.bucket }}
+{{- $bu := $v.obj.buckets }}
 {{- $b := $v.platformBackups.persistentVolumes }}
 
 resources: {{- $vl.resources | toYaml | nindent 2 }}
diff --git a/versions.yaml b/versions.yaml
@@ -1,4 +1,4 @@
-api: sr-storage-backup-refactor
-console: sr-storage-backup-refactor
-tasks: 2.5.0
+api: main
+console: main
+tasks: main
 tools: 1.6.4
