From fcebfdff2487ced2ff0f544929bd918d8da9cea6 Mon Sep 17 00:00:00 2001
From: Marian Koreniuk <moriarti@cp.if.ua>
Date: Wed, 17 Apr 2024 22:24:59 +0300
Subject: [PATCH 01/15] Refactor Makefiles #83

---
 hack/package-system.mk                        | 41 +++++++++++++++++++
 packages/core/fluxcd/Makefile                 |  2 +-
 packages/core/installer/Makefile              |  2 +-
 packages/core/platform/Makefile               |  2 +-
 packages/system/capi-operator/Makefile        |  9 +---
 packages/system/capi-providers/Makefile       |  9 +---
 packages/system/cert-manager-issuers/Makefile |  9 +---
 packages/system/cert-manager/Makefile         | 13 ++----
 packages/system/cilium/Makefile               | 19 +++------
 packages/system/clickhouse-operator/Makefile  |  9 +---
 packages/system/dashboard/Makefile            | 29 +++++--------
 packages/system/grafana-operator/Makefile     |  9 +---
 packages/system/ingress-nginx/Makefile        | 23 ++++-------
 packages/system/kafka-operator/Makefile       | 11 +----
 packages/system/kamaji/Makefile               | 14 ++-----
 packages/system/kubeovn/Makefile              | 11 +----
 .../system/kubevirt-cdi-operator/Makefile     |  9 +---
 packages/system/kubevirt-cdi/Makefile         | 11 +----
 packages/system/kubevirt-operator/Makefile    | 15 ++-----
 packages/system/kubevirt/Makefile             | 11 +----
 packages/system/linstor/Makefile              | 11 +----
 packages/system/mariadb-operator/Makefile     | 17 +++-----
 packages/system/metallb/Makefile              | 17 +++-----
 packages/system/monitoring/Makefile           | 11 +----
 packages/system/postgres-operator/Makefile    | 11 +----
 packages/system/rabbitmq-operator/Makefile    | 13 ++----
 packages/system/redis-operator/Makefile       | 19 +++------
 packages/system/telepresence/Makefile         |  9 +---
 .../system/victoria-metrics-operator/Makefile | 13 ++----
 29 files changed, 122 insertions(+), 257 deletions(-)
 create mode 100644 hack/package-system.mk

diff --git a/hack/package-system.mk b/hack/package-system.mk
new file mode 100644
index 00000000..c2846519
--- /dev/null
+++ b/hack/package-system.mk
@@ -0,0 +1,41 @@
+.DEFAULT_GOAL=help
+.PHONY=help show diff apply delete update image
+
+help: ## Show this help.
+	@awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z_-]+:.*?## / {sub("\\\\n",sprintf("\n%22c"," "), $$2);printf "\033[36m%-20s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST)
+
+show: ## Show output of rendered templates
+	case "$(NAME)" in
+    	cilium|kubeovn)
+        	kubectl get hr -n $(NAMESPACE) $(NAME) -o jsonpath='{.spec.values}' | helm template --dry-run=server -n $(NAMESPACE) $(NAME) . -f -
+        	;;
+    	*)
+        	helm template --dry-run=server -n $(NAMESPACE) $(NAME) .
+        	;;
+	esac
+
+apply: suspend ## Apply Helm release to a Kubernetes cluster 
+	case "$(NAME)" in
+		cilium|kubeovn)
+			kubectl get hr -n $(NAMESPACE) $(NAME) -o jsonpath='{.spec.values}' | helm upgrade -i -n $(NAMESPACE) $(NAME) . -f -
+			;;
+		*)
+			helm upgrade -i -n $(NAMESPACE) $(NAME) .
+			;;
+	esac
+
+diff: ## Diff Helm release against objects in a Kubernetes cluster
+	case "$(NAME)" in
+		cilium|kubeovn)
+			kubectl get hr -n $(NAMESPACE) $(NAME) -o jsonpath='{.spec.values}' | helm diff upgrade --allow-unreleased --normalize-manifests -n $(NAMESPACE) $(NAME) . -f -
+			;;
+		*)
+			helm diff upgrade --allow-unreleased --normalize-manifests -n $(NAMESPACE) $(NAME) .
+			;;
+	esac
+
+suspend: ## Suspend reconciliation for an existing Helm release
+	flux suspend hr -n $(NAMESPACE) $(NAME)
+
+resume: ## Resume reconciliation for an existing Helm release
+	flux resume hr -n $(NAMESPACE) $(NAME)
diff --git a/packages/core/fluxcd/Makefile b/packages/core/fluxcd/Makefile
index ad2c9fa5..7f1ddacf 100644
--- a/packages/core/fluxcd/Makefile
+++ b/packages/core/fluxcd/Makefile
@@ -1,5 +1,5 @@
-NAMESPACE=cozy-fluxcd
 NAME=fluxcd
+NAMESPACE=cozy-$(NAME)
 
 API_VERSIONS_FLAGS=$(addprefix -a ,$(shell kubectl api-versions))
 
diff --git a/packages/core/installer/Makefile b/packages/core/installer/Makefile
index 422b2564..82228581 100644
--- a/packages/core/installer/Makefile
+++ b/packages/core/installer/Makefile
@@ -1,5 +1,5 @@
-NAMESPACE=cozy-system
 NAME=installer
+NAMESPACE=cozy-system
 PUSH := 1
 LOAD := 0
 REGISTRY := ghcr.io/aenix-io/cozystack
diff --git a/packages/core/platform/Makefile b/packages/core/platform/Makefile
index 765ae18d..6ea9828f 100644
--- a/packages/core/platform/Makefile
+++ b/packages/core/platform/Makefile
@@ -1,5 +1,5 @@
-NAMESPACE=cozy-system
 NAME=platform
+NAMESPACE=cozy-system
 
 API_VERSIONS_FLAGS=$(addprefix -a ,$(shell kubectl api-versions))
 
diff --git a/packages/system/capi-operator/Makefile b/packages/system/capi-operator/Makefile
index e93380c6..ab41dbab 100644
--- a/packages/system/capi-operator/Makefile
+++ b/packages/system/capi-operator/Makefile
@@ -1,14 +1,7 @@
 NAME=capi-operator
 NAMESPACE=cozy-cluster-api
 
-show:
-	helm template --dry-run=server -n $(NAMESPACE) $(NAME) .
-
-apply:
-	helm upgrade -i -n $(NAMESPACE) $(NAME) .
-
-diff:
-	helm diff upgrade --allow-unreleased --normalize-manifests -n $(NAMESPACE) $(NAME) .
+include ../../hack/package-system.mk
 
 update:
 	rm -rf charts
diff --git a/packages/system/capi-providers/Makefile b/packages/system/capi-providers/Makefile
index 9dfff074..60514ba0 100644
--- a/packages/system/capi-providers/Makefile
+++ b/packages/system/capi-providers/Makefile
@@ -1,11 +1,4 @@
 NAME=capi-providers
 NAMESPACE=cozy-cluster-api
 
