feat: set correct naming for harbor schema values

linode · Apr 15, 2024 · a5595c5 · a5595c5
1 parent d4f3ad8
commit a5595c5
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 92 deletions.
diff --git a/helmfile.d/helmfile-04.databases.yaml b/helmfile.d/helmfile-04.databases.yaml
@@ -11,17 +11,19 @@ bases:
 {{- $v := .Values }}
 {{- $a := $v.apps }}
 {{- $h := $a.harbor }}
+{{- $hdb := $v.databases.harbor }}
+{{- $kdb := $v.databases.keycloak }}
 {{- $k := $a.keycloak }}
 
 releases:
   - name: harbor-otomi-db
-    installed: {{ and ($h | get "enabled")  (or (eq $v.databases.harbor.type "external")  $v.databases.harbor.importHarborDb) }}
+    installed: {{ and ($h | get "enabled")  (or $hdb.useOtomiDB  $hdb.imported) }}
     namespace: harbor
     labels:
       pkg: harbor
     <<: *otomiDb
   - name: keycloak-otomi-db
-    installed: {{ or $v.databases.keycloak.useOtomiDB  $v.databases.keycloak.imported }}
+    installed: {{ or $kdb.useOtomiDB  $kdb.imported }}
     namespace: keycloak
     labels:
       pkg: keycloak

diff --git a/helmfile.d/snippets/defaults.yaml b/helmfile.d/snippets/defaults.yaml
@@ -761,12 +761,13 @@ environments:
                 cpu: 50m
                 memory: 256Mi
           harbor:
-            type: external
+            useOtomiDB: true
+            imported: false
             size: '5Gi'
+            replicas: 2
             name: harbor-otomi-db
             user: harbor
             coreDatabase: registry
-            importHarborDb: false
         platformBackups:
           database:
             harbor:

diff --git a/tests/fixtures/env/databases/harbor.yaml b/tests/fixtures/env/databases/harbor.yaml
@@ -1,4 +1,4 @@
 databases:
     harbor:
-        type: internal
-        importHarborDb: true
+        useOtomiDB: true
+        imported: true
diff --git a/values-changes.yaml b/values-changes.yaml
@@ -132,6 +132,13 @@ changes:
   - version: 21
     deletions:
       - 'apps.harbor.databasePassword'
+      - 'apps.harbor.database.type'
+    additions:
+      - databases.harbor.useOtomiDB: true
+      - databases.harbor.replicas: 2
     relocations:
-      - 'apps.harbor.database': 'databases.harbor'
+      - 'apps.harbor.database.size': 'databases.harbor.size'
+      - 'apps.harbor.database.name': 'databases.harbor.name'
+      - 'apps.harbor.database.user': 'databases.harbor.user'
+      - 'apps.harbor.database.importHarborDb': 'databases.harbor.imported'
       - 'apps.harbor.resources.database': 'databases.harbor.resources'
diff --git a/values-schema.yaml b/values-schema.yaml
@@ -4087,23 +4087,23 @@ properties:
       harbor:
         title: Harbor
         properties:
+          useOtomiDB:
+            type: boolean
+            default: false
           size:
             type: string
-          type:
-            type: string
-            description: Internal is a database provided by the community chart. The external is database provided by the cloudnative-pg.
-            enum:
-              - internal
-              - external
+          resources:
+            $ref: '#/definitions/resources'
+          replicas:
+            type: integer
+            default: 2
+          imported:
+            type: boolean
           name:
             type: string
           user:
             type: string
-          importHarborDb:
-            description: Indicate if an existing database should be importend. (Once set to true you must not change it back)
-            type: boolean
-          resources:
-            $ref: '#/definitions/resources'
+
   teamConfig:
     additionalProperties: false
     patternProperties:

diff --git a/values/harbor/harbor-otomi-db.gotmpl b/values/harbor/harbor-otomi-db.gotmpl
@@ -1,12 +1,13 @@
 {{- $v := .Values }}
-{{- $h := $v.databases.harbor }}
+{{- $hdb := $v.databases.harbor }}
 {{- $cnpg := $v.apps.cnpg }}
 {{- $sp := $cnpg.storage }}
 {{- $b := $v.platformBackups.database.harbor }}
 
-name: {{ $h.name }}
+name: {{ $hdb.name }}
 storage:
-  size: {{ $h.size }}
+  size: {{ $hdb.size }}
+instances: {{ $hdb.replicas }}
 
 {{- if $b.enabled }}
 backup:
@@ -31,24 +32,24 @@ backup:
 {{- end }}
 
 
-{{- if $h.importHarborDb }}
+{{- if $hdb.imported }}
 clusterSpec:
   bootstrap:
     initdb:
-      database: {{ $h.coreDatabase }}
-      owner: {{ $h.user }}
+      database: {{ $hdb.coreDatabase }}
+      owner: {{ $hdb.user }}
       import:
         type: microservice
         databases:
-          - {{ $h.coreDatabase }}
+          - {{ $hdb.coreDatabase }}
         source:
           externalCluster: harbor-database
   externalClusters:
   - name: harbor-database
     connectionParameters:
       host: harbor-database.harbor.svc.cluster.local
       user: postgres
-      dbname: {{ $h.coreDatabase }}
+      dbname: {{ $hdb.coreDatabase }}
       sslmode: disable
     password:
       name: harbor-database
@@ -57,15 +58,15 @@ clusterSpec:
 clusterSpec:  
   bootstrap:
     initdb:
-      database: {{ $h.coreDatabase }}
-      owner: {{ $h.user }}
+      database: {{ $hdb.coreDatabase }}
+      owner: {{ $hdb.user }}
       localeCollate: 'en_US.UTF-8'
       localeCType: 'en_US.UTF-8'
 {{- end }}
 
 
 resources:
-  {{- with $h | get "resources" nil }}
+  {{- with $hdb | get "resources" nil }}
   {{- toYaml . | nindent 6 }}
   {{- else }}
   limits:

diff --git a/values/harbor/harbor.gotmpl b/values/harbor/harbor.gotmpl
@@ -65,49 +65,14 @@ core:
   xsrfKey: {{ $h | get "core.xsrfKey" nil }}
 
 database:
-  type: {{ $db.type }}
-  {{- if eq $db.type "internal" }}
-  internal:
-    priorityClassName: otomi-critical
-    image:
-      tag: {{ $tag }}
-    initContainer:
-      migrator:
-        resources:
-          limits:
-            cpu: 100m
-            memory: 512Mi
-          requests:
-            cpu: 50m
-            memory: 256Mi
-      permissions:
-        resources:
-          limits:
-            cpu: 100m
-            memory: 512Mi
-          requests:
-            cpu: 50m
-            memory: 256Mi
-    resources:
-      {{- with $db | get "resources" nil }}
-      {{- toYaml . | nindent 6 }}
-      {{- else }}
-      limits:
-        cpu: 100m
-        memory: 512Mi
-      requests:
-        cpu: 50m
-        memory: 256Mi
-      {{- end }}
-  {{- else }}
+  type: external
   external:
     # erase default password value from the Harbor Helm chart
     password: null
-    coreDatbase: {{ $db.coreDatabase }}
+    coreDatabase: {{ $db.coreDatabase }}
     username: {{ $db.user }}
     host: {{ $databaseHost }}
     existingSecret: {{ $databaseExistingSecret }}
-  {{- end }}
   podAnnotations:
     # this exception allows the chmod fix to pass, which needs root access:
     policy.otomi.io/ignore.data-migrator: psp-allowed-users

diff --git a/values/jobs/harbor-backup.gotmpl b/values/jobs/harbor-backup.gotmpl