diff --git a/packages/core/installer/images/cozystack.json b/packages/core/installer/images/cozystack.json index 303597cf..81e7f558 100644 --- a/packages/core/installer/images/cozystack.json +++ b/packages/core/installer/images/cozystack.json @@ -1,10 +1,10 @@ { - "buildx.build.ref": "priceless_leavitt/priceless_leavitt0/bkyp0lfy9cwyxbqtk2t3sl0ki", + "buildx.build.ref": "priceless_leavitt/priceless_leavitt0/cyr9s3a1cszjq9tt9vrh2czxt", "containerimage.descriptor": { "mediaType": "application/vnd.docker.distribution.manifest.list.v2+json", - "digest": "sha256:539c8bc610ecee7ea8d1b728020b6131eb5e46aafe40d5a4d85e8cf79fae3c72", + "digest": "sha256:48e9f676f4eca5f7036648a56767c31beb0aca8fdc6d6798bd65de74886ed1ef", "size": 685 }, - "containerimage.digest": "sha256:539c8bc610ecee7ea8d1b728020b6131eb5e46aafe40d5a4d85e8cf79fae3c72", + "containerimage.digest": "sha256:48e9f676f4eca5f7036648a56767c31beb0aca8fdc6d6798bd65de74886ed1ef", "image.name": "ghcr.io/aenix-io/cozystack/cozystack:v0.8.0" } \ No newline at end of file diff --git a/scripts/installer.sh b/scripts/installer.sh index 63121180..6d08a3bf 100755 --- a/scripts/installer.sh +++ b/scripts/installer.sh @@ -27,14 +27,20 @@ ensure_fluxcd() { if flux_is_ok; then return fi - if kubectl get crd helmreleases.helm.toolkit.fluxcd.io helmrepositories.source.toolkit.fluxcd.io; then - targets="apply resume" + # Install fluxcd-operator + if kubectl get helmreleases.helm.toolkit.fluxcd.io -n cozy-fluxcd fluxcd-operator; then + make -C packages/system/fluxcd-operator apply resume else - targets="apply-locally" + make -C packages/system/fluxcd-operator apply-locally fi - make -C packages/system/fluxcd-operator $targets wait_for_crds fluxinstances.fluxcd.controlplane.io - make -C packages/system/fluxcd $targets + + # Install fluxcd + if kubectl get helmreleases.helm.toolkit.fluxcd.io -n cozy-fluxcd fluxcd; then + make -C packages/system/fluxcd apply resume + else + make -C packages/system/fluxcd apply-locally + fi wait_for_crds helmreleases.helm.toolkit.fluxcd.io helmrepositories.source.toolkit.fluxcd.io }