-show:
-	helm template --dry-run=server -n $(NAMESPACE) $(NAME) .
-
-apply:
-	helm upgrade -i -n $(NAMESPACE) $(NAME) .
-
-diff:
-	helm diff upgrade --allow-unreleased --normalize-manifests -n $(NAMESPACE) $(NAME) .
+include ../../hack/package-system.mk
diff --git a/packages/system/cert-manager-issuers/Makefile b/packages/system/cert-manager-issuers/Makefile
index 135de3ba..d50164db 100644
--- a/packages/system/cert-manager-issuers/Makefile
+++ b/packages/system/cert-manager-issuers/Makefile
@@ -1,11 +1,4 @@
 NAME=cert-manager-issuers
 NAMESPACE=cozy-cert-manager
 
-show:
-	helm template --dry-run=server -n $(NAMESPACE) $(NAME) .
-
-apply:
-	helm upgrade -i -n $(NAMESPACE) $(NAME) .
-
-diff:
-	helm diff upgrade --allow-unreleased --normalize-manifests -n $(NAMESPACE) $(NAME) .
+include ../../hack/package-system.mk
diff --git a/packages/system/cert-manager/Makefile b/packages/system/cert-manager/Makefile
index 53305d33..33440d65 100644
--- a/packages/system/cert-manager/Makefile
+++ b/packages/system/cert-manager/Makefile
@@ -1,17 +1,10 @@
 NAME=cert-manager
-NAMESPACE=cozy-cert-manager
+NAMESPACE=cozy-$(NAME)
 
-show:
-	helm template --dry-run=server -n $(NAMESPACE) $(NAME) .
-
-apply:
-	helm upgrade -i -n $(NAMESPACE) $(NAME) .
-
-diff:
-	helm diff upgrade --allow-unreleased --normalize-manifests -n $(NAMESPACE) $(NAME) .
+include ../../hack/package-system.mk
 
 update:
 	rm -rf charts
 	helm repo add jetstack https://charts.jetstack.io
 	helm repo update jetstack
-	helm pull jetstack/cert-manager --untar --untardir charts
+	helm pull jetstack/$(NAME) --untar --untardir charts
diff --git a/packages/system/cilium/Makefile b/packages/system/cilium/Makefile
index 8c57b152..74d84a05 100644
--- a/packages/system/cilium/Makefile
+++ b/packages/system/cilium/Makefile
@@ -1,19 +1,12 @@
-NAMESPACE=cozy-cilium
 NAME=cilium
+NAMESPACE=cozy-$(NAME)
 
-show:
-	kubectl get hr -n cozy-cilium cilium -o jsonpath='{.spec.values}' | helm template --dry-run=server -n $(NAMESPACE) $(NAME) . -f -
-
-apply:
-	kubectl get hr -n cozy-cilium cilium -o jsonpath='{.spec.values}' | helm upgrade -i -n $(NAMESPACE) $(NAME) . -f -
-
-diff:
-	kubectl get hr -n cozy-cilium cilium -o jsonpath='{.spec.values}' | helm diff upgrade --allow-unreleased --normalize-manifests -n $(NAMESPACE) $(NAME) . -f -
+include ../../hack/package-system.mk
 
 update:
 	rm -rf charts
-	helm repo add cilium https://helm.cilium.io/
-	helm repo update cilium
-	helm pull cilium/cilium --untar --untardir charts --version 1.14
-	sed -i -e '/Used in iptables/d' -e '/SYS_MODULE/d' charts/cilium/values.yaml
+	helm repo add $(NAME) https://helm.cilium.io/
+	helm repo update $(NAME)
+	helm pull $(NAME)/$(NAME) --untar --untardir charts --version 1.14
+	sed -i -e '/Used in iptables/d' -e '/SYS_MODULE/d' charts/$(NAME)/values.yaml
 	patch -p3 --no-backup-if-mismatch < patches/fix-cgroups.patch
diff --git a/packages/system/clickhouse-operator/Makefile b/packages/system/clickhouse-operator/Makefile
index b4e68969..eb0df087 100644
--- a/packages/system/clickhouse-operator/Makefile
+++ b/packages/system/clickhouse-operator/Makefile
@@ -1,14 +1,7 @@
 NAME=clickhouse-operator
 NAMESPACE=cozy-clickhouse-operator
 
-show:
-	helm template --dry-run=server -n $(NAMESPACE) $(NAME) .
-
-apply:
-	helm upgrade -i -n $(NAMESPACE) $(NAME) .
-
-diff:
-	helm diff upgrade --allow-unreleased --normalize-manifests -n $(NAMESPACE) $(NAME) .
+include ../../hack/package-system.mk
 
 update:
 	rm -rf charts
diff --git a/packages/system/dashboard/Makefile b/packages/system/dashboard/Makefile
index 40b24c30..f6f5d9ef 100644
--- a/packages/system/dashboard/Makefile
+++ b/packages/system/dashboard/Makefile
@@ -1,21 +1,14 @@
 NAME=dashboard
-NAMESPACE=cozy-dashboard
+NAMESPACE=cozy-$(NAME)
 PUSH := 1
 LOAD := 0
 REPOSITORY := ghcr.io/aenix-io/cozystack
 TAG := v0.2.0
 
-show:
-	helm template --dry-run=server -n $(NAMESPACE) $(NAME) .
-
-apply:
-	helm upgrade -i -n $(NAMESPACE) $(NAME) .
-
-diff:
-	helm diff upgrade --allow-unreleased --normalize-manifests -n $(NAMESPACE) $(NAME) .
+include ../../hack/package-system.mk
 
 update: update-chart update-dockerfiles
-image: image-dashboard image-kubeapps-apis
+image: image-$(NAME) image-kubeapps-apis
 
 update-chart:
 	rm -rf charts
