Merge pull request #96 from aenix-io/missing-makefile

fix: missing package-system.mk
aenix-io · Apr 23, 2024 · be0603f · be0603f
2 parents a1340c1 + f8b8719
commit be0603f
Show file tree

Hide file tree

Showing 28 changed files with 30 additions and 30 deletions.
diff --git a/packages/system/capi-operator/Makefile b/packages/system/capi-operator/Makefile
@@ -1,7 +1,7 @@
 NAME=capi-operator
 NAMESPACE=cozy-cluster-api
 
-include ../../../hack/package-system.mk
+include ../../../scripts/package-system.mk
 
 update:
 	rm -rf charts

diff --git a/packages/system/capi-providers/Makefile b/packages/system/capi-providers/Makefile
@@ -1,4 +1,4 @@
 NAME=capi-providers
 NAMESPACE=cozy-cluster-api
 
-include ../../../hack/package-system.mk
+include ../../../scripts/package-system.mk
diff --git a/packages/system/cert-manager-issuers/Makefile b/packages/system/cert-manager-issuers/Makefile
@@ -1,4 +1,4 @@
 NAME=cert-manager-issuers
 NAMESPACE=cozy-cert-manager
 
-include ../../../hack/package-system.mk
+include ../../../scripts/package-system.mk
diff --git a/packages/system/cert-manager/Makefile b/packages/system/cert-manager/Makefile
@@ -1,7 +1,7 @@
 NAME=cert-manager
 NAMESPACE=cozy-$(NAME)
 
-include ../../../hack/package-system.mk
+include ../../../scripts/package-system.mk
 
 update:
 	rm -rf charts

diff --git a/packages/system/cilium/Makefile b/packages/system/cilium/Makefile
@@ -1,7 +1,7 @@
 NAME=cilium
 NAMESPACE=cozy-$(NAME)
 
-include ../../../hack/package-system.mk
+include ../../../scripts/package-system.mk
 
 update:
 	rm -rf charts

diff --git a/packages/system/clickhouse-operator/Makefile b/packages/system/clickhouse-operator/Makefile
@@ -1,7 +1,7 @@
 NAME=clickhouse-operator
 NAMESPACE=cozy-clickhouse-operator
 
-include ../../../hack/package-system.mk
+include ../../../scripts/package-system.mk
 
 update:
 	rm -rf charts

diff --git a/packages/system/dashboard/Makefile b/packages/system/dashboard/Makefile
@@ -5,7 +5,7 @@ LOAD := 0
 REPOSITORY := ghcr.io/aenix-io/cozystack
 TAG := v0.3.0
 
-include ../../../hack/package-system.mk
+include ../../../scripts/package-system.mk
 
 update: update-chart update-dockerfiles
 image: image-dashboard image-kubeapps-apis

diff --git a/packages/system/grafana-operator/Makefile b/packages/system/grafana-operator/Makefile
@@ -1,7 +1,7 @@
 NAME=grafana-operator
 NAMESPACE=cozy-grafana-operator
 
-include ../../../hack/package-system.mk
+include ../../../scripts/package-system.mk
 
 update:
 	rm -rf charts

diff --git a/packages/system/ingress-nginx/Makefile b/packages/system/ingress-nginx/Makefile
@@ -1,7 +1,7 @@
 NAME=ingress-nginx
 NAMESPACE=cozy-$(NAME)
 
-include ../../../hack/package-system.mk
+include ../../../scripts/package-system.mk
 
 update:
 	rm -rf charts

diff --git a/packages/system/kafka-operator/Makefile b/packages/system/kafka-operator/Makefile
@@ -1,7 +1,7 @@
 NAME=kafka-operator
 NAMESPACE=cozy-$(NAME)
 
-include ../../../hack/package-system.mk
+include ../../../scripts/package-system.mk
 
 update:
 	rm -rf charts

diff --git a/packages/system/kamaji/Makefile b/packages/system/kamaji/Makefile
@@ -1,7 +1,7 @@
 NAME=kamaji
 NAMESPACE=cozy-$(NAME)
 
-include ../../../hack/package-system.mk
+include ../../../scripts/package-system.mk
 
 update:
 	rm -rf charts

diff --git a/packages/system/kubeovn/Makefile b/packages/system/kubeovn/Makefile
@@ -1,7 +1,7 @@
 NAME=kubeovn
 NAMESPACE=cozy-$(NAME)
 
-include ../../../hack/package-system.mk
+include ../../../scripts/package-system.mk
 
 update:
 	rm -rf charts && mkdir -p charts/kube-ovn

diff --git a/packages/system/kubevirt-cdi-operator/Makefile b/packages/system/kubevirt-cdi-operator/Makefile
@@ -1,7 +1,7 @@
 NAME=kubevirt-cdi-operator
 NAMESPACE=cozy-kubevirt-cdi
 
