From 76c93639d893605145fd840eae6b034e6cf88c5a Mon Sep 17 00:00:00 2001 From: Andrei Kvapil Date: Wed, 3 Jan 2024 12:37:42 +0100 Subject: [PATCH] cozystack configmap --- README.md | 14 +++++ TODO | 2 + packages/Makefile | 3 +- packages/core/Makefile | 14 ----- packages/core/platform/Makefile | 16 ++--- packages/core/platform/templates/_helpers.tpl | 18 ++++++ .../platform/templates/helmreleases-core.yaml | 55 ----------------- ...releases-system.yaml => helmreleases.yaml} | 59 +++++++++++++++++++ packages/system/Makefile | 19 ------ packages/system/cert-manager-issuers/Makefile | 4 +- packages/system/cert-manager/Makefile | 4 +- packages/system/cilium/Makefile | 4 +- packages/system/fluxcd/Makefile | 4 +- packages/system/grafana-operator/Makefile | 4 +- packages/system/ingress-nginx/Makefile | 4 +- packages/system/kubeapps/Makefile | 4 +- packages/system/kubeovn/Makefile | 2 +- packages/system/kubevirt-operator/Makefile | 4 +- packages/system/kubevirt/Makefile | 4 +- packages/system/linstor/Makefile | 4 +- packages/system/mariadb-operator/Makefile | 4 +- packages/system/metallb-addresses/Makefile | 4 +- packages/system/metallb/Makefile | 4 +- packages/system/monitoring/Makefile | 4 +- packages/system/piraeus-operator/Makefile | 4 +- packages/system/postgres-operator/Makefile | 4 +- packages/system/rabbitmq-operator/Makefile | 4 +- packages/system/redis-operator/Makefile | 4 +- packages/system/telepresence/Makefile | 4 +- .../system/victoria-metrics-operator/Makefile | 4 +- 30 files changed, 139 insertions(+), 143 deletions(-) create mode 100644 packages/core/platform/templates/_helpers.tpl delete mode 100644 packages/core/platform/templates/helmreleases-core.yaml rename packages/core/platform/templates/{helmreleases-system.yaml => helmreleases.yaml} (86%) diff --git a/README.md b/README.md index e2ce0c2a..013446e6 100644 --- a/README.md +++ b/README.md @@ -141,6 +141,20 @@ cluster: etcd: advertisedSubnets: - 192.168.100.0/24 + + inlineManifests: + - name: cozystack + contents: | + apiVersion: v1 + kind: ConfigMap + metadata: + name: cozystack + namespace: cozy-system + data: + ipv4-pod-cidr: "10.244.0.0/16" + ipv4-pod-gateway: "10.244.0.1" + ipv4-svc-cidr: "10.96.0.0/16" + ipv4-join-cidr: "100.64.0.0/16" EOT ``` diff --git a/TODO b/TODO index b3358327..6418f787 100644 --- a/TODO +++ b/TODO @@ -16,3 +16,5 @@ flux policies talos linux firmware replace reconcile.sh trigger reinstall when more nodes added +metallb-configuration +docs: each chart should be self sufficient diff --git a/packages/Makefile b/packages/Makefile index 36dbb80c..a41fe277 100644 --- a/packages/Makefile +++ b/packages/Makefile @@ -1,3 +1,2 @@ -apply show diff repo: - make -C core $@ +repo: make -C system $@ diff --git a/packages/core/Makefile b/packages/core/Makefile index dbda3c7e..703f52a2 100644 --- a/packages/core/Makefile +++ b/packages/core/Makefile @@ -1,16 +1,2 @@ -REPO=core - -apply show diff: - make -C namespaces $@ - make -C cilium $@ - make -C kubeovn $@ - make -C fluxcd $@ - -repo: fix-chartnames - rm -rf ../repos/$(REPO) - mkdir -p ../repos/$(REPO) - cd ../repos/$(REPO) && helm package $$(find ../../$(REPO) -mindepth 2 -maxdepth 2 -name Chart.yaml | awk 'sub("/Chart.yaml", "")') - cd ../repos/$(REPO) && helm repo index . - fix-chartnames: find . -name Chart.yaml -maxdepth 2 | awk -F/ '{print $$2}' | while read i; do printf "name: cozy-%s\nversion: 1.0.0\n" "$$i" > "$$i/Chart.yaml"; done diff --git a/packages/core/platform/Makefile b/packages/core/platform/Makefile index 814782b2..a0c7bdd0 100644 --- a/packages/core/platform/Makefile +++ b/packages/core/platform/Makefile @@ -1,25 +1,17 @@ NAMESPACE=cozy-system -NAME=fluxcd-releases +NAME=platform show: - helm template -n $(NAMESPACE) $(NAME) . + helm template -n $(NAMESPACE) $(NAME) . --dry-run=server apply: helm template -n $(NAMESPACE) $(NAME) . --dry-run=server | kubectl apply -f- namespaces-show: - helm template -n $(NAMESPACE) $(NAME) . -s templates/namespaces.yaml + helm template -n $(NAMESPACE) $(NAME) . --dry-run=server . -s templates/namespaces.yaml namespaces-apply: - helm template -n $(NAMESPACE) $(NAME) . -s templates/namespaces.yaml | kubectl apply -f- + helm template -n $(NAMESPACE) $(NAME) . --dry-run=server . -s templates/namespaces.yaml | kubectl apply -f- diff: helm diff upgrade --allow-unreleased -n $(NAMESPACE) $(NAME) . - -update: - rm -rf charts - helm repo add cilium https://helm.cilium.io/ - helm repo update cilium - helm pull cilium/cilium --untar --untardir charts - sed -i -e '/Used in iptables/d' -e '/SYS_MODULE/d' charts/cilium/values.yaml - patch -p3 < patches/fix-cgroups.patch diff --git a/packages/core/platform/templates/_helpers.tpl b/packages/core/platform/templates/_helpers.tpl new file mode 100644 index 00000000..8273961f --- /dev/null +++ b/packages/core/platform/templates/_helpers.tpl @@ -0,0 +1,18 @@ +{{/* +Get IP-addresses of master nodes +*/}} +{{- define "master.nodeIPs" -}} +{{- $nodes := lookup "v1" "Node" "" "" -}} +{{- $ips := list -}} +{{- range $node := $nodes.items -}} + {{- if eq (index $node.metadata.labels "node-role.kubernetes.io/control-plane") "" -}} + {{- range $address := $node.status.addresses -}} + {{- if eq $address.type "InternalIP" -}} + {{- $ips = append $ips $address.address -}} + {{- break -}} + {{- end -}} + {{- end -}} + {{- end -}} +{{- end -}} +{{ join "," $ips }} +{{- end -}} diff --git a/packages/core/platform/templates/helmreleases-core.yaml b/packages/core/platform/templates/helmreleases-core.yaml deleted file mode 100644 index 44052771..00000000 --- a/packages/core/platform/templates/helmreleases-core.yaml +++ /dev/null @@ -1,55 +0,0 @@ -apiVersion: helm.toolkit.fluxcd.io/v2beta1 -kind: HelmRelease -metadata: - name: cilium - namespace: cozy-cilium -spec: - interval: 1m - releaseName: cilium - chart: - spec: - chart: cozy-cilium - sourceRef: - kind: HelmRepository - name: cozystack-system - namespace: cozy-system ---- -apiVersion: helm.toolkit.fluxcd.io/v2beta1 -kind: HelmRelease -metadata: - name: kubeovn - namespace: cozy-kubeovn -spec: - interval: 1m - releaseName: kubeovn - chart: - spec: - chart: cozy-kubeovn - sourceRef: - kind: HelmRepository - name: cozystack-system - namespace: cozy-system - dependsOn: - - name: cilium - namespace: cozy-cilium ---- -apiVersion: helm.toolkit.fluxcd.io/v2beta1 -kind: HelmRelease -metadata: - name: cozy-fluxcd - namespace: cozy-fluxcd -spec: - interval: 1m - releaseName: fluxcd - chart: - spec: - chart: cozy-fluxcd - sourceRef: - kind: HelmRepository - name: cozystack-system - namespace: cozy-system - dependsOn: - - name: cilium - namespace: cozy-cilium - - name: kubeovn - namespace: cozy-kubeovn diff --git a/packages/core/platform/templates/helmreleases-system.yaml b/packages/core/platform/templates/helmreleases.yaml similarity index 86% rename from packages/core/platform/templates/helmreleases-system.yaml rename to packages/core/platform/templates/helmreleases.yaml index b6a0b7b4..38844699 100644 --- a/packages/core/platform/templates/helmreleases-system.yaml +++ b/packages/core/platform/templates/helmreleases.yaml @@ -1,3 +1,62 @@ +apiVersion: helm.toolkit.fluxcd.io/v2beta1 +kind: HelmRelease +metadata: + name: cilium + namespace: cozy-cilium +spec: + interval: 1m + releaseName: cilium + chart: + spec: + chart: cozy-cilium + sourceRef: + kind: HelmRepository + name: cozystack-system + namespace: cozy-system +--- +apiVersion: helm.toolkit.fluxcd.io/v2beta1 +kind: HelmRelease +metadata: + name: kubeovn + namespace: cozy-kubeovn +spec: + interval: 1m + releaseName: kubeovn + chart: + spec: + chart: cozy-kubeovn + sourceRef: + kind: HelmRepository + name: cozystack-system + namespace: cozy-system + values: + cozystack: + configHash: {{ index (lookup "v1" "ConfigMap" "cozy-system" "cozystack") "data" | toJson | sha256sum }} + nodesHash: {{ include "master.nodeIPs" . | sha256sum }} + dependsOn: + - name: cilium + namespace: cozy-cilium +--- +apiVersion: helm.toolkit.fluxcd.io/v2beta1 +kind: HelmRelease +metadata: + name: cozy-fluxcd + namespace: cozy-fluxcd +spec: + interval: 1m + releaseName: fluxcd + chart: + spec: + chart: cozy-fluxcd + sourceRef: + kind: HelmRepository + name: cozystack-system + namespace: cozy-system + dependsOn: + - name: cilium + namespace: cozy-cilium + - name: kubeovn + namespace: cozy-kubeovn --- apiVersion: helm.toolkit.fluxcd.io/v2beta1 kind: HelmRelease diff --git a/packages/system/Makefile b/packages/system/Makefile index 1db50924..1ed6770c 100644 --- a/packages/system/Makefile +++ b/packages/system/Makefile @@ -1,24 +1,5 @@ REPO=system -apply show diff: - make -C cert-manager $@ - make -C cert-manager-issuers $@ - make -C victoria-metrics-operator $@ - make -C monitoring $@ - make -C kubevirt-operator $@ - make -C kubevirt $@ - make -C metallb $@ - make -C grafana-operator $@ - make -C mariadb-operator $@ - make -C postgres-operator $@ - make -C rabbitmq-operator $@ - make -C redis-operator $@ - make -C piraeus-operator $@ - make -C linstor $@ - make -C telepresence $@ - make -C ingress-nginx $@ - make -C kubeapps $@ - repo: fix-chartnames rm -rf ../repos/$(REPO) mkdir -p ../repos/$(REPO) diff --git a/packages/system/cert-manager-issuers/Makefile b/packages/system/cert-manager-issuers/Makefile index 356763cc..135de3ba 100644 --- a/packages/system/cert-manager-issuers/Makefile +++ b/packages/system/cert-manager-issuers/Makefile @@ -2,10 +2,10 @@ NAME=cert-manager-issuers NAMESPACE=cozy-cert-manager show: - helm template -n $(NAMESPACE) $(NAME) . + helm template --dry-run=server -n $(NAMESPACE) $(NAME) . apply: helm upgrade -i -n $(NAMESPACE) $(NAME) . diff: - helm diff upgrade --allow-unreleased -n $(NAMESPACE) $(NAME) . + helm diff upgrade --allow-unreleased --normalize-manifests -n $(NAMESPACE) $(NAME) . diff --git a/packages/system/cert-manager/Makefile b/packages/system/cert-manager/Makefile index e1469bdf..53305d33 100644 --- a/packages/system/cert-manager/Makefile +++ b/packages/system/cert-manager/Makefile @@ -2,13 +2,13 @@ NAME=cert-manager NAMESPACE=cozy-cert-manager show: - helm template -n $(NAMESPACE) $(NAME) . + helm template --dry-run=server -n $(NAMESPACE) $(NAME) . apply: helm upgrade -i -n $(NAMESPACE) $(NAME) . diff: - helm diff upgrade --allow-unreleased -n $(NAMESPACE) $(NAME) . + helm diff upgrade --allow-unreleased --normalize-manifests -n $(NAMESPACE) $(NAME) . update: rm -rf charts diff --git a/packages/system/cilium/Makefile b/packages/system/cilium/Makefile index 4b09ce1b..db14cf98 100644 --- a/packages/system/cilium/Makefile +++ b/packages/system/cilium/Makefile @@ -2,13 +2,13 @@ NAMESPACE=cozy-cilium NAME=cilium show: - helm template -n $(NAMESPACE) $(NAME) . + helm template --dry-run=server -n $(NAMESPACE) $(NAME) . apply: helm upgrade -i -n $(NAMESPACE) $(NAME) . diff: - helm diff upgrade --allow-unreleased -n $(NAMESPACE) $(NAME) . + helm diff upgrade --allow-unreleased --normalize-manifests -n $(NAMESPACE) $(NAME) . update: rm -rf charts diff --git a/packages/system/fluxcd/Makefile b/packages/system/fluxcd/Makefile index 58f2e419..ca472364 100644 --- a/packages/system/fluxcd/Makefile +++ b/packages/system/fluxcd/Makefile @@ -2,13 +2,13 @@ NAMESPACE=cozy-fluxcd NAME=fluxcd show: - helm template -n $(NAMESPACE) $(NAME) . + helm template --dry-run=server -n $(NAMESPACE) $(NAME) . apply: helm upgrade -i -n $(NAMESPACE) $(NAME) . diff: - helm diff upgrade --allow-unreleased -n $(NAMESPACE) $(NAME) . + helm diff upgrade --allow-unreleased --normalize-manifests -n $(NAMESPACE) $(NAME) . update: rm -rf charts diff --git a/packages/system/grafana-operator/Makefile b/packages/system/grafana-operator/Makefile index a41006a2..4064a7f0 100644 --- a/packages/system/grafana-operator/Makefile +++ b/packages/system/grafana-operator/Makefile @@ -2,13 +2,13 @@ NAME=grafana-operator NAMESPACE=cozy-grafana-operator show: - helm template -n $(NAMESPACE) $(NAME) . + helm template --dry-run=server -n $(NAMESPACE) $(NAME) . apply: helm upgrade -i -n $(NAMESPACE) $(NAME) . diff: - helm diff upgrade --allow-unreleased -n $(NAMESPACE) $(NAME) . + helm diff upgrade --allow-unreleased --normalize-manifests -n $(NAMESPACE) $(NAME) . update: rm -rf charts diff --git a/packages/system/ingress-nginx/Makefile b/packages/system/ingress-nginx/Makefile index 244285e1..f51895b8 100644 --- a/packages/system/ingress-nginx/Makefile +++ b/packages/system/ingress-nginx/Makefile @@ -2,13 +2,13 @@ NAME=ingress-nginx NAMESPACE=cozy-ingress-nginx show: - helm template -n $(NAMESPACE) $(NAME) . + helm template --dry-run=server -n $(NAMESPACE) $(NAME) . apply: helm upgrade -i -n $(NAMESPACE) $(NAME) . diff: - helm diff upgrade --allow-unreleased -n $(NAMESPACE) $(NAME) . + helm diff upgrade --allow-unreleased --normalize-manifests -n $(NAMESPACE) $(NAME) . update: rm -rf charts diff --git a/packages/system/kubeapps/Makefile b/packages/system/kubeapps/Makefile index 41392a13..6982f40e 100644 --- a/packages/system/kubeapps/Makefile +++ b/packages/system/kubeapps/Makefile @@ -2,13 +2,13 @@ NAME=kubeapps NAMESPACE=cozy-kubeapps show: - helm template -n $(NAMESPACE) $(NAME) . + helm template --dry-run=server -n $(NAMESPACE) $(NAME) . apply: helm upgrade -i -n $(NAMESPACE) $(NAME) . diff: - helm diff upgrade --allow-unreleased -n $(NAMESPACE) $(NAME) . + helm diff upgrade --allow-unreleased --normalize-manifests -n $(NAMESPACE) $(NAME) . update: update-chart update-dockerfiles image: image-dashboard image-kubeapps-apis diff --git a/packages/system/kubeovn/Makefile b/packages/system/kubeovn/Makefile index 13fd4490..fdef3f6c 100644 --- a/packages/system/kubeovn/Makefile +++ b/packages/system/kubeovn/Makefile @@ -8,7 +8,7 @@ apply: helm upgrade -i -n $(NAMESPACE) $(NAME) . diff: - helm diff upgrade --dry-run --allow-unreleased -n $(NAMESPACE) $(NAME) . + helm diff upgrade --allow-unreleased --normalize-manifests -n $(NAMESPACE) $(NAME) . update: rm -rf charts && mkdir -p charts/kube-ovn diff --git a/packages/system/kubevirt-operator/Makefile b/packages/system/kubevirt-operator/Makefile index 20a73863..b4545502 100644 --- a/packages/system/kubevirt-operator/Makefile +++ b/packages/system/kubevirt-operator/Makefile @@ -2,13 +2,13 @@ NAME=kubevirt-operator NAMESPACE=cozy-kubevirt show: - helm template -n $(NAMESPACE) $(NAME) . + helm template --dry-run=server -n $(NAMESPACE) $(NAME) . apply: helm upgrade -i -n $(NAMESPACE) $(NAME) . diff: - helm diff upgrade --allow-unreleased -n $(NAMESPACE) $(NAME) . + helm diff upgrade --allow-unreleased --normalize-manifests -n $(NAMESPACE) $(NAME) . update: rm -rf templates diff --git a/packages/system/kubevirt/Makefile b/packages/system/kubevirt/Makefile index b6861d67..883c83ba 100644 --- a/packages/system/kubevirt/Makefile +++ b/packages/system/kubevirt/Makefile @@ -2,13 +2,13 @@ NAME=kubevirt NAMESPACE=cozy-kubevirt show: - helm template -n $(NAMESPACE) $(NAME) . + helm template --dry-run=server -n $(NAMESPACE) $(NAME) . apply: helm upgrade -i -n $(NAMESPACE) $(NAME) . diff: - helm diff upgrade --allow-unreleased -n $(NAMESPACE) $(NAME) . + helm diff upgrade --allow-unreleased --normalize-manifests -n $(NAMESPACE) $(NAME) . update: rm -rf templates diff --git a/packages/system/linstor/Makefile b/packages/system/linstor/Makefile index 3f223888..e19d5f36 100644 --- a/packages/system/linstor/Makefile +++ b/packages/system/linstor/Makefile @@ -2,10 +2,10 @@ NAME=linstor NAMESPACE=cozy-linstor show: - helm template -n $(NAMESPACE) $(NAME) . + helm template --dry-run=server -n $(NAMESPACE) $(NAME) . apply: helm upgrade -i -n $(NAMESPACE) $(NAME) . diff: - helm diff upgrade --allow-unreleased -n $(NAMESPACE) $(NAME) . + helm diff upgrade --allow-unreleased --normalize-manifests -n $(NAMESPACE) $(NAME) . diff --git a/packages/system/mariadb-operator/Makefile b/packages/system/mariadb-operator/Makefile index cd65126e..ce589c71 100644 --- a/packages/system/mariadb-operator/Makefile +++ b/packages/system/mariadb-operator/Makefile @@ -2,13 +2,13 @@ NAME=mariadb-operator NAMESPACE=cozy-mariadb-operator show: - helm template -n $(NAMESPACE) $(NAME) . + helm template --dry-run=server -n $(NAMESPACE) $(NAME) . apply: helm upgrade -i -n $(NAMESPACE) $(NAME) . diff: - helm diff upgrade --allow-unreleased -n $(NAMESPACE) $(NAME) . + helm diff upgrade --allow-unreleased --normalize-manifests -n $(NAMESPACE) $(NAME) . update: rm -rf charts diff --git a/packages/system/metallb-addresses/Makefile b/packages/system/metallb-addresses/Makefile index 5da600ba..aba18ca8 100644 --- a/packages/system/metallb-addresses/Makefile +++ b/packages/system/metallb-addresses/Makefile @@ -2,10 +2,10 @@ NAME=metallb-addresses NAMESPACE=cozy-metallb show: - helm template -n $(NAMESPACE) $(NAME) . + helm template --dry-run=server -n $(NAMESPACE) $(NAME) . apply: helm upgrade -i -n $(NAMESPACE) $(NAME) . diff: - helm diff upgrade --allow-unreleased -n $(NAMESPACE) $(NAME) . + helm diff upgrade --allow-unreleased --normalize-manifests -n $(NAMESPACE) $(NAME) . diff --git a/packages/system/metallb/Makefile b/packages/system/metallb/Makefile index 4d33abb0..95755e94 100644 --- a/packages/system/metallb/Makefile +++ b/packages/system/metallb/Makefile @@ -2,13 +2,13 @@ NAME=metallb NAMESPACE=cozy-metallb show: - helm template -n $(NAMESPACE) $(NAME) . + helm template --dry-run=server -n $(NAMESPACE) $(NAME) . apply: helm upgrade -i -n $(NAMESPACE) $(NAME) . diff: - helm diff upgrade --allow-unreleased -n $(NAMESPACE) $(NAME) . + helm diff upgrade --allow-unreleased --normalize-manifests -n $(NAMESPACE) $(NAME) . update: rm -rf charts diff --git a/packages/system/monitoring/Makefile b/packages/system/monitoring/Makefile index 4b768024..52020e87 100644 --- a/packages/system/monitoring/Makefile +++ b/packages/system/monitoring/Makefile @@ -2,13 +2,13 @@ NAME=monitoring NAMESPACE=cozy-monitoring show: - helm template -n $(NAMESPACE) $(NAME) . + helm template --dry-run=server -n $(NAMESPACE) $(NAME) . apply: helm upgrade -i -n $(NAMESPACE) $(NAME) . diff: - helm diff upgrade --allow-unreleased -n $(NAMESPACE) $(NAME) . + helm diff upgrade --allow-unreleased --normalize-manifests -n $(NAMESPACE) $(NAME) . update: rm -rf charts diff --git a/packages/system/piraeus-operator/Makefile b/packages/system/piraeus-operator/Makefile index 52ad006e..1f23a118 100644 --- a/packages/system/piraeus-operator/Makefile +++ b/packages/system/piraeus-operator/Makefile @@ -2,13 +2,13 @@ NAME=piraeus-operator NAMESPACE=cozy-linstor show: - helm template -n $(NAMESPACE) $(NAME) . + helm template --dry-run=server -n $(NAMESPACE) $(NAME) . apply: helm upgrade -i -n $(NAMESPACE) $(NAME) . diff: - helm diff upgrade --allow-unreleased -n $(NAMESPACE) $(NAME) . + helm diff upgrade --allow-unreleased --normalize-manifests -n $(NAMESPACE) $(NAME) . update: rm -rf charts diff --git a/packages/system/postgres-operator/Makefile b/packages/system/postgres-operator/Makefile index 56b0052e..f46734d0 100644 --- a/packages/system/postgres-operator/Makefile +++ b/packages/system/postgres-operator/Makefile @@ -2,13 +2,13 @@ NAME=postgres-operator NAMESPACE=cozy-postgres-operator show: - helm template -n $(NAMESPACE) $(NAME) . + helm template --dry-run=server -n $(NAMESPACE) $(NAME) . apply: helm upgrade -i -n $(NAMESPACE) $(NAME) . diff: - helm diff upgrade --allow-unreleased -n $(NAMESPACE) $(NAME) . + helm diff upgrade --allow-unreleased --normalize-manifests -n $(NAMESPACE) $(NAME) . update: rm -rf charts diff --git a/packages/system/rabbitmq-operator/Makefile b/packages/system/rabbitmq-operator/Makefile index 3b4ac9a9..1b11ad0d 100644 --- a/packages/system/rabbitmq-operator/Makefile +++ b/packages/system/rabbitmq-operator/Makefile @@ -2,13 +2,13 @@ NAME=rabbitmq-operator NAMESPACE=cozy-rabbitmq-operator show: - helm template -n $(NAMESPACE) $(NAME) . + helm template --dry-run=server -n $(NAMESPACE) $(NAME) . apply: helm upgrade -i -n $(NAMESPACE) $(NAME) . diff: - helm diff upgrade --allow-unreleased -n $(NAMESPACE) $(NAME) . + helm diff upgrade --allow-unreleased --normalize-manifests -n $(NAMESPACE) $(NAME) . update: rm -rf templates/cluster-operator.yml diff --git a/packages/system/redis-operator/Makefile b/packages/system/redis-operator/Makefile index 3c9a0d65..16ff97ab 100644 --- a/packages/system/redis-operator/Makefile +++ b/packages/system/redis-operator/Makefile @@ -2,13 +2,13 @@ NAME=redis-operator NAMESPACE=cozy-redis-operator show: - helm template -n $(NAMESPACE) $(NAME) . + helm template --dry-run=server -n $(NAMESPACE) $(NAME) . apply: helm upgrade -i -n $(NAMESPACE) $(NAME) . diff: - helm diff upgrade --allow-unreleased -n $(NAMESPACE) $(NAME) . + helm diff upgrade --allow-unreleased --normalize-manifests -n $(NAMESPACE) $(NAME) . update: rm -rf charts diff --git a/packages/system/telepresence/Makefile b/packages/system/telepresence/Makefile index e68158fc..d2311d0d 100644 --- a/packages/system/telepresence/Makefile +++ b/packages/system/telepresence/Makefile @@ -2,13 +2,13 @@ NAME=traffic-manager NAMESPACE=cozy-telepresence show: - helm template -n $(NAMESPACE) $(NAME) . + helm template --dry-run=server -n $(NAMESPACE) $(NAME) . apply: helm upgrade -i -n $(NAMESPACE) $(NAME) . diff: - helm diff upgrade --allow-unreleased -n $(NAMESPACE) $(NAME) . + helm diff upgrade --allow-unreleased --normalize-manifests -n $(NAMESPACE) $(NAME) . update: rm -rf charts diff --git a/packages/system/victoria-metrics-operator/Makefile b/packages/system/victoria-metrics-operator/Makefile index db3adcfd..a2f89f86 100644 --- a/packages/system/victoria-metrics-operator/Makefile +++ b/packages/system/victoria-metrics-operator/Makefile @@ -2,13 +2,13 @@ NAME=victoria-metrics-operator NAMESPACE=cozy-victoria-metrics-operator show: - helm template -n $(NAMESPACE) $(NAME) . + helm template --dry-run=server -n $(NAMESPACE) $(NAME) . apply: helm upgrade -i -n $(NAMESPACE) $(NAME) . diff: - helm diff upgrade --allow-unreleased -n $(NAMESPACE) $(NAME) . + helm diff upgrade --allow-unreleased --normalize-manifests -n $(NAMESPACE) $(NAME) . update: rm -rf charts