diff --git a/.github/service-labeler.yaml b/.github/service-labeler.yaml index 05b9b55a4c..3eeb06c388 100644 --- 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 deleted file mode 100644 index fc857539dc..0000000000 --- a/services/cloudnative-pg/0.23.0/defaults/kustomization.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: -- cm.yaml diff --git a/services/cloudnative-pg/metadata.yaml b/services/cloudnative-pg/metadata.yaml deleted file mode 100644 index b2e481e6e9..0000000000 --- a/services/cloudnative-pg/metadata.yaml +++ /dev/null @@ -1,9 +0,0 @@ -type: internal -scope: - - workspace -licensing: - - Starter - - Pro - - Ultimate - - Essentials - - Enterprise diff --git a/services/harbor/1.16.0/cloudnative-pg.yaml b/services/harbor/1.16.0/cloudnative-pg.yaml new file mode 100644 index 0000000000..ce67d23e93 --- /dev/null +++ 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/services/cloudnative-pg/0.23.0/cloudnative-pg.yaml b/services/harbor/1.16.0/cloudnative-pg/cloudnative-pg.yaml similarity index 100% rename from services/cloudnative-pg/0.23.0/cloudnative-pg.yaml rename to services/harbor/1.16.0/cloudnative-pg/cloudnative-pg.yaml diff --git a/services/cloudnative-pg/0.23.0/kustomization.yaml b/services/harbor/1.16.0/cloudnative-pg/kustomization.yaml similarity index 100% rename from services/cloudnative-pg/0.23.0/kustomization.yaml rename to services/harbor/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 index 0a759cb2ee..9efd3283b9 100644 --- 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/services/cloudnative-pg/0.23.0/defaults/cm.yaml b/services/harbor/1.16.0/defaults/cloudnative-pg.yaml similarity index 100% rename from services/cloudnative-pg/0.23.0/defaults/cm.yaml rename to services/harbor/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 index bc91e7e7f7..8b6f5c1483 100644 --- 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 index 2face1db09..bd6db5a7f2 100644 --- 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