diff --git a/packages/core/installer/images/cozystack/Dockerfile b/packages/core/installer/images/cozystack/Dockerfile index a268c401..85ae9c08 100644 --- a/packages/core/installer/images/cozystack/Dockerfile +++ b/packages/core/installer/images/cozystack/Dockerfile @@ -32,7 +32,7 @@ RUN make repos FROM alpine:3.22 -RUN wget -O- https://github.com/cozystack/cozypkg/raw/refs/heads/main/hack/install.sh | sh -s -- -v 1.1.0 +RUN wget -O- https://github.com/cozystack/cozypkg/raw/refs/heads/main/hack/install.sh | sh -s -- -v 1.2.0 RUN apk add --no-cache make kubectl coreutils git jq diff --git a/scripts/migrations/20 b/scripts/migrations/20 index dc99c6c4..411bb517 100755 --- a/scripts/migrations/20 +++ b/scripts/migrations/20 @@ -9,13 +9,10 @@ kubectl delete crd cozystackresourcedefinitions.cozystack.io --ignore-not-found timestamp=$(date --rfc-3339=ns) # Make sure webhook is upgraded first, then run migration -if kubectl get helmrelease cozystack-controller -n cozy-system; then - kubectl annotate helmrelease cozystack-controller -n cozy-system \ - reconcile.fluxcd.io/forceAt="$timestamp" \ - reconcile.fluxcd.io/requestedAt="$timestamp" \ - --overwrite - kubectl wait hr/cozystack-controller -n cozy-system --timeout=4m --for=condition=ready || exit 1 -fi +cozypkg -C packages/system/cozystack-controller -n cozy-system reconcile cozystack-controller --force --with-source +kubectl wait hr/cozystack-controller -n cozy-system --timeout=4m --for=condition=ready || exit 1 +cozypkg -C packages/system/cozystack-api -n cozy-system reconcile cozystack-api --force --with-source +kubectl wait hr/cozystack-api -n cozy-system --timeout=4m --for=condition=ready || exit 1 kubectl get namespace -o custom-columns=NAME:.metadata.name --no-headers | grep '^tenant-' | while read namespace ; do