@@ -29,21 +22,21 @@ update-dockerfiles:
 	tag=$$(git ls-remote --tags --sort="v:refname" https://github.com/vmware-tanzu/kubeapps  | awk -F'[/^]' 'END{print $$3}') && \
 	wget https://github.com/vmware-tanzu/kubeapps/raw/$${tag}/cmd/kubeapps-apis/Dockerfile -O images/kubeapps-apis/Dockerfile && \
 	patch images/kubeapps-apis/Dockerfile < images/kubeapps-apis/dockerfile.diff && \
-	node_image=$$(wget -O- https://github.com/vmware-tanzu/kubeapps/raw/main/dashboard/Dockerfile | awk '/FROM bitnami\/node/ {print $$2}') && \
-	sed -i "s|FROM .* AS build|FROM $${node_image} AS build|" images/dashboard/Dockerfile && \
+	node_image=$$(wget -O- https://github.com/vmware-tanzu/kubeapps/raw/main/$(NAME)/Dockerfile | awk '/FROM bitnami\/node/ {print $$2}') && \
+	sed -i "s|FROM .* AS build|FROM $${node_image} AS build|" images/$(NAME)/Dockerfile && \
 	version=$$(echo "$$tag" | sed 's/^v//') && \
-	sed -i "s/ARG VERSION=.*/ARG VERSION=$${version}/" images/dashboard/Dockerfile
+	sed -i "s/ARG VERSION=.*/ARG VERSION=$${version}/" images/$(NAME)/Dockerfile
 
 image-dashboard:
-	docker buildx build images/dashboard \
+	docker buildx build images/$(NAME) \
 		--provenance false \
-		--tag $(REPOSITORY)/dashboard:$(TAG) \
-		--cache-from type=registry,ref=$(REPOSITORY)/dashboard:$(TAG) \
+		--tag $(REPOSITORY)/$(NAME):$(TAG) \
+		--cache-from type=registry,ref=$(REPOSITORY)/$(NAME):$(TAG) \
 		--cache-to type=inline \
-		--metadata-file images/dashboard.json \
+		--metadata-file images/$(NAME).json \
 		--push=$(PUSH) \
 		--load=$(LOAD)
-	echo "$(REPOSITORY)/dashboard:$(TAG)" > images/dashboard.tag
+	echo "$(REPOSITORY)/$(NAME):$(TAG)" > images/$(NAME).tag
 
 image-kubeapps-apis:
 	docker buildx build images/kubeapps-apis \
diff --git a/packages/system/grafana-operator/Makefile b/packages/system/grafana-operator/Makefile
index 4064a7f0..a6249ccd 100644
--- a/packages/system/grafana-operator/Makefile
+++ b/packages/system/grafana-operator/Makefile
@@ -1,14 +1,7 @@
 NAME=grafana-operator
 NAMESPACE=cozy-grafana-operator
 
-show:
-	helm template --dry-run=server -n $(NAMESPACE) $(NAME) .
-
-apply:
-	helm upgrade -i -n $(NAMESPACE) $(NAME) .
-
-diff:
-	helm diff upgrade --allow-unreleased --normalize-manifests -n $(NAMESPACE) $(NAME) .
+include ../../hack/package-system.mk
 
 update:
 	rm -rf charts
diff --git a/packages/system/ingress-nginx/Makefile b/packages/system/ingress-nginx/Makefile
index f51895b8..84777fab 100644
--- a/packages/system/ingress-nginx/Makefile
+++ b/packages/system/ingress-nginx/Makefile
@@ -1,21 +1,14 @@
 NAME=ingress-nginx
-NAMESPACE=cozy-ingress-nginx
+NAMESPACE=cozy-$(NAME)
 
-show:
-	helm template --dry-run=server -n $(NAMESPACE) $(NAME) .
-
-apply:
-	helm upgrade -i -n $(NAMESPACE) $(NAME) .
-
-diff:
-	helm diff upgrade --allow-unreleased --normalize-manifests -n $(NAMESPACE) $(NAME) .
+include ../../hack/package-system.mk
 
 update:
 	rm -rf charts
-	helm repo add ingress-nginx https://kubernetes.github.io/ingress-nginx
-	helm repo update ingress-nginx
-	helm pull ingress-nginx/ingress-nginx --untar --untardir charts
+	helm repo add $(NAME) https://kubernetes.github.io/$(NAME)
+	helm repo update $(NAME)
+	helm pull $(NAME)/$(NAME) --untar --untardir charts
 	patch -p 3 < patches/add-metrics2.patch
-	rm -f charts/ingress-nginx/templates/controller-deployment.yaml.orig
-	rm -rf charts/ingress-nginx/changelog/
-	#sed -i '/  type:/a \  allocateLoadBalancerNodePorts: false' charts/ingress-nginx/templates/controller-service.yaml
+	rm -f charts/$(NAME)/templates/controller-deployment.yaml.orig
+	rm -rf charts/$(NAME)/changelog/
+	#sed -i '/  type:/a \  allocateLoadBalancerNodePorts: false' charts/$(NAME)/templates/controller-service.yaml
diff --git a/packages/system/kafka-operator/Makefile b/packages/system/kafka-operator/Makefile
index 7e46c334..3e9b642c 100644
--- a/packages/system/kafka-operator/Makefile
+++ b/packages/system/kafka-operator/Makefile
@@ -1,14 +1,7 @@
 NAME=kafka-operator
-NAMESPACE=cozy-kafka-operator
+NAMESPACE=cozy-$(NAME)
 
-show:
-	helm template --dry-run=server -n $(NAMESPACE) $(NAME) .
-
-apply:
-	helm upgrade -i -n $(NAMESPACE) $(NAME) .
-
-diff:
-	helm diff upgrade --allow-unreleased --normalize-manifests -n $(NAMESPACE) $(NAME) .
+include ../../hack/package-system.mk
 
 update:
 	rm -rf charts
diff --git a/packages/system/kamaji/Makefile b/packages/system/kamaji/Makefile
index 79e6787c..aed69eb9 100644
--- a/packages/system/kamaji/Makefile
+++ b/packages/system/kamaji/Makefile
@@ -1,18 +1,10 @@
 NAME=kamaji
-NAMESPACE=cozy-kamaji
+NAMESPACE=cozy-$(NAME)
 
-show:
-	helm template --dry-run=server -n $(NAMESPACE) $(NAME) .
-
-apply:
-	flux suspend hr kamaji -n cozy-kamaji || true
-	helm upgrade -i -n $(NAMESPACE) $(NAME) .
-
-diff:
-	helm diff upgrade --allow-unreleased --normalize-manifests -n $(NAMESPACE) $(NAME) .
+include ../../hack/package-system.mk
 
 update:
 	rm -rf charts
 	helm repo add clastix https://clastix.github.io/charts
 	helm repo update clastix
-	helm pull clastix/kamaji --untar --untardir charts
+	helm pull clastix/$(NAME) --untar --untardir charts
diff --git a/packages/system/kubeovn/Makefile b/packages/system/kubeovn/Makefile
index edff955d..317edd55 100644
--- a/packages/system/kubeovn/Makefile
+++ b/packages/system/kubeovn/Makefile
@@ -1,14 +1,7 @@
-NAMESPACE=cozy-kubeovn
 NAME=kubeovn
+NAMESPACE=cozy-$(NAME)
 
-show:
-	kubectl get hr -n $(NAMESPACE) $(NAME) -o jsonpath='{.spec.values}' | helm template --dry-run=server -n $(NAMESPACE) $(NAME) . -f -
-
-apply:
-	kubectl get hr -n $(NAMESPACE) $(NAME) -o jsonpath='{.spec.values}' | helm upgrade -i -n $(NAMESPACE) $(NAME) . -f -
-
-diff:
-	kubectl get hr -n $(NAMESPACE) $(NAME) -o jsonpath='{.spec.values}' | helm diff upgrade --allow-unreleased --normalize-manifests -n $(NAMESPACE) $(NAME) . -f -
+include ../../hack/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
index 756906ea..b7525cb7 100644
--- a/packages/system/kubevirt-cdi-operator/Makefile
+++ b/packages/system/kubevirt-cdi-operator/Makefile
@@ -1,14 +1,7 @@
 NAME=kubevirt-cdi-operator
 NAMESPACE=cozy-kubevirt-cdi
 
-show:
-	helm template --dry-run=server -n $(NAMESPACE) $(NAME) .
-
-apply:
-	helm upgrade -i -n $(NAMESPACE) $(NAME) .
-
-diff:
-	helm diff upgrade --allow-unreleased --normalize-manifests -n $(NAMESPACE) $(NAME) .
+include ../../hack/package-system.mk
 
 update:
 	rm -rf templates
diff --git a/packages/system/kubevirt-cdi/Makefile b/packages/system/kubevirt-cdi/Makefile
index 53551e66..c65d3d2e 100644
--- a/packages/system/kubevirt-cdi/Makefile
+++ b/packages/system/kubevirt-cdi/Makefile
@@ -1,14 +1,7 @@
 NAME=kubevirt-cdi
-NAMESPACE=cozy-kubevirt-cdi
+NAMESPACE=cozy-$(NAME)
 
-show:
-	helm template --dry-run=server -n $(NAMESPACE) $(NAME) .
-
-apply:
-	helm upgrade -i -n $(NAMESPACE) $(NAME) .
-
-diff:
-	helm diff upgrade --allow-unreleased --normalize-manifests -n $(NAMESPACE) $(NAME) .
+include ../../hack/package-system.mk
 
 update:
 	rm -rf templates
diff --git a/packages/system/kubevirt-operator/Makefile b/packages/system/kubevirt-operator/Makefile
index b4545502..d32a3023 100644
--- a/packages/system/kubevirt-operator/Makefile
+++ b/packages/system/kubevirt-operator/Makefile
@@ -1,19 +1,12 @@
 NAME=kubevirt-operator
 NAMESPACE=cozy-kubevirt
 
-show:
-	helm template --dry-run=server -n $(NAMESPACE) $(NAME) .
-
-apply:
-	helm upgrade -i -n $(NAMESPACE) $(NAME) .
-
-diff:
-	helm diff upgrade --allow-unreleased --normalize-manifests -n $(NAMESPACE) $(NAME) .
+include ../../hack/package-system.mk
 
 update:
 	rm -rf templates
 	mkdir templates
 	export RELEASE=$$(curl https://storage.googleapis.com/kubevirt-prow/release/kubevirt/kubevirt/stable.txt) && \
-	wget https://github.com/kubevirt/kubevirt/releases/download/$${RELEASE}/kubevirt-operator.yaml -O templates/kubevirt-operator.yaml && \
-	sed -i 's/namespace: kubevirt/namespace: cozy-kubevirt/g' templates/kubevirt-operator.yaml
-	awk -i inplace -v RS="---" '!/kind: Namespace/{printf "%s", $$0 RS}' templates/kubevirt-operator.yaml
+	wget https://github.com/kubevirt/kubevirt/releases/download/$${RELEASE}/$(NAME).yaml -O templates/$(NAME).yaml && \
+	sed -i 's/namespace: kubevirt/namespace: $(NAMESPACE)/g' templates/$(NAME).yaml
+	awk -i inplace -v RS="---" '!/kind: Namespace/{printf "%s", $$0 RS}' templates/$(NAME).yaml
diff --git a/packages/system/kubevirt/Makefile b/packages/system/kubevirt/Makefile
index 883c83ba..caa95f21 100644
--- a/packages/system/kubevirt/Makefile
+++ b/packages/system/kubevirt/Makefile
@@ -1,14 +1,7 @@
 NAME=kubevirt
-NAMESPACE=cozy-kubevirt
+NAMESPACE=cozy-$(NAME)
 
-show:
-	helm template --dry-run=server -n $(NAMESPACE) $(NAME) .
-
-apply:
-	helm upgrade -i -n $(NAMESPACE) $(NAME) .
-
-diff:
-	helm diff upgrade --allow-unreleased --normalize-manifests -n $(NAMESPACE) $(NAME) .
+include ../../hack/package-system.mk
 
 update:
 	rm -rf templates
diff --git a/packages/system/linstor/Makefile b/packages/system/linstor/Makefile
index e19d5f36..24bb9cea 100644
--- a/packages/system/linstor/Makefile
+++ b/packages/system/linstor/Makefile
@@ -1,11 +1,4 @@
 NAME=linstor
-NAMESPACE=cozy-linstor
+NAMESPACE=cozy-$(NAME)
 
-show:
-	helm template --dry-run=server -n $(NAMESPACE) $(NAME) .
-
-apply:
-	helm upgrade -i -n $(NAMESPACE) $(NAME) .
-
-diff:
-	helm diff upgrade --allow-unreleased --normalize-manifests -n $(NAMESPACE) $(NAME) .
+include ../../hack/package-system.mk
diff --git a/packages/system/mariadb-operator/Makefile b/packages/system/mariadb-operator/Makefile
index ce589c71..85acf806 100644
--- a/packages/system/mariadb-operator/Makefile
+++ b/packages/system/mariadb-operator/Makefile
@@ -1,17 +1,10 @@
 NAME=mariadb-operator
-NAMESPACE=cozy-mariadb-operator
+NAMESPACE=cozy-$(NAME)
 
-show:
-	helm template --dry-run=server -n $(NAMESPACE) $(NAME) .
-
-apply:
-	helm upgrade -i -n $(NAMESPACE) $(NAME) .
-
-diff:
-	helm diff upgrade --allow-unreleased --normalize-manifests -n $(NAMESPACE) $(NAME) .
+include ../../hack/package-system.mk
 
 update:
 	rm -rf charts
-	helm repo add mariadb-operator https://mariadb-operator.github.io/mariadb-operator
-	helm repo update mariadb-operator
-	helm pull mariadb-operator/mariadb-operator --untar --untardir charts
+	helm repo add $(NAME) https://$(NAME).github.io/$(NAME)
+	helm repo update $(NAME)
+	helm pull $(NAME)/$(NAME) --untar --untardir charts
diff --git a/packages/system/metallb/Makefile b/packages/system/metallb/Makefile
index 95755e94..d4edf82f 100644
--- a/packages/system/metallb/Makefile
+++ b/packages/system/metallb/Makefile
@@ -1,17 +1,10 @@
 NAME=metallb
-NAMESPACE=cozy-metallb
+NAMESPACE=cozy-$(NAME)
 
-show:
-	helm template --dry-run=server -n $(NAMESPACE) $(NAME) .
-
-apply:
-	helm upgrade -i -n $(NAMESPACE) $(NAME) .
-
-diff:
-	helm diff upgrade --allow-unreleased --normalize-manifests -n $(NAMESPACE) $(NAME) .
+include ../../hack/package-system.mk
 
 update:
 	rm -rf charts
-	helm repo add metallb https://metallb.github.io/metallb
-	helm repo update metallb
-	helm pull metallb/metallb --untar --untardir charts
+	helm repo add $(NAME) https://$(NAME).github.io/$(NAME)
+	helm repo update $(NAME)
+	helm pull $(NAME)/$(NAME) --untar --untardir charts
diff --git a/packages/system/monitoring/Makefile b/packages/system/monitoring/Makefile
index 52020e87..e6db14f7 100644
--- a/packages/system/monitoring/Makefile
+++ b/packages/system/monitoring/Makefile
@@ -1,14 +1,7 @@
 NAME=monitoring
-NAMESPACE=cozy-monitoring
+NAMESPACE=cozy-$(NAME)
 
-show:
-	helm template --dry-run=server -n $(NAMESPACE) $(NAME) .
-
-apply:
-	helm upgrade -i -n $(NAMESPACE) $(NAME) .
-
-diff:
-	helm diff upgrade --allow-unreleased --normalize-manifests -n $(NAMESPACE) $(NAME) .
+include ../../hack/package-system.mk
 
 update:
 	rm -rf charts
diff --git a/packages/system/postgres-operator/Makefile b/packages/system/postgres-operator/Makefile
index f46734d0..e82a2f14 100644
--- a/packages/system/postgres-operator/Makefile
+++ b/packages/system/postgres-operator/Makefile
@@ -1,14 +1,7 @@
 NAME=postgres-operator
-NAMESPACE=cozy-postgres-operator
+NAMESPACE=cozy-$(NAME)
 
-show:
-	helm template --dry-run=server -n $(NAMESPACE) $(NAME) .
-
-apply:
-	helm upgrade -i -n $(NAMESPACE) $(NAME) .
-
-diff:
-	helm diff upgrade --allow-unreleased --normalize-manifests -n $(NAMESPACE) $(NAME) .
+include ../../hack/package-system.mk
 
 update:
 	rm -rf charts
diff --git a/packages/system/rabbitmq-operator/Makefile b/packages/system/rabbitmq-operator/Makefile
index 1b11ad0d..e0dcef9a 100644
--- a/packages/system/rabbitmq-operator/Makefile
+++ b/packages/system/rabbitmq-operator/Makefile
@@ -1,17 +1,10 @@
 NAME=rabbitmq-operator
-NAMESPACE=cozy-rabbitmq-operator
+NAMESPACE=cozy-$(NAME)
 
-show:
-	helm template --dry-run=server -n $(NAMESPACE) $(NAME) .
-
-apply:
-	helm upgrade -i -n $(NAMESPACE) $(NAME) .
-
-diff:
-	helm diff upgrade --allow-unreleased --normalize-manifests -n $(NAMESPACE) $(NAME) .
+include ../../hack/package-system.mk
 
 update:
 	rm -rf templates/cluster-operator.yml
 	wget -O templates/cluster-operator.yml https://github.com/rabbitmq/cluster-operator/releases/latest/download/cluster-operator.yml
 	yq -i 'del(select(.kind=="Namespace"))' templates/cluster-operator.yml
-	sed -i 's/rabbitmq-system/cozy-rabbitmq-operator/g' templates/cluster-operator.yml
+	sed -i 's/rabbitmq-system/$(NAMESPACE)/g' templates/cluster-operator.yml
diff --git a/packages/system/redis-operator/Makefile b/packages/system/redis-operator/Makefile
index 16ff97ab..6d7da126 100644
--- a/packages/system/redis-operator/Makefile
+++ b/packages/system/redis-operator/Makefile
@@ -1,18 +1,11 @@
 NAME=redis-operator
-NAMESPACE=cozy-redis-operator
+NAMESPACE=cozy-$(NAME)
 
-show:
-	helm template --dry-run=server -n $(NAMESPACE) $(NAME) .
-
-apply:
-	helm upgrade -i -n $(NAMESPACE) $(NAME) .
-
-diff:
-	helm diff upgrade --allow-unreleased --normalize-manifests -n $(NAMESPACE) $(NAME) .
+include ../../hack/package-system.mk
 
 update:
 	rm -rf charts
-	helm repo add redis-operator https://spotahome.github.io/redis-operator
-	helm repo update redis-operator
-	helm pull redis-operator/redis-operator --untar --untardir charts
-	sed -i '/{{/d' charts/redis-operator/crds/databases.spotahome.com_redisfailovers.yaml
+	helm repo add $(NAME) https://spotahome.github.io/$(NAME)
+	helm repo update $(NAME)
+	helm pull $(NAME)/$(NAME) --untar --untardir charts
+	sed -i '/{{/d' charts/$(NAME)/crds/databases.spotahome.com_redisfailovers.yaml
diff --git a/packages/system/telepresence/Makefile b/packages/system/telepresence/Makefile
index d2311d0d..5172cf0d 100644
--- a/packages/system/telepresence/Makefile
+++ b/packages/system/telepresence/Makefile
@@ -1,14 +1,7 @@
 NAME=traffic-manager
 NAMESPACE=cozy-telepresence
 
-show:
-	helm template --dry-run=server -n $(NAMESPACE) $(NAME) .
-
-apply:
-	helm upgrade -i -n $(NAMESPACE) $(NAME) .
-
-diff:
-	helm diff upgrade --allow-unreleased --normalize-manifests -n $(NAMESPACE) $(NAME) .
+include ../../hack/package-system.mk
 
 update:
 	rm -rf charts
diff --git a/packages/system/victoria-metrics-operator/Makefile b/packages/system/victoria-metrics-operator/Makefile
index a2f89f86..bfad184d 100644
--- a/packages/system/victoria-metrics-operator/Makefile
+++ b/packages/system/victoria-metrics-operator/Makefile
@@ -1,21 +1,14 @@
 NAME=victoria-metrics-operator
-NAMESPACE=cozy-victoria-metrics-operator
+NAMESPACE=cozy-$(NAME)
 
-show:
-	helm template --dry-run=server -n $(NAMESPACE) $(NAME) .
-
-apply:
-	helm upgrade -i -n $(NAMESPACE) $(NAME) .
-
-diff:
-	helm diff upgrade --allow-unreleased --normalize-manifests -n $(NAMESPACE) $(NAME) .
+include ../../hack/package-system.mk
 
 update:
 	rm -rf charts
 	# VictoriaMetrics operator
 	helm repo add vm https://victoriametrics.github.io/helm-charts/
 	helm repo update vm
-	helm pull vm/victoria-metrics-operator --untar --untardir charts
+	helm pull vm/$(NAME) --untar --untardir charts
 	# Prometheus CRDs
 	helm repo add prometheus-community https://prometheus-community.github.io/helm-charts
 	helm repo update prometheus-community

From 758079520cee1945eaf45592e5062c83fdedff43 Mon Sep 17 00:00:00 2001
From: Marian Koreniuk <moriarti@cp.if.ua>
Date: Wed, 17 Apr 2024 22:36:13 +0300
Subject: [PATCH 02/15] fix case tabs in package-system.mk

---
 hack/package-system.mk | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/hack/package-system.mk b/hack/package-system.mk
index c2846519..dfa9926a 100644
--- a/hack/package-system.mk
+++ b/hack/package-system.mk
@@ -6,12 +6,12 @@ help: ## Show this help.
 
 show: ## Show output of rendered templates
 	case "$(NAME)" in
-    	cilium|kubeovn)
-        	kubectl get hr -n $(NAMESPACE) $(NAME) -o jsonpath='{.spec.values}' | helm template --dry-run=server -n $(NAMESPACE) $(NAME) . -f -
-        	;;
-    	*)
-        	helm template --dry-run=server -n $(NAMESPACE) $(NAME) .
-        	;;
+    		cilium|kubeovn)
+        		kubectl get hr -n $(NAMESPACE) $(NAME) -o jsonpath='{.spec.values}' | helm template --dry-run=server -n $(NAMESPACE) $(NAME) . -f -
+        		;;
+    		*)
+        		helm template --dry-run=server -n $(NAMESPACE) $(NAME) .
+        		;;
 	esac
 
 apply: suspend ## Apply Helm release to a Kubernetes cluster 

