feat: convert many

clusters/cl01tl/helm/harbor/templates/_helpers.tpl

@@ -0,0 +1,14 @@
+{{/*
+Common labels
+*/}}
+{{- define "custom.labels" -}}
+{{ include "custom.selectorLabels" $ }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "custom.selectorLabels" -}}
+app.kubernetes.io/instance: {{ .Release.Name }}
+app.kubernetes.io/part-of: {{ .Release.Name }}
+{{- end }}

clusters/cl01tl/helm/harbor/templates/external-secret.yaml

@@ -5,12 +5,11 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: harbor-secret
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/part-of: {{ .Release.Name }}
+    {{- include "custom.labels" . | nindent 4 }}
 spec:
   secretStoreRef:
     kind: ClusterSecretStore
-    name: vault
+    name: openbao
   data:
     - secretKey: HARBOR_ADMIN_PASSWORD
       remoteRef:
@@ -18,12 +17,12 @@ spec:
         property: admin-password
     - secretKey: secretKey
       remoteRef:
-        key: /cl01tl/harbor/config
-        property: secretKey
+        key: /cl01tl/harbor/key
+        property: secret-key
     - secretKey: CSRF_KEY
       remoteRef:
-        key: /cl01tl/harbor/core
-        property: CSRF_KEY
+        key: /cl01tl/harbor/key
+        property: csrf-key
     - secretKey: secret
       remoteRef:
         key: /cl01tl/harbor/core
@@ -39,24 +38,20 @@ spec:
     - secretKey: JOBSERVICE_SECRET
       remoteRef:
         key: /cl01tl/harbor/jobservice
-        property: JOBSERVICE_SECRET
+        property: secret
     - secretKey: REGISTRY_HTTP_SECRET
       remoteRef:
         key: /cl01tl/harbor/registry
-        property: REGISTRY_HTTP_SECRET
-    - secretKey: REGISTRY_REDIS_PASSWORD
-      remoteRef:
-        key: /cl01tl/harbor/registry
-        property: REGISTRY_REDIS_PASSWORD
+        property: http-secret
     - secretKey: REGISTRY_HTPASSWD
       remoteRef:
         key: /cl01tl/harbor/registry
-        property: REGISTRY_HTPASSWD
+        property: ht-passwd
     - secretKey: REGISTRY_CREDENTIAL_PASSWORD
       remoteRef:
         key: /cl01tl/harbor/registry
-        property: REGISTRY_CREDENTIAL_PASSWORD
+        property: credential-password
     - secretKey: REGISTRY_PASSWD
       remoteRef:
         key: /cl01tl/harbor/registry
-        property: REGISTRY_CREDENTIAL_PASSWORD
+        property: credential-password

clusters/cl01tl/helm/harbor/values.yaml

@@ -5,10 +5,10 @@ harbor:
       enabled: false
     route:
       parentRefs:
-        - group: gateway.networking.k8s.io
-          kind: Gateway
-          name: traefik-gateway
-          namespace: traefik
+        group: gateway.networking.k8s.io
+        kind: Gateway
+        name: traefik-gateway
+        namespace: traefik
       hosts:
         - harbor.alexlebens.net
   externalURL: https://harbor.alexlebens.net