-include ../../../hack/package-system.mk
+include ../../../scripts/package-system.mk
 
 update:
 	rm -rf templates

diff --git a/packages/system/kubevirt-cdi/Makefile b/packages/system/kubevirt-cdi/Makefile
@@ -1,7 +1,7 @@
 NAME=kubevirt-cdi
 NAMESPACE=cozy-$(NAME)
 
-include ../../../hack/package-system.mk
+include ../../../scripts/package-system.mk
 
 update:
 	rm -rf templates

diff --git a/packages/system/kubevirt-operator/Makefile b/packages/system/kubevirt-operator/Makefile
@@ -1,7 +1,7 @@
 NAME=kubevirt-operator
 NAMESPACE=cozy-kubevirt
 
-include ../../../hack/package-system.mk
+include ../../../scripts/package-system.mk
 
 update:
 	rm -rf templates

diff --git a/packages/system/kubevirt/Makefile b/packages/system/kubevirt/Makefile
@@ -1,7 +1,7 @@
 NAME=kubevirt
 NAMESPACE=cozy-$(NAME)
 
-include ../../../hack/package-system.mk
+include ../../../scripts/package-system.mk
 
 update:
 	rm -rf templates

diff --git a/packages/system/linstor/Makefile b/packages/system/linstor/Makefile
@@ -1,4 +1,4 @@
 NAME=linstor
 NAMESPACE=cozy-$(NAME)
 
-include ../../../hack/package-system.mk
+include ../../../scripts/package-system.mk
diff --git a/packages/system/mariadb-operator/Makefile b/packages/system/mariadb-operator/Makefile
@@ -1,7 +1,7 @@
 NAME=mariadb-operator
 NAMESPACE=cozy-$(NAME)
 
-include ../../../hack/package-system.mk
+include ../../../scripts/package-system.mk
 
 update:
 	rm -rf charts

diff --git a/packages/system/metallb/Makefile b/packages/system/metallb/Makefile
@@ -1,7 +1,7 @@
 NAME=metallb
 NAMESPACE=cozy-$(NAME)
 
-include ../../../hack/package-system.mk
+include ../../../scripts/package-system.mk
 
 update:
 	rm -rf charts

diff --git a/packages/system/monitoring/Makefile b/packages/system/monitoring/Makefile
@@ -1,7 +1,7 @@
 NAME=monitoring
 NAMESPACE=cozy-$(NAME)
 
-include ../../../hack/package-system.mk
+include ../../../scripts/package-system.mk
 
 update:
 	rm -rf charts

diff --git a/packages/system/piraeus-operator/Makefile b/packages/system/piraeus-operator/Makefile
@@ -1,7 +1,7 @@
 NAME=piraeus-operator
 NAMESPACE=cozy-linstor
 
-include ../../../hack/package-system.mk
+include ../../../scripts/package-system.mk
 
 update:
 	rm -rf charts

diff --git a/packages/system/postgres-operator/Makefile b/packages/system/postgres-operator/Makefile
@@ -1,7 +1,7 @@
 NAME=postgres-operator
 NAMESPACE=cozy-$(NAME)
 
-include ../../../hack/package-system.mk
+include ../../../scripts/package-system.mk
 
 update:
 	rm -rf charts

diff --git a/packages/system/rabbitmq-operator/Makefile b/packages/system/rabbitmq-operator/Makefile
@@ -1,7 +1,7 @@
 NAME=rabbitmq-operator
 NAMESPACE=cozy-$(NAME)
 
-include ../../../hack/package-system.mk
+include ../../../scripts/package-system.mk
 
 update:
 	rm -rf templates/cluster-operator.yml

diff --git a/packages/system/redis-operator/Makefile b/packages/system/redis-operator/Makefile
@@ -1,7 +1,7 @@
 NAME=redis-operator
 NAMESPACE=cozy-$(NAME)
 
-include ../../../hack/package-system.mk
+include ../../../scripts/package-system.mk
 
 update:
 	rm -rf charts

diff --git a/packages/system/telepresence/Makefile b/packages/system/telepresence/Makefile
@@ -1,7 +1,7 @@
 NAME=traffic-manager
 NAMESPACE=cozy-telepresence
 
-include ../../../hack/package-system.mk
+include ../../../scripts/package-system.mk
 
 update:
 	rm -rf charts

diff --git a/packages/system/victoria-metrics-operator/Makefile b/packages/system/victoria-metrics-operator/Makefile
@@ -1,7 +1,7 @@
 NAME=victoria-metrics-operator
 NAMESPACE=cozy-$(NAME)
 
-include ../../../hack/package-system.mk
+include ../../../scripts/package-system.mk
 
 update:
 	rm -rf charts

diff --git 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/hack/package-system.mk → scripts/package-system.mk b/hack/package-system.mk → 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