fix: Split CNP operator from CNP cluster to fix CRD dependency
All checks were successful
Deploy Cluster / Terraform (push) Successful in 35s
Deploy Cluster / Ansible (push) Successful in 5m0s

- Move CNP operator HelmRelease to cnpg-operator folder
- Create addon-cnpg-operator kustomization (deploys operator first)
- Update addon-cnpg to dependOn addon-cnpg-operator
- Add addon-cnpg as dependency for addon-rancher (needs database)
This commit is contained in:
2026-03-26 00:06:34 +00:00
parent ef3fb2489a
commit 13627bf81f
8 changed files with 25 additions and 3 deletions

View File

@@ -0,0 +1,5 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- helmrepository-cnpg.yaml
- helmrelease-cnpg.yaml

View File

@@ -1,8 +1,6 @@
apiVersion: kustomize.config.k8s.io/v1beta1 apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization kind: Kustomization
resources: resources:
- helmrepository-cnpg.yaml
- helmrelease-cnpg.yaml
- namespace.yaml - namespace.yaml
- b2-credentials-externalsecret.yaml - b2-credentials-externalsecret.yaml
- rancher-db-password-externalsecret.yaml - rancher-db-password-externalsecret.yaml

View File

@@ -0,0 +1,15 @@
apiVersion: kustomize.toolkit.fluxcd.io/v1
kind: Kustomization
metadata:
name: addon-cnpg-operator
namespace: flux-system
spec:
interval: 10m
prune: true
sourceRef:
kind: GitRepository
name: platform
path: ./infrastructure/addons/cnpg-operator
wait: true
timeout: 10m
suspend: false

View File

@@ -12,4 +12,6 @@ spec:
path: ./infrastructure/addons/cnpg path: ./infrastructure/addons/cnpg
wait: true wait: true
timeout: 10m timeout: 10m
suspend: false suspend: false
dependsOn:
- name: addon-cnpg-operator

View File

@@ -16,3 +16,4 @@ spec:
dependsOn: dependsOn:
- name: addon-tailscale-operator - name: addon-tailscale-operator
- name: addon-tailscale-proxyclass - name: addon-tailscale-proxyclass
- name: addon-cnpg

View File

@@ -11,5 +11,6 @@ resources:
- kustomization-observability.yaml - kustomization-observability.yaml
- kustomization-observability-content.yaml - kustomization-observability-content.yaml
- kustomization-lpp.yaml - kustomization-lpp.yaml
- kustomization-cnpg-operator.yaml
- kustomization-cnpg.yaml - kustomization-cnpg.yaml
- kustomization-rancher.yaml - kustomization-rancher.yaml