From f4cf1af3493c2844dd4ed8f2cf056305664a67d2 Mon Sep 17 00:00:00 2001
From: Marian Koreniuk <moriarti@cp.if.ua>
Date: Wed, 17 Apr 2024 23:01:47 +0300
Subject: [PATCH 03/15] Update hack/package-system.mk

Co-authored-by: Andrei Kvapil <kvapss@gmail.com>
---
 hack/package-system.mk | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/hack/package-system.mk b/hack/package-system.mk
index dfa9926a..1a560d30 100644
--- a/hack/package-system.mk
+++ b/hack/package-system.mk
@@ -15,14 +15,7 @@ show: ## Show output of rendered templates
 	esac
 
 apply: suspend ## Apply Helm release to a Kubernetes cluster 
-	case "$(NAME)" in
-		cilium|kubeovn)
-			kubectl get hr -n $(NAMESPACE) $(NAME) -o jsonpath='{.spec.values}' | helm upgrade -i -n $(NAMESPACE) $(NAME) . -f -
-			;;
-		*)
-			helm upgrade -i -n $(NAMESPACE) $(NAME) .
-			;;
-	esac
+	kubectl get hr -n $(NAMESPACE) $(NAME) -o jsonpath='{.spec.values}' | helm upgrade -i -n $(NAMESPACE) $(NAME) . -f -
 
 diff: ## Diff Helm release against objects in a Kubernetes cluster
 	case "$(NAME)" in

