feat: Move cloudnative-pg under harbor (#3013)

* feat: Move cloudnative-pg under harbor * build: Updated .github/service-labeler.yaml --------- Co-authored-by: d2iq-mergebot <[email protected]>
mesosphere · Jan 15, 2025 · 6bfad21 · 6bfad21
1 parent dd6a1a9
commit 6bfad21
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 19 deletions.
diff --git a/.github/service-labeler.yaml b/.github/service-labeler.yaml
@@ -18,10 +18,6 @@ services/chartmuseum:
 - changed-files:
   - any-glob-to-any-file:
     - services/chartmuseum/**
-services/cloudnative-pg:
-- changed-files:
-  - any-glob-to-any-file:
-    - services/cloudnative-pg/**
 services/dex:
 - changed-files:
   - any-glob-to-any-file:

diff --git a/services/cloudnative-pg/0.23.0/defaults/kustomization.yaml b/services/cloudnative-pg/0.23.0/defaults/kustomization.yaml
diff --git a/services/cloudnative-pg/metadata.yaml b/services/cloudnative-pg/metadata.yaml
diff --git a/services/harbor/1.16.0/cloudnative-pg.yaml b/services/harbor/1.16.0/cloudnative-pg.yaml
@@ -0,0 +1,26 @@
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
+metadata:
+  name: cloudnative-pg
+  namespace: ${releaseNamespace}
+spec:
+  force: false
+  prune: true
+  wait: true
+  interval: 6h
+  retryInterval: 1m
+  path: ./services/harbor/1.16.0/cloudnative-pg
+  sourceRef:
+    kind: GitRepository
+    name: management
+    namespace: kommander-flux
+  timeout: 1m
+  postBuild:
+    substituteFrom:
+      - kind: ConfigMap
+        name: substitution-vars
+  healthChecks:
+    - apiVersion: helm.toolkit.fluxcd.io/v2
+      kind: HelmRelease
+      name: cloudnative-pg
+      namespace: ${releaseNamespace}
diff --git a/...cloudnative-pg/0.23.0/cloudnative-pg.yaml → ...1.16.0/cloudnative-pg/cloudnative-pg.yaml b/...cloudnative-pg/0.23.0/cloudnative-pg.yaml → ...1.16.0/cloudnative-pg/cloudnative-pg.yaml
diff --git a/.../cloudnative-pg/0.23.0/kustomization.yaml → .../1.16.0/cloudnative-pg/kustomization.yaml b/.../cloudnative-pg/0.23.0/kustomization.yaml → .../1.16.0/cloudnative-pg/kustomization.yaml
diff --git a/services/harbor/1.16.0/database.yaml b/services/harbor/1.16.0/database.yaml
@@ -27,7 +27,7 @@ spec:
       kind: HelmRelease
       name: harbor-database
       namespace: ${releaseNamespace}
-    - apiVersion: postgresql.cnpg.io
+    - apiVersion: postgresql.cnpg.io/v1
       kind: Cluster
       name: harbor-database-cluster
       namespace: ${releaseNamespace}
diff --git a/...es/cloudnative-pg/0.23.0/defaults/cm.yaml → ...arbor/1.16.0/defaults/cloudnative-pg.yaml b/...es/cloudnative-pg/0.23.0/defaults/cm.yaml → ...arbor/1.16.0/defaults/cloudnative-pg.yaml
diff --git a/services/harbor/1.16.0/defaults/kustomization.yaml b/services/harbor/1.16.0/defaults/kustomization.yaml
@@ -3,3 +3,4 @@ kind: Kustomization
 resources:
   - harbor.yaml
   - database.yaml
+  - cloudnative-pg.yaml
diff --git a/services/harbor/1.16.0/kustomization.yaml b/services/harbor/1.16.0/kustomization.yaml
@@ -4,4 +4,5 @@ resources:
   - release.yaml
   - ncr-system-namespace.yaml
   - pre-install.yaml
+  - cloudnative-pg.yaml
   - database.yaml