From b359cc956048ce88df7d3a83807487782dd5b0bf Mon Sep 17 00:00:00 2001 From: Julia McGhee Date: Fri, 20 Mar 2026 18:43:01 +0000 Subject: [PATCH] Separate CRD-dependent resources from operator installs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit cert-manager and CloudNativePG operator installs must complete before their custom resources (ClusterIssuer, CNPG Cluster) can be applied. Split into separate kustomize dirs so the ApplicationSet creates independent ArgoCD apps that can sync in order: - platform-cert-manager → installs operator - platform-cert-manager-config → creates ClusterIssuers (after CRDs exist) - platform-cloudnativepg → installs operator - platform-cloudnativepg-cluster → creates PG cluster (after CRDs exist) --- .../clusterissuer-letsencrypt.yaml | 0 .../platform/cert-manager-config/kustomization.yaml | 4 ++++ infra/kubernetes/platform/cert-manager/kustomization.yaml | 1 - .../{cloudnativepg => cloudnativepg-cluster}/cluster.yaml | 0 .../platform/cloudnativepg-cluster/kustomization.yaml | 4 ++++ infra/kubernetes/platform/cloudnativepg/kustomization.yaml | 1 - 6 files changed, 8 insertions(+), 2 deletions(-) rename infra/kubernetes/platform/{cert-manager => cert-manager-config}/clusterissuer-letsencrypt.yaml (100%) create mode 100644 infra/kubernetes/platform/cert-manager-config/kustomization.yaml rename infra/kubernetes/platform/{cloudnativepg => cloudnativepg-cluster}/cluster.yaml (100%) create mode 100644 infra/kubernetes/platform/cloudnativepg-cluster/kustomization.yaml diff --git a/infra/kubernetes/platform/cert-manager/clusterissuer-letsencrypt.yaml b/infra/kubernetes/platform/cert-manager-config/clusterissuer-letsencrypt.yaml similarity index 100% rename from infra/kubernetes/platform/cert-manager/clusterissuer-letsencrypt.yaml rename to infra/kubernetes/platform/cert-manager-config/clusterissuer-letsencrypt.yaml diff --git a/infra/kubernetes/platform/cert-manager-config/kustomization.yaml b/infra/kubernetes/platform/cert-manager-config/kustomization.yaml new file mode 100644 index 0000000..b4aac00 --- /dev/null +++ b/infra/kubernetes/platform/cert-manager-config/kustomization.yaml @@ -0,0 +1,4 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - clusterissuer-letsencrypt.yaml diff --git a/infra/kubernetes/platform/cert-manager/kustomization.yaml b/infra/kubernetes/platform/cert-manager/kustomization.yaml index c2cc64d..0e0a709 100644 --- a/infra/kubernetes/platform/cert-manager/kustomization.yaml +++ b/infra/kubernetes/platform/cert-manager/kustomization.yaml @@ -3,4 +3,3 @@ kind: Kustomization resources: - application.yaml - namespace.yaml - - clusterissuer-letsencrypt.yaml diff --git a/infra/kubernetes/platform/cloudnativepg/cluster.yaml b/infra/kubernetes/platform/cloudnativepg-cluster/cluster.yaml similarity index 100% rename from infra/kubernetes/platform/cloudnativepg/cluster.yaml rename to infra/kubernetes/platform/cloudnativepg-cluster/cluster.yaml diff --git a/infra/kubernetes/platform/cloudnativepg-cluster/kustomization.yaml b/infra/kubernetes/platform/cloudnativepg-cluster/kustomization.yaml new file mode 100644 index 0000000..993fbde --- /dev/null +++ b/infra/kubernetes/platform/cloudnativepg-cluster/kustomization.yaml @@ -0,0 +1,4 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - cluster.yaml diff --git a/infra/kubernetes/platform/cloudnativepg/kustomization.yaml b/infra/kubernetes/platform/cloudnativepg/kustomization.yaml index 07852d1..977dcfe 100644 --- a/infra/kubernetes/platform/cloudnativepg/kustomization.yaml +++ b/infra/kubernetes/platform/cloudnativepg/kustomization.yaml @@ -2,4 +2,3 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - application.yaml - - cluster.yaml