From d86c1269eb38a9172eb05d67033ec59504af4f12 Mon Sep 17 00:00:00 2001
From: Marian Koreniuk <moriarti@cp.if.ua>
Date: Wed, 17 Apr 2024 23:02:14 +0300
Subject: [PATCH 04/15] Update hack/package-system.mk

Co-authored-by: Andrei Kvapil <kvapss@gmail.com>
---
 hack/package-system.mk | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/hack/package-system.mk b/hack/package-system.mk
index 1a560d30..1a2fb500 100644
--- a/hack/package-system.mk
+++ b/hack/package-system.mk
@@ -18,14 +18,7 @@ apply: suspend ## Apply Helm release to a Kubernetes cluster
 	kubectl get hr -n $(NAMESPACE) $(NAME) -o jsonpath='{.spec.values}' | helm upgrade -i -n $(NAMESPACE) $(NAME) . -f -
 
 diff: ## Diff Helm release against objects in a Kubernetes cluster
-	case "$(NAME)" in
-		cilium|kubeovn)
-			kubectl get hr -n $(NAMESPACE) $(NAME) -o jsonpath='{.spec.values}' | helm diff upgrade --allow-unreleased --normalize-manifests -n $(NAMESPACE) $(NAME) . -f -
-			;;
-		*)
-			helm diff upgrade --allow-unreleased --normalize-manifests -n $(NAMESPACE) $(NAME) .
-			;;
-	esac
+	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)

