From f8b87197d0ff6a4c028f162ba3f8c9911c18186f Mon Sep 17 00:00:00 2001 From: Andrei Kvapil Date: Tue, 23 Apr 2024 09:42:55 +0200 Subject: [PATCH] fix: flux dependency Signed-off-by: Andrei Kvapil --- scripts/installer.sh | 4 ++-- scripts/package-system.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/installer.sh b/scripts/installer.sh index e9eefdca..ad303840 100755 --- a/scripts/installer.sh +++ b/scripts/installer.sh @@ -24,10 +24,10 @@ flux_is_ok() { install_basic_charts() { if [ "$BUNDLE" = "paas-full" ] || [ "$BUNDLE" = "distro-full" ]; then - make -C packages/system/cilium apply + make -C packages/system/cilium apply resume fi if [ "$BUNDLE" = "paas-full" ]; then - make -C packages/system/kubeovn apply + make -C packages/system/kubeovn apply resume fi } diff --git a/scripts/package-system.mk b/scripts/package-system.mk index baa3f797..9c728997 100644 --- a/scripts/package-system.mk +++ b/scripts/package-system.mk @@ -14,7 +14,7 @@ diff: ## Diff Helm release against objects in a Kubernetes cluster kubectl get hr -n $(NAMESPACE) $(NAME) -o jsonpath='{.spec.values}' | helm diff upgrade --allow-unreleased --normalize-manifests -n $(NAMESPACE) $(NAME) . -f - suspend: ## Suspend reconciliation for an existing Helm release - flux suspend hr -n $(NAMESPACE) $(NAME) + kubectl patch hr -n $(NAMESPACE) $(NAME) -p '{"spec": {"suspend": true}}' --type=merge resume: ## Resume reconciliation for an existing Helm release - flux resume hr -n $(NAMESPACE) $(NAME) + kubectl patch hr -n $(NAMESPACE) $(NAME) -p '{"spec": {"suspend": null}}' --type=merge