fix: track harbor generated secrets by flux (#3051)

* fix: track harbor generated secrets by flux * chore: PR feedback Co-authored-by: Jimmi Dyson <[email protected]> --------- Co-authored-by: Jimmi Dyson <[email protected]>
mesosphere · Jan 23, 2025 · 18c2b91 · 18c2b91
1 parent 57c85b2
commit 18c2b91
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 5 deletions.
diff --git a/services/harbor/1.16.0/pre-install/kustomization.yaml b/services/harbor/1.16.0/pre-install/kustomization.yaml
@@ -1,4 +1,5 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- pre-install-jobs.yaml
+  - secrets.yaml
+  - pre-install-jobs.yaml
diff --git a/services/harbor/1.16.0/pre-install/pre-install-jobs.yaml b/services/harbor/1.16.0/pre-install/pre-install-jobs.yaml
@@ -85,8 +85,11 @@ spec:
               SECRET_NAME="harbor-admin-password"
 
               if kubectl get secret -n ncr-system "$SECRET_NAME" ; then
-                echo "$SECRET_NAME secret exists"
-                exit 0
+                EXISTING_PASSWORD="$(kubectl get secret -n ncr-system $SECRET_NAME -o jsonpath='{.data.HARBOR_ADMIN_PASSWORD}')"
+                if [ ! -z "$EXISTING_PASSWORD" ]; then
+                  echo "$SECRET_NAME secret with password exists"
+                  exit 0
+                fi
               fi
 
               kubectl create secret generic -n ncr-system "$SECRET_NAME" -oyaml --dry-run=client \
@@ -109,8 +112,11 @@ spec:
               SECRET_NAME="harbor-valkey-password"
 
               if kubectl get secret -n ncr-system "$SECRET_NAME" ; then
-                echo "$SECRET_NAME secret exists"
-                exit 0
+                EXISTING_PASSWORD="$(kubectl get secret -n ncr-system $SECRET_NAME -o jsonpath='{.data.REDIS_PASSWORD}')"
+                if [ ! -z "$EXISTING_PASSWORD" ]; then
+                  echo "$SECRET_NAME secret with password exists"
+                  exit 0
+                fi
               fi
 
               kubectl create secret generic -n ncr-system "$SECRET_NAME" -oyaml --dry-run=client \

diff --git a/services/harbor/1.16.0/pre-install/secrets.yaml b/services/harbor/1.16.0/pre-install/secrets.yaml
@@ -0,0 +1,14 @@
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: harbor-admin-password
+  namespace: ncr-system
+type: Opaque
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: harbor-valkey-password
+  namespace: ncr-system
+type: Opaque