From 451e124c565ed6d9200c0497c153e0bafa76c923 Mon Sep 17 00:00:00 2001
From: Marian Koreniuk <moriarti@cp.if.ua>
Date: Wed, 17 Apr 2024 23:02:27 +0300
Subject: [PATCH 05/15] Update hack/package-system.mk

Co-authored-by: Andrei Kvapil <kvapss@gmail.com>
---
 hack/package-system.mk | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/hack/package-system.mk b/hack/package-system.mk
index 1a2fb500..baa3f797 100644
--- a/hack/package-system.mk
+++ b/hack/package-system.mk
@@ -5,14 +5,7 @@ help: ## Show this help.
 	@awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z_-]+:.*?## / {sub("\\\\n",sprintf("\n%22c"," "), $$2);printf "\033[36m%-20s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST)
 
 show: ## Show output of rendered templates
-	case "$(NAME)" in
-    		cilium|kubeovn)
-        		kubectl get hr -n $(NAMESPACE) $(NAME) -o jsonpath='{.spec.values}' | helm template --dry-run=server -n $(NAMESPACE) $(NAME) . -f -
-        		;;
-    		*)
-        		helm template --dry-run=server -n $(NAMESPACE) $(NAME) .
-        		;;
-	esac
+	kubectl get hr -n $(NAMESPACE) $(NAME) -o jsonpath='{.spec.values}' | helm template --dry-run=server -n $(NAMESPACE) $(NAME) . -f -
 
 apply: suspend ## Apply Helm release to a Kubernetes cluster 
 	kubectl get hr -n $(NAMESPACE) $(NAME) -o jsonpath='{.spec.values}' | helm upgrade -i -n $(NAMESPACE) $(NAME) . -f -

From 3d0f65ff98e625c8eff3390f8461d36310d5ae5d Mon Sep 17 00:00:00 2001
From: Marian Koreniuk <moriarti@cp.if.ua>
Date: Wed, 17 Apr 2024 23:20:41 +0300
Subject: [PATCH 06/15] Fix cert-manager Makefile

---
 packages/system/cert-manager/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/system/cert-manager/Makefile b/packages/system/cert-manager/Makefile
index 33440d65..f24462c1 100644
--- a/packages/system/cert-manager/Makefile
+++ b/packages/system/cert-manager/Makefile
@@ -7,4 +7,4 @@ update:
 	rm -rf charts
 	helm repo add jetstack https://charts.jetstack.io
 	helm repo update jetstack
