From d5eb4dd62ef921a3b620866c96612befae62383f Mon Sep 17 00:00:00 2001 From: Andrei Kvapil Date: Thu, 4 Apr 2024 12:31:42 +0200 Subject: [PATCH] Move flux to core package and avoid Helm installation (#61) Signed-off-by: Andrei Kvapil --- packages/{system => core}/fluxcd/.helmignore | 0 packages/{system => core}/fluxcd/Chart.yaml | 0 packages/core/fluxcd/Makefile | 13 +++++++++++ .../fluxcd/charts/flux2/.helmignore | 0 .../fluxcd/charts/flux2/Chart.yaml | 0 .../fluxcd/charts/flux2/README.md | 0 .../fluxcd/charts/flux2/templates/_helper.tpl | 0 .../templates/aggregate-clusterroles.yaml | 0 ...cluster-reconciler-clusterrolebinding.yaml | 0 ...r-reconciler-impersonator-clusterrole.yaml | 0 ...ciler-impersonator-clusterrolebinding.yaml | 0 .../templates/crd-controller-clusterrole.yaml | 0 .../crd-controller-clusterrolebinding.yaml | 0 .../flux2/templates/extra-manifests.yaml | 0 .../flux2/templates/helm-controller-sa.yaml | 0 .../flux2/templates/helm-controller.crds.yaml | 0 .../flux2/templates/helm-controller.yaml | 0 .../image-automation-controller-sa.yaml | 0 .../image-automation-controller.crds.yaml | 0 .../image-automation-controller.yaml | 0 .../image-reflector-controller-sa.yaml | 0 .../image-reflector-controller.crds.yaml | 0 .../templates/image-reflector-controller.yaml | 0 .../templates/kustomize-controller-sa.yaml | 0 .../kustomize-controller-secret.yaml | 0 .../templates/kustomize-controller.crds.yaml | 0 .../flux2/templates/kustomize-controller.yaml | 0 .../notification-controller-ingress.yaml | 0 .../templates/notification-controller-sa.yaml | 0 .../notification-controller-service.yaml | 0 ...tification-controller-webhook-service.yaml | 0 .../notification-controller.crds.yaml | 0 .../templates/notification-controller.yaml | 0 .../charts/flux2/templates/podmonitor.yaml | 0 .../charts/flux2/templates/policies.yaml | 0 .../pre-install-job-serviceaccount.yaml | 0 .../flux2/templates/pre-install-job.yaml | 0 .../templates/source-controller-service.yaml | 0 .../source-controller-serviceaccount.yaml | 0 .../templates/source-controller.crds.yaml | 0 .../flux2/templates/source-controller.yaml | 0 .../fluxcd/charts/flux2/values.yaml | 0 packages/core/installer/Makefile | 2 +- packages/core/platform/Makefile | 2 +- .../core/platform/bundles/full-distro.yaml | 6 ----- packages/core/platform/bundles/full-paas.yaml | 6 ----- .../core/platform/bundles/hosted-distro.yaml | 6 ----- .../core/platform/bundles/hosted-paas.yaml | 6 ----- .../core/platform/templates/namespaces.yaml | 2 ++ packages/system/fluxcd/Makefile | 23 ------------------- packages/system/fluxcd/values.yaml | 0 scripts/installer.sh | 7 ++---- scripts/migrations/1 | 10 ++++++++ 53 files changed, 29 insertions(+), 54 deletions(-) rename packages/{system => core}/fluxcd/.helmignore (100%) rename packages/{system => core}/fluxcd/Chart.yaml (100%) create mode 100644 packages/core/fluxcd/Makefile rename packages/{system => core}/fluxcd/charts/flux2/.helmignore (100%) rename packages/{system => core}/fluxcd/charts/flux2/Chart.yaml (100%) rename packages/{system => core}/fluxcd/charts/flux2/README.md (100%) rename packages/{system => core}/fluxcd/charts/flux2/templates/_helper.tpl (100%) rename packages/{system => core}/fluxcd/charts/flux2/templates/aggregate-clusterroles.yaml (100%) rename packages/{system => core}/fluxcd/charts/flux2/templates/cluster-reconciler-clusterrolebinding.yaml (100%) rename packages/{system => core}/fluxcd/charts/flux2/templates/cluster-reconciler-impersonator-clusterrole.yaml (100%) rename packages/{system => core}/fluxcd/charts/flux2/templates/cluster-reconciler-impersonator-clusterrolebinding.yaml (100%) rename packages/{system => core}/fluxcd/charts/flux2/templates/crd-controller-clusterrole.yaml (100%) rename packages/{system => core}/fluxcd/charts/flux2/templates/crd-controller-clusterrolebinding.yaml (100%) rename packages/{system => core}/fluxcd/charts/flux2/templates/extra-manifests.yaml (100%) rename packages/{system => core}/fluxcd/charts/flux2/templates/helm-controller-sa.yaml (100%) rename packages/{system => core}/fluxcd/charts/flux2/templates/helm-controller.crds.yaml (100%) rename packages/{system => core}/fluxcd/charts/flux2/templates/helm-controller.yaml (100%) rename packages/{system => core}/fluxcd/charts/flux2/templates/image-automation-controller-sa.yaml (100%) rename packages/{system => core}/fluxcd/charts/flux2/templates/image-automation-controller.crds.yaml (100%) rename packages/{system => core}/fluxcd/charts/flux2/templates/image-automation-controller.yaml (100%) rename packages/{system => core}/fluxcd/charts/flux2/templates/image-reflector-controller-sa.yaml (100%) rename packages/{system => core}/fluxcd/charts/flux2/templates/image-reflector-controller.crds.yaml (100%) rename packages/{system => core}/fluxcd/charts/flux2/templates/image-reflector-controller.yaml (100%) rename packages/{system => core}/fluxcd/charts/flux2/templates/kustomize-controller-sa.yaml (100%) rename packages/{system => core}/fluxcd/charts/flux2/templates/kustomize-controller-secret.yaml (100%) rename packages/{system => core}/fluxcd/charts/flux2/templates/kustomize-controller.crds.yaml (100%) rename packages/{system => core}/fluxcd/charts/flux2/templates/kustomize-controller.yaml (100%) rename packages/{system => core}/fluxcd/charts/flux2/templates/notification-controller-ingress.yaml (100%) rename packages/{system => core}/fluxcd/charts/flux2/templates/notification-controller-sa.yaml (100%) rename packages/{system => core}/fluxcd/charts/flux2/templates/notification-controller-service.yaml (100%) rename packages/{system => core}/fluxcd/charts/flux2/templates/notification-controller-webhook-service.yaml (100%) rename packages/{system => core}/fluxcd/charts/flux2/templates/notification-controller.crds.yaml (100%) rename packages/{system => core}/fluxcd/charts/flux2/templates/notification-controller.yaml (100%) rename packages/{system => core}/fluxcd/charts/flux2/templates/podmonitor.yaml (100%) rename packages/{system => core}/fluxcd/charts/flux2/templates/policies.yaml (100%) rename packages/{system => core}/fluxcd/charts/flux2/templates/pre-install-job-serviceaccount.yaml (100%) rename packages/{system => core}/fluxcd/charts/flux2/templates/pre-install-job.yaml (100%) rename packages/{system => core}/fluxcd/charts/flux2/templates/source-controller-service.yaml (100%) rename packages/{system => core}/fluxcd/charts/flux2/templates/source-controller-serviceaccount.yaml (100%) rename packages/{system => core}/fluxcd/charts/flux2/templates/source-controller.crds.yaml (100%) rename packages/{system => core}/fluxcd/charts/flux2/templates/source-controller.yaml (100%) rename packages/{system => core}/fluxcd/charts/flux2/values.yaml (100%) delete mode 100644 packages/system/fluxcd/Makefile delete mode 100644 packages/system/fluxcd/values.yaml diff --git a/packages/system/fluxcd/.helmignore b/packages/core/fluxcd/.helmignore similarity index 100% rename from packages/system/fluxcd/.helmignore rename to packages/core/fluxcd/.helmignore diff --git a/packages/system/fluxcd/Chart.yaml b/packages/core/fluxcd/Chart.yaml similarity index 100% rename from packages/system/fluxcd/Chart.yaml rename to packages/core/fluxcd/Chart.yaml diff --git a/packages/core/fluxcd/Makefile b/packages/core/fluxcd/Makefile new file mode 100644 index 00000000..ad2c9fa5 --- /dev/null +++ b/packages/core/fluxcd/Makefile @@ -0,0 +1,13 @@ +NAMESPACE=cozy-fluxcd +NAME=fluxcd + +API_VERSIONS_FLAGS=$(addprefix -a ,$(shell kubectl api-versions)) + +show: + helm template -n $(NAMESPACE) $(NAME) . --no-hooks --dry-run=server $(API_VERSIONS_FLAGS) + +apply: + helm template -n $(NAMESPACE) $(NAME) . --no-hooks --dry-run=server $(API_VERSIONS_FLAGS) | kubectl apply -n $(NAMESPACE) -f- + +diff: + helm template -n $(NAMESPACE) $(NAME) . --no-hooks --dry-run=server $(API_VERSIONS_FLAGS) | kubectl diff -n $(NAMESPACE) -f- diff --git a/packages/system/fluxcd/charts/flux2/.helmignore b/packages/core/fluxcd/charts/flux2/.helmignore similarity index 100% rename from packages/system/fluxcd/charts/flux2/.helmignore rename to packages/core/fluxcd/charts/flux2/.helmignore diff --git a/packages/system/fluxcd/charts/flux2/Chart.yaml b/packages/core/fluxcd/charts/flux2/Chart.yaml similarity index 100% rename from packages/system/fluxcd/charts/flux2/Chart.yaml rename to packages/core/fluxcd/charts/flux2/Chart.yaml diff --git a/packages/system/fluxcd/charts/flux2/README.md b/packages/core/fluxcd/charts/flux2/README.md similarity index 100% rename from packages/system/fluxcd/charts/flux2/README.md rename to packages/core/fluxcd/charts/flux2/README.md diff --git a/packages/system/fluxcd/charts/flux2/templates/_helper.tpl b/packages/core/fluxcd/charts/flux2/templates/_helper.tpl similarity index 100% rename from packages/system/fluxcd/charts/flux2/templates/_helper.tpl rename to packages/core/fluxcd/charts/flux2/templates/_helper.tpl diff --git a/packages/system/fluxcd/charts/flux2/templates/aggregate-clusterroles.yaml b/packages/core/fluxcd/charts/flux2/templates/aggregate-clusterroles.yaml similarity index 100% rename from packages/system/fluxcd/charts/flux2/templates/aggregate-clusterroles.yaml rename to packages/core/fluxcd/charts/flux2/templates/aggregate-clusterroles.yaml diff --git a/packages/system/fluxcd/charts/flux2/templates/cluster-reconciler-clusterrolebinding.yaml b/packages/core/fluxcd/charts/flux2/templates/cluster-reconciler-clusterrolebinding.yaml similarity index 100% rename from packages/system/fluxcd/charts/flux2/templates/cluster-reconciler-clusterrolebinding.yaml rename to packages/core/fluxcd/charts/flux2/templates/cluster-reconciler-clusterrolebinding.yaml diff --git a/packages/system/fluxcd/charts/flux2/templates/cluster-reconciler-impersonator-clusterrole.yaml b/packages/core/fluxcd/charts/flux2/templates/cluster-reconciler-impersonator-clusterrole.yaml similarity index 100% rename from packages/system/fluxcd/charts/flux2/templates/cluster-reconciler-impersonator-clusterrole.yaml rename to packages/core/fluxcd/charts/flux2/templates/cluster-reconciler-impersonator-clusterrole.yaml diff --git a/packages/system/fluxcd/charts/flux2/templates/cluster-reconciler-impersonator-clusterrolebinding.yaml b/packages/core/fluxcd/charts/flux2/templates/cluster-reconciler-impersonator-clusterrolebinding.yaml similarity index 100% rename from packages/system/fluxcd/charts/flux2/templates/cluster-reconciler-impersonator-clusterrolebinding.yaml rename to packages/core/fluxcd/charts/flux2/templates/cluster-reconciler-impersonator-clusterrolebinding.yaml diff --git a/packages/system/fluxcd/charts/flux2/templates/crd-controller-clusterrole.yaml b/packages/core/fluxcd/charts/flux2/templates/crd-controller-clusterrole.yaml similarity index 100% rename from packages/system/fluxcd/charts/flux2/templates/crd-controller-clusterrole.yaml rename to packages/core/fluxcd/charts/flux2/templates/crd-controller-clusterrole.yaml diff --git a/packages/system/fluxcd/charts/flux2/templates/crd-controller-clusterrolebinding.yaml b/packages/core/fluxcd/charts/flux2/templates/crd-controller-clusterrolebinding.yaml similarity index 100% rename from packages/system/fluxcd/charts/flux2/templates/crd-controller-clusterrolebinding.yaml rename to packages/core/fluxcd/charts/flux2/templates/crd-controller-clusterrolebinding.yaml diff --git a/packages/system/fluxcd/charts/flux2/templates/extra-manifests.yaml b/packages/core/fluxcd/charts/flux2/templates/extra-manifests.yaml similarity index 100% rename from packages/system/fluxcd/charts/flux2/templates/extra-manifests.yaml rename to packages/core/fluxcd/charts/flux2/templates/extra-manifests.yaml diff --git a/packages/system/fluxcd/charts/flux2/templates/helm-controller-sa.yaml b/packages/core/fluxcd/charts/flux2/templates/helm-controller-sa.yaml similarity index 100% rename from packages/system/fluxcd/charts/flux2/templates/helm-controller-sa.yaml rename to packages/core/fluxcd/charts/flux2/templates/helm-controller-sa.yaml diff --git a/packages/system/fluxcd/charts/flux2/templates/helm-controller.crds.yaml b/packages/core/fluxcd/charts/flux2/templates/helm-controller.crds.yaml similarity index 100% rename from packages/system/fluxcd/charts/flux2/templates/helm-controller.crds.yaml rename to packages/core/fluxcd/charts/flux2/templates/helm-controller.crds.yaml diff --git a/packages/system/fluxcd/charts/flux2/templates/helm-controller.yaml b/packages/core/fluxcd/charts/flux2/templates/helm-controller.yaml similarity index 100% rename from packages/system/fluxcd/charts/flux2/templates/helm-controller.yaml rename to packages/core/fluxcd/charts/flux2/templates/helm-controller.yaml diff --git a/packages/system/fluxcd/charts/flux2/templates/image-automation-controller-sa.yaml b/packages/core/fluxcd/charts/flux2/templates/image-automation-controller-sa.yaml similarity index 100% rename from packages/system/fluxcd/charts/flux2/templates/image-automation-controller-sa.yaml rename to packages/core/fluxcd/charts/flux2/templates/image-automation-controller-sa.yaml diff --git a/packages/system/fluxcd/charts/flux2/templates/image-automation-controller.crds.yaml b/packages/core/fluxcd/charts/flux2/templates/image-automation-controller.crds.yaml similarity index 100% rename from packages/system/fluxcd/charts/flux2/templates/image-automation-controller.crds.yaml rename to packages/core/fluxcd/charts/flux2/templates/image-automation-controller.crds.yaml diff --git a/packages/system/fluxcd/charts/flux2/templates/image-automation-controller.yaml b/packages/core/fluxcd/charts/flux2/templates/image-automation-controller.yaml similarity index 100% rename from packages/system/fluxcd/charts/flux2/templates/image-automation-controller.yaml rename to packages/core/fluxcd/charts/flux2/templates/image-automation-controller.yaml diff --git a/packages/system/fluxcd/charts/flux2/templates/image-reflector-controller-sa.yaml b/packages/core/fluxcd/charts/flux2/templates/image-reflector-controller-sa.yaml similarity index 100% rename from packages/system/fluxcd/charts/flux2/templates/image-reflector-controller-sa.yaml rename to packages/core/fluxcd/charts/flux2/templates/image-reflector-controller-sa.yaml diff --git a/packages/system/fluxcd/charts/flux2/templates/image-reflector-controller.crds.yaml b/packages/core/fluxcd/charts/flux2/templates/image-reflector-controller.crds.yaml similarity index 100% rename from packages/system/fluxcd/charts/flux2/templates/image-reflector-controller.crds.yaml rename to packages/core/fluxcd/charts/flux2/templates/image-reflector-controller.crds.yaml diff --git a/packages/system/fluxcd/charts/flux2/templates/image-reflector-controller.yaml b/packages/core/fluxcd/charts/flux2/templates/image-reflector-controller.yaml similarity index 100% rename from packages/system/fluxcd/charts/flux2/templates/image-reflector-controller.yaml rename to packages/core/fluxcd/charts/flux2/templates/image-reflector-controller.yaml diff --git a/packages/system/fluxcd/charts/flux2/templates/kustomize-controller-sa.yaml b/packages/core/fluxcd/charts/flux2/templates/kustomize-controller-sa.yaml similarity index 100% rename from packages/system/fluxcd/charts/flux2/templates/kustomize-controller-sa.yaml rename to packages/core/fluxcd/charts/flux2/templates/kustomize-controller-sa.yaml diff --git a/packages/system/fluxcd/charts/flux2/templates/kustomize-controller-secret.yaml b/packages/core/fluxcd/charts/flux2/templates/kustomize-controller-secret.yaml similarity index 100% rename from packages/system/fluxcd/charts/flux2/templates/kustomize-controller-secret.yaml rename to packages/core/fluxcd/charts/flux2/templates/kustomize-controller-secret.yaml diff --git a/packages/system/fluxcd/charts/flux2/templates/kustomize-controller.crds.yaml b/packages/core/fluxcd/charts/flux2/templates/kustomize-controller.crds.yaml similarity index 100% rename from packages/system/fluxcd/charts/flux2/templates/kustomize-controller.crds.yaml rename to packages/core/fluxcd/charts/flux2/templates/kustomize-controller.crds.yaml diff --git a/packages/system/fluxcd/charts/flux2/templates/kustomize-controller.yaml b/packages/core/fluxcd/charts/flux2/templates/kustomize-controller.yaml similarity index 100% rename from packages/system/fluxcd/charts/flux2/templates/kustomize-controller.yaml rename to packages/core/fluxcd/charts/flux2/templates/kustomize-controller.yaml diff --git a/packages/system/fluxcd/charts/flux2/templates/notification-controller-ingress.yaml b/packages/core/fluxcd/charts/flux2/templates/notification-controller-ingress.yaml similarity index 100% rename from packages/system/fluxcd/charts/flux2/templates/notification-controller-ingress.yaml rename to packages/core/fluxcd/charts/flux2/templates/notification-controller-ingress.yaml diff --git a/packages/system/fluxcd/charts/flux2/templates/notification-controller-sa.yaml b/packages/core/fluxcd/charts/flux2/templates/notification-controller-sa.yaml similarity index 100% rename from packages/system/fluxcd/charts/flux2/templates/notification-controller-sa.yaml rename to packages/core/fluxcd/charts/flux2/templates/notification-controller-sa.yaml diff --git a/packages/system/fluxcd/charts/flux2/templates/notification-controller-service.yaml b/packages/core/fluxcd/charts/flux2/templates/notification-controller-service.yaml similarity index 100% rename from packages/system/fluxcd/charts/flux2/templates/notification-controller-service.yaml rename to packages/core/fluxcd/charts/flux2/templates/notification-controller-service.yaml diff --git a/packages/system/fluxcd/charts/flux2/templates/notification-controller-webhook-service.yaml b/packages/core/fluxcd/charts/flux2/templates/notification-controller-webhook-service.yaml similarity index 100% rename from packages/system/fluxcd/charts/flux2/templates/notification-controller-webhook-service.yaml rename to packages/core/fluxcd/charts/flux2/templates/notification-controller-webhook-service.yaml diff --git a/packages/system/fluxcd/charts/flux2/templates/notification-controller.crds.yaml b/packages/core/fluxcd/charts/flux2/templates/notification-controller.crds.yaml similarity index 100% rename from packages/system/fluxcd/charts/flux2/templates/notification-controller.crds.yaml rename to packages/core/fluxcd/charts/flux2/templates/notification-controller.crds.yaml diff --git a/packages/system/fluxcd/charts/flux2/templates/notification-controller.yaml b/packages/core/fluxcd/charts/flux2/templates/notification-controller.yaml similarity index 100% rename from packages/system/fluxcd/charts/flux2/templates/notification-controller.yaml rename to packages/core/fluxcd/charts/flux2/templates/notification-controller.yaml diff --git a/packages/system/fluxcd/charts/flux2/templates/podmonitor.yaml b/packages/core/fluxcd/charts/flux2/templates/podmonitor.yaml similarity index 100% rename from packages/system/fluxcd/charts/flux2/templates/podmonitor.yaml rename to packages/core/fluxcd/charts/flux2/templates/podmonitor.yaml diff --git a/packages/system/fluxcd/charts/flux2/templates/policies.yaml b/packages/core/fluxcd/charts/flux2/templates/policies.yaml similarity index 100% rename from packages/system/fluxcd/charts/flux2/templates/policies.yaml rename to packages/core/fluxcd/charts/flux2/templates/policies.yaml diff --git a/packages/system/fluxcd/charts/flux2/templates/pre-install-job-serviceaccount.yaml b/packages/core/fluxcd/charts/flux2/templates/pre-install-job-serviceaccount.yaml similarity index 100% rename from packages/system/fluxcd/charts/flux2/templates/pre-install-job-serviceaccount.yaml rename to packages/core/fluxcd/charts/flux2/templates/pre-install-job-serviceaccount.yaml diff --git a/packages/system/fluxcd/charts/flux2/templates/pre-install-job.yaml b/packages/core/fluxcd/charts/flux2/templates/pre-install-job.yaml similarity index 100% rename from packages/system/fluxcd/charts/flux2/templates/pre-install-job.yaml rename to packages/core/fluxcd/charts/flux2/templates/pre-install-job.yaml diff --git a/packages/system/fluxcd/charts/flux2/templates/source-controller-service.yaml b/packages/core/fluxcd/charts/flux2/templates/source-controller-service.yaml similarity index 100% rename from packages/system/fluxcd/charts/flux2/templates/source-controller-service.yaml rename to packages/core/fluxcd/charts/flux2/templates/source-controller-service.yaml diff --git a/packages/system/fluxcd/charts/flux2/templates/source-controller-serviceaccount.yaml b/packages/core/fluxcd/charts/flux2/templates/source-controller-serviceaccount.yaml similarity index 100% rename from packages/system/fluxcd/charts/flux2/templates/source-controller-serviceaccount.yaml rename to packages/core/fluxcd/charts/flux2/templates/source-controller-serviceaccount.yaml diff --git a/packages/system/fluxcd/charts/flux2/templates/source-controller.crds.yaml b/packages/core/fluxcd/charts/flux2/templates/source-controller.crds.yaml similarity index 100% rename from packages/system/fluxcd/charts/flux2/templates/source-controller.crds.yaml rename to packages/core/fluxcd/charts/flux2/templates/source-controller.crds.yaml diff --git a/packages/system/fluxcd/charts/flux2/templates/source-controller.yaml b/packages/core/fluxcd/charts/flux2/templates/source-controller.yaml similarity index 100% rename from packages/system/fluxcd/charts/flux2/templates/source-controller.yaml rename to packages/core/fluxcd/charts/flux2/templates/source-controller.yaml diff --git a/packages/system/fluxcd/charts/flux2/values.yaml b/packages/core/fluxcd/charts/flux2/values.yaml similarity index 100% rename from packages/system/fluxcd/charts/flux2/values.yaml rename to packages/core/fluxcd/charts/flux2/values.yaml diff --git a/packages/core/installer/Makefile b/packages/core/installer/Makefile index 174c76ed..71369889 100644 --- a/packages/core/installer/Makefile +++ b/packages/core/installer/Makefile @@ -1,4 +1,4 @@ -NAMESPACE=cozy-installer +NAMESPACE=cozy-system NAME=installer PUSH := 1 LOAD := 0 diff --git a/packages/core/platform/Makefile b/packages/core/platform/Makefile index 53709ee4..765ae18d 100644 --- a/packages/core/platform/Makefile +++ b/packages/core/platform/Makefile @@ -13,7 +13,7 @@ namespaces-show: helm template -n $(NAMESPACE) $(NAME) . --dry-run=server $(API_VERSIONS_FLAGS) -s templates/namespaces.yaml namespaces-apply: - helm template -n $(NAMESPACE) $(NAME) . --dry-run=server $(API_VERSIONS_FLAGS) -s templates/namespaces.yaml | kubectl apply -f- + helm template -n $(NAMESPACE) $(NAME) . --dry-run=server $(API_VERSIONS_FLAGS) -s templates/namespaces.yaml | kubectl apply -n $(NAMESPACE) -f- diff: helm template -n $(NAMESPACE) $(NAME) . --dry-run=server $(API_VERSIONS_FLAGS) | kubectl diff -f- diff --git a/packages/core/platform/bundles/full-distro.yaml b/packages/core/platform/bundles/full-distro.yaml index 51a21dd7..78a2d1a5 100644 --- a/packages/core/platform/bundles/full-distro.yaml +++ b/packages/core/platform/bundles/full-distro.yaml @@ -20,12 +20,6 @@ releases: ipv4NativeRoutingCIDR: "{{ index $cozyConfig.data "ipv4-pod-cidr" }}" autoDirectNodeRoutes: true -- name: fluxcd - releaseName: fluxcd - chart: cozy-fluxcd - namespace: cozy-fluxcd - dependsOn: [cilium] - - name: cert-manager releaseName: cert-manager chart: cozy-cert-manager diff --git a/packages/core/platform/bundles/full-paas.yaml b/packages/core/platform/bundles/full-paas.yaml index 4a492f79..0b2f59ac 100644 --- a/packages/core/platform/bundles/full-paas.yaml +++ b/packages/core/platform/bundles/full-paas.yaml @@ -24,12 +24,6 @@ releases: SVC_CIDR: "{{ index $cozyConfig.data "ipv4-svc-cidr" }}" JOIN_CIDR: "{{ index $cozyConfig.data "ipv4-join-cidr" }}" -- name: fluxcd - releaseName: fluxcd - chart: cozy-fluxcd - namespace: cozy-fluxcd - dependsOn: [cilium,kubeovn] - - name: cert-manager releaseName: cert-manager chart: cozy-cert-manager diff --git a/packages/core/platform/bundles/hosted-distro.yaml b/packages/core/platform/bundles/hosted-distro.yaml index 446b0ae2..302cdbee 100644 --- a/packages/core/platform/bundles/hosted-distro.yaml +++ b/packages/core/platform/bundles/hosted-distro.yaml @@ -1,12 +1,6 @@ {{- $cozyConfig := lookup "v1" "ConfigMap" "cozy-system" "cozystack" }} releases: -- name: fluxcd - releaseName: fluxcd - chart: cozy-fluxcd - namespace: cozy-fluxcd - dependsOn: [] - - name: cert-manager releaseName: cert-manager chart: cozy-cert-manager diff --git a/packages/core/platform/bundles/hosted-paas.yaml b/packages/core/platform/bundles/hosted-paas.yaml index a2c17951..c9cad2d3 100644 --- a/packages/core/platform/bundles/hosted-paas.yaml +++ b/packages/core/platform/bundles/hosted-paas.yaml @@ -1,12 +1,6 @@ {{- $cozyConfig := lookup "v1" "ConfigMap" "cozy-system" "cozystack" }} releases: -- name: fluxcd - releaseName: fluxcd - chart: cozy-fluxcd - namespace: cozy-fluxcd - dependsOn: [] - - name: cert-manager releaseName: cert-manager chart: cozy-cert-manager diff --git a/packages/core/platform/templates/namespaces.yaml b/packages/core/platform/templates/namespaces.yaml index c9b7e6ad..ec56871e 100644 --- a/packages/core/platform/templates/namespaces.yaml +++ b/packages/core/platform/templates/namespaces.yaml @@ -14,6 +14,8 @@ {{- end }} {{- end }} +{{- $_ := set $namespaces "cozy-fluxcd" false }} + {{- range $namespace, $privileged := $namespaces }} --- apiVersion: v1 diff --git a/packages/system/fluxcd/Makefile b/packages/system/fluxcd/Makefile deleted file mode 100644 index ef6833a2..00000000 --- a/packages/system/fluxcd/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -NAMESPACE=cozy-fluxcd -NAME=fluxcd - -show: - helm template --dry-run=server -n $(NAMESPACE) $(NAME) . - -apply: - helm upgrade -i -n $(NAMESPACE) $(NAME) . - -apply-crds: - helm template -n $(NAMESPACE) $(NAME) . $(addprefix -s ,$(wildcard charts/flux2/templates/*.crds.yaml)) | kubectl apply -f - - kubectl annotate $$(kubectl get crd -o name | grep '\.fluxcd\.io$$') meta.helm.sh/release-namespace=$(NAMESPACE) meta.helm.sh/release-name=$(NAME) - kubectl label $$(kubectl get crd -o name | grep '\.fluxcd\.io$$') app.kubernetes.io/managed-by=Helm - -diff-crds: - helm template -n $(NAMESPACE) $(NAME) . $(addprefix -s ,$(wildcard charts/flux2/templates/*.crds.yaml)) | kubectl apply -f - - -diff: - helm diff upgrade --allow-unreleased --normalize-manifests -n $(NAMESPACE) $(NAME) . - -update: - rm -rf charts - helm pull oci://ghcr.io/fluxcd-community/charts/flux2 --untar --untardir charts diff --git a/packages/system/fluxcd/values.yaml b/packages/system/fluxcd/values.yaml deleted file mode 100644 index e69de29b..00000000 diff --git a/scripts/installer.sh b/scripts/installer.sh index 3d9b6a44..85c4ba7d 100755 --- a/scripts/installer.sh +++ b/scripts/installer.sh @@ -27,7 +27,6 @@ install_basic_charts() { if [ "$bundle" = "full-paas" ]; then make -C packages/system/kubeovn apply fi - make -C packages/system/fluxcd apply } cd "$(dirname "$0")/.." @@ -38,10 +37,8 @@ run_migrations # Install namespaces make -C packages/core/platform namespaces-apply -# Install fluxcd CRDs -if ! flux_is_ok; then - make -C packages/system/fluxcd apply-crds -fi +# Install fluxcd +make -C packages/core/fluxcd apply # Reconcile Helm repositories kubectl annotate helmrepositories.source.toolkit.fluxcd.io -A -l cozystack.io/repository reconcile.fluxcd.io/requestedAt=$(date +"%Y-%m-%dT%H:%M:%SZ") --overwrite diff --git a/scripts/migrations/1 b/scripts/migrations/1 index 8656925e..eb460c8c 100755 --- a/scripts/migrations/1 +++ b/scripts/migrations/1 @@ -1,8 +1,18 @@ #!/bin/sh +# Migration 1 --> 2 +# Fix mariadb-operator secrets if kubectl get -n cozy-mariadb-operator secret/mariadb-operator-webhook-cert; then kubectl annotate -n cozy-mariadb-operator secret/mariadb-operator-webhook-cert meta.helm.sh/release-namespace=cozy-mariadb-operator meta.helm.sh/release-name=mariadb-operator kubectl label -n cozy-mariadb-operator secret/mariadb-operator-webhook-cert app.kubernetes.io/managed-by=Helm fi +# Gratefully remove fluxcd release and keep resources +if kubectl get hr -n cozy-fluxcd cozy-fluxcd 2>/dev/null; then + kubectl patch hr -n cozy-fluxcd cozy-fluxcd -p '{"spec": {"suspend": true}, "metadata": {"finalizers": null}}' --type=merge + kubectl delete hr -n cozy-fluxcd cozy-fluxcd +fi +kubectl delete secret -n cozy-fluxcd -l name=fluxcd + +# Write version to cozystack-version config kubectl create configmap -n cozy-system cozystack-version --from-literal=version=2 --dry-run=client -o yaml | kubectl apply -f-