-	helm pull jetstack/$(NAME) --untar --untardir charts
+	helm pull jetstack/cert-manager --untar --untardir charts

From 1ef7d219defc7db590fed049a2a004df8f6137fa Mon Sep 17 00:00:00 2001
From: Marian Koreniuk <moriarti@cp.if.ua>
Date: Wed, 17 Apr 2024 23:22:00 +0300
Subject: [PATCH 07/15] Fix cilium Makefile

---
 packages/system/cilium/Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/system/cilium/Makefile b/packages/system/cilium/Makefile
index 74d84a05..608b2d97 100644
--- a/packages/system/cilium/Makefile
+++ b/packages/system/cilium/Makefile
@@ -5,8 +5,8 @@ include ../../hack/package-system.mk
 
 update:
 	rm -rf charts
-	helm repo add $(NAME) https://helm.cilium.io/
-	helm repo update $(NAME)
-	helm pull $(NAME)/$(NAME) --untar --untardir charts --version 1.14
-	sed -i -e '/Used in iptables/d' -e '/SYS_MODULE/d' charts/$(NAME)/values.yaml
+	helm repo add cilium https://helm.cilium.io/
+	helm repo update cilium
+	helm pull cilium/cilium --untar --untardir charts --version 1.14
+	sed -i -e '/Used in iptables/d' -e '/SYS_MODULE/d' charts/cilium/values.yaml
 	patch -p3 --no-backup-if-mismatch < patches/fix-cgroups.patch

From f3f65e9f9cbcf02dbac58618244c0ab11fa2ac47 Mon Sep 17 00:00:00 2001
From: Marian Koreniuk <moriarti@cp.if.ua>
Date: Wed, 17 Apr 2024 23:24:02 +0300
Subject: [PATCH 08/15] Fix dashboard Makefile

---
 packages/system/dashboard/Makefile | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/system/dashboard/Makefile b/packages/system/dashboard/Makefile
index f6f5d9ef..d9c3e769 100644
--- a/packages/system/dashboard/Makefile
+++ b/packages/system/dashboard/Makefile
@@ -8,7 +8,7 @@ TAG := v0.2.0
 include ../../hack/package-system.mk
 
 update: update-chart update-dockerfiles
-image: image-$(NAME) image-kubeapps-apis
+image: image-dashboard image-kubeapps-apis
 
 update-chart:
 	rm -rf charts
@@ -22,21 +22,21 @@ update-dockerfiles:
 	tag=$$(git ls-remote --tags --sort="v:refname" https://github.com/vmware-tanzu/kubeapps  | awk -F'[/^]' 'END{print $$3}') && \
 	wget https://github.com/vmware-tanzu/kubeapps/raw/$${tag}/cmd/kubeapps-apis/Dockerfile -O images/kubeapps-apis/Dockerfile && \
 	patch images/kubeapps-apis/Dockerfile < images/kubeapps-apis/dockerfile.diff && \
-	node_image=$$(wget -O- https://github.com/vmware-tanzu/kubeapps/raw/main/$(NAME)/Dockerfile | awk '/FROM bitnami\/node/ {print $$2}') && \
-	sed -i "s|FROM .* AS build|FROM $${node_image} AS build|" images/$(NAME)/Dockerfile && \
+	node_image=$$(wget -O- https://github.com/vmware-tanzu/kubeapps/raw/main/dashboard/Dockerfile | awk '/FROM bitnami\/node/ {print $$2}') && \
+	sed -i "s|FROM .* AS build|FROM $${node_image} AS build|" images/dashboard/Dockerfile && \
 	version=$$(echo "$$tag" | sed 's/^v//') && \
-	sed -i "s/ARG VERSION=.*/ARG VERSION=$${version}/" images/$(NAME)/Dockerfile
+	sed -i "s/ARG VERSION=.*/ARG VERSION=$${version}/" images/dashboard/Dockerfile
 
 image-dashboard:
-	docker buildx build images/$(NAME) \
+	docker buildx build images/dashboard \
 		--provenance false \
-		--tag $(REPOSITORY)/$(NAME):$(TAG) \
-		--cache-from type=registry,ref=$(REPOSITORY)/$(NAME):$(TAG) \
+		--tag $(REPOSITORY)/dashboard:$(TAG) \
+		--cache-from type=registry,ref=$(REPOSITORY)/dashboard:$(TAG) \
 		--cache-to type=inline \
-		--metadata-file images/$(NAME).json \
+		--metadata-file images/dashboard.json \
 		--push=$(PUSH) \
 		--load=$(LOAD)
-	echo "$(REPOSITORY)/$(NAME):$(TAG)" > images/$(NAME).tag
+	echo "$(REPOSITORY)/dashboard:$(TAG)" > images/dashboard.tag
 
 image-kubeapps-apis:
 	docker buildx build images/kubeapps-apis \

From d3485eb0a36e65b5e8328eb47763adfa6bff70dc Mon Sep 17 00:00:00 2001
From: Marian Koreniuk <moriarti@cp.if.ua>
Date: Wed, 17 Apr 2024 23:25:06 +0300
Subject: [PATCH 09/15] Fix ingress-nginx Makefile

---
 packages/system/ingress-nginx/Makefile | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/system/ingress-nginx/Makefile b/packages/system/ingress-nginx/Makefile
index 84777fab..a49b0328 100644
--- a/packages/system/ingress-nginx/Makefile
+++ b/packages/system/ingress-nginx/Makefile
@@ -5,10 +5,10 @@ include ../../hack/package-system.mk
 
 update:
 	rm -rf charts
-	helm repo add $(NAME) https://kubernetes.github.io/$(NAME)
-	helm repo update $(NAME)
-	helm pull $(NAME)/$(NAME) --untar --untardir charts
+	helm repo add ingress-nginx https://kubernetes.github.io/ingress-nginx
+	helm repo update ingress-nginx
+	helm pull ingress-nginx/ingress-nginx --untar --untardir charts
 	patch -p 3 < patches/add-metrics2.patch
-	rm -f charts/$(NAME)/templates/controller-deployment.yaml.orig
-	rm -rf charts/$(NAME)/changelog/
-	#sed -i '/  type:/a \  allocateLoadBalancerNodePorts: false' charts/$(NAME)/templates/controller-service.yaml
+	rm -f charts/ingress-nginx/templates/controller-deployment.yaml.orig
+	rm -rf charts/ingress-nginx/changelog/
+	#sed -i '/  type:/a \  allocateLoadBalancerNodePorts: false' charts/ingress-nginx/templates/controller-service.yaml

From 871f053e00259f672ce2c8beecda8b4cb7c24844 Mon Sep 17 00:00:00 2001
From: Marian Koreniuk <moriarti@cp.if.ua>
Date: Wed, 17 Apr 2024 23:25:37 +0300
Subject: [PATCH 10/15] Fix kamaji Makefile

---
 packages/system/kamaji/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/system/kamaji/Makefile b/packages/system/kamaji/Makefile
index aed69eb9..af7be38f 100644
--- a/packages/system/kamaji/Makefile
+++ b/packages/system/kamaji/Makefile
@@ -7,4 +7,4 @@ update:
 	rm -rf charts
 	helm repo add clastix https://clastix.github.io/charts
 	helm repo update clastix
-	helm pull clastix/$(NAME) --untar --untardir charts
+	helm pull clastix/kamaji --untar --untardir charts

From 994b5d97bd2aa9b54fa125f9d1924c6cada34822 Mon Sep 17 00:00:00 2001
From: Marian Koreniuk <moriarti@cp.if.ua>
Date: Wed, 17 Apr 2024 23:26:48 +0300
Subject: [PATCH 11/15] Fix kubevirt-operator Makefile

---
 packages/system/kubevirt-operator/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/system/kubevirt-operator/Makefile b/packages/system/kubevirt-operator/Makefile
index d32a3023..d34afb77 100644
--- a/packages/system/kubevirt-operator/Makefile
+++ b/packages/system/kubevirt-operator/Makefile
@@ -7,6 +7,6 @@ update:
 	rm -rf templates
 	mkdir templates
 	export RELEASE=$$(curl https://storage.googleapis.com/kubevirt-prow/release/kubevirt/kubevirt/stable.txt) && \
-	wget https://github.com/kubevirt/kubevirt/releases/download/$${RELEASE}/$(NAME).yaml -O templates/$(NAME).yaml && \
-	sed -i 's/namespace: kubevirt/namespace: $(NAMESPACE)/g' templates/$(NAME).yaml
-	awk -i inplace -v RS="---" '!/kind: Namespace/{printf "%s", $$0 RS}' templates/$(NAME).yaml
+	wget https://github.com/kubevirt/kubevirt/releases/download/$${RELEASE}/kubevirt-operator.yaml -O templates/kubevirt-operator.yaml && \
+	sed -i 's/namespace: kubevirt/namespace: $(NAMESPACE)/g' templates/kubevirt-operator.yaml
+	awk -i inplace -v RS="---" '!/kind: Namespace/{printf "%s", $$0 RS}' templates/kubevirt-operator.yaml

From 23ce7480c2cfd16c6b66bce4664ca3ba72177ee8 Mon Sep 17 00:00:00 2001
From: Marian Koreniuk <moriarti@cp.if.ua>
Date: Wed, 17 Apr 2024 23:27:47 +0300
Subject: [PATCH 12/15] Fix mariadb-operator Makefile

---
 packages/system/mariadb-operator/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/system/mariadb-operator/Makefile b/packages/system/mariadb-operator/Makefile
index 85acf806..51eb83be 100644
--- a/packages/system/mariadb-operator/Makefile
+++ b/packages/system/mariadb-operator/Makefile
@@ -5,6 +5,6 @@ include ../../hack/package-system.mk
 
 update:
 	rm -rf charts
-	helm repo add $(NAME) https://$(NAME).github.io/$(NAME)
-	helm repo update $(NAME)
-	helm pull $(NAME)/$(NAME) --untar --untardir charts
+	helm repo add mariadb-operator https://mariadb-operator.github.io/mariadb-operator
+	helm repo update mariadb-operator
+	helm pull mariadb-operator/mariadb-operator --untar --untardir charts

From 9d4aacc83265e273f82b57244ec66b520ee18760 Mon Sep 17 00:00:00 2001
From: Marian Koreniuk <moriarti@cp.if.ua>
Date: Wed, 17 Apr 2024 23:28:40 +0300
Subject: [PATCH 13/15] Fix metallb Makefile

---
 packages/system/metallb/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/system/metallb/Makefile b/packages/system/metallb/Makefile
index d4edf82f..79f24c9a 100644
--- a/packages/system/metallb/Makefile
+++ b/packages/system/metallb/Makefile
@@ -5,6 +5,6 @@ include ../../hack/package-system.mk
 
 update:
 	rm -rf charts
-	helm repo add $(NAME) https://$(NAME).github.io/$(NAME)
-	helm repo update $(NAME)
-	helm pull $(NAME)/$(NAME) --untar --untardir charts
+	helm repo add metallb https://metallb.github.io/metallb
+	helm repo update metallb
+	helm pull metallb/metallb --untar --untardir charts

From bc414d648db4ba14d05ef269bb5fc20676532eb2 Mon Sep 17 00:00:00 2001
From: Marian Koreniuk <moriarti@cp.if.ua>
Date: Wed, 17 Apr 2024 23:29:40 +0300
Subject: [PATCH 14/15] Fix redis-operator Makefile

---
 packages/system/redis-operator/Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/system/redis-operator/Makefile b/packages/system/redis-operator/Makefile
index 6d7da126..d57138d1 100644
--- a/packages/system/redis-operator/Makefile
+++ b/packages/system/redis-operator/Makefile
@@ -5,7 +5,7 @@ include ../../hack/package-system.mk
 
 update:
 	rm -rf charts
-	helm repo add $(NAME) https://spotahome.github.io/$(NAME)
-	helm repo update $(NAME)
-	helm pull $(NAME)/$(NAME) --untar --untardir charts
-	sed -i '/{{/d' charts/$(NAME)/crds/databases.spotahome.com_redisfailovers.yaml
+	helm repo add redis-operator https://spotahome.github.io/redis-operator
+	helm repo update redis-operator
+	helm pull redis-operator/redis-operator --untar --untardir charts
+	sed -i '/{{/d' charts/redis-operator/crds/databases.spotahome.com_redisfailovers.yaml

From 12b70d8f26f1a8110f09b65a61c81f3b81e283b9 Mon Sep 17 00:00:00 2001
From: Marian Koreniuk <moriarti@cp.if.ua>
Date: Wed, 17 Apr 2024 23:30:19 +0300
Subject: [PATCH 15/15] Fix victoria-metrics-operator Makefile

---
 packages/system/victoria-metrics-operator/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/system/victoria-metrics-operator/Makefile b/packages/system/victoria-metrics-operator/Makefile
index bfad184d..682354b2 100644
--- a/packages/system/victoria-metrics-operator/Makefile
+++ b/packages/system/victoria-metrics-operator/Makefile
@@ -8,7 +8,7 @@ update:
 	# VictoriaMetrics operator
 	helm repo add vm https://victoriametrics.github.io/helm-charts/
 	helm repo update vm
-	helm pull vm/$(NAME) --untar --untardir charts
+	helm pull vm/victoria-metrics-operator --untar --untardir charts
 	# Prometheus CRDs
 	helm repo add prometheus-community https://prometheus-community.github.io/helm-charts
 	helm repo update prometheus-community