From f288d9f2461201681514ec5457cabfd870bb75bb Mon Sep 17 00:00:00 2001 From: Andrei Kvapil Date: Fri, 29 Dec 2023 17:37:47 +0100 Subject: [PATCH] remove helmwave --- packages/core/namespaces/Chart.yaml | 2 + packages/core/namespaces/Makefile | 9 +- packages/core/namespaces/namespaces.yaml | 97 ------- .../core/namespaces/templates/namespaces.yaml | 13 + packages/core/namespaces/values.yaml | 26 ++ packages/system/.gitignore | 1 - packages/system/Makefile | 18 ++ packages/system/cert-manager-issuers/Makefile | 11 + packages/system/cert-manager/Makefile | 12 + packages/system/grafana-operator/Makefile | 12 + packages/system/helmwave.yml | 262 ------------------ packages/system/ingress-nginx/Makefile | 12 + packages/system/kubeapps/Makefile | 13 + packages/system/kubevirt-operator/Makefile | 12 + packages/system/kubevirt/Makefile | 12 + packages/system/linstor/Makefile | 11 + packages/system/mariadb-operator/Makefile | 12 + packages/system/metallb-addresses/Makefile | 11 + packages/system/metallb/Makefile | 12 + packages/system/monitoring/Makefile | 12 + packages/system/piraeus-operator/Makefile | 12 + packages/system/postgres-operator/Makefile | 12 + packages/system/rabbitmq-operator/Makefile | 12 + packages/system/reconcile.sh | 39 --- packages/system/redis-operator/Makefile | 12 + packages/system/telepresence/Makefile | 12 + .../system/victoria-metrics-operator/Makefile | 12 + 27 files changed, 279 insertions(+), 402 deletions(-) create mode 100644 packages/core/namespaces/Chart.yaml delete mode 100644 packages/core/namespaces/namespaces.yaml create mode 100644 packages/core/namespaces/templates/namespaces.yaml create mode 100644 packages/core/namespaces/values.yaml delete mode 100644 packages/system/.gitignore create mode 100644 packages/system/Makefile delete mode 100644 packages/system/helmwave.yml delete mode 100755 packages/system/reconcile.sh diff --git a/packages/core/namespaces/Chart.yaml b/packages/core/namespaces/Chart.yaml new file mode 100644 index 00000000..29d365da --- /dev/null +++ b/packages/core/namespaces/Chart.yaml @@ -0,0 +1,2 @@ +name: cozystack +version: 0.0.0 diff --git a/packages/core/namespaces/Makefile b/packages/core/namespaces/Makefile index 6fc603cb..96bdc420 100644 --- a/packages/core/namespaces/Makefile +++ b/packages/core/namespaces/Makefile @@ -1,8 +1,11 @@ +NAMESPACE=cozy-system +NAME=namespaces + show: - cat namespaces.yaml + helm template -n $(NAMESPACE) $(NAME) . apply: - kubectl apply -f namespaces.yaml + helm template -n $(NAMESPACE) $(NAME) . | kubectl apply -f- diff: - kubectl diff -f namespaces.yaml + helm diff upgrade --allow-unreleased -n $(NAMESPACE) $(NAME) . diff --git a/packages/core/namespaces/namespaces.yaml b/packages/core/namespaces/namespaces.yaml deleted file mode 100644 index 993942a2..00000000 --- a/packages/core/namespaces/namespaces.yaml +++ /dev/null @@ -1,97 +0,0 @@ ---- -apiVersion: v1 -kind: Namespace -metadata: - name: cozy-cert-manager ---- -apiVersion: v1 -kind: Namespace -metadata: - labels: - pod-security.kubernetes.io/enforce: privileged - name: cozy-cilium ---- -apiVersion: v1 -kind: Namespace -metadata: - name: cozy-fluxcd ---- -apiVersion: v1 -kind: Namespace -metadata: - name: cozy-grafana-operator ---- -apiVersion: v1 -kind: Namespace -metadata: - name: cozy-ingress-nginx ---- -apiVersion: v1 -kind: Namespace -metadata: - name: cozy-kubeapps ---- -apiVersion: v1 -kind: Namespace -metadata: - labels: - pod-security.kubernetes.io/enforce: privileged - name: cozy-kubeovn ---- -apiVersion: v1 -kind: Namespace -metadata: - labels: - pod-security.kubernetes.io/enforce: privileged - name: cozy-kubevirt ---- -apiVersion: v1 -kind: Namespace -metadata: - labels: - pod-security.kubernetes.io/enforce: privileged - name: cozy-linstor ---- -apiVersion: v1 -kind: Namespace -metadata: - name: cozy-mariadb-operator ---- -apiVersion: v1 -kind: Namespace -metadata: - labels: - pod-security.kubernetes.io/enforce: privileged - name: cozy-metallb ---- -apiVersion: v1 -kind: Namespace -metadata: - labels: - pod-security.kubernetes.io/enforce: privileged - name: cozy-monitoring ---- -apiVersion: v1 -kind: Namespace -metadata: - name: cozy-postgres-operator ---- -apiVersion: v1 -kind: Namespace -metadata: - name: cozy-rabbitmq-operator ---- -apiVersion: v1 -kind: Namespace -metadata: - name: cozy-redis-operator ---- -apiVersion: v1 -kind: Namespace -metadata: - name: cozy-telepresence ---- -apiVersion: v1 -kind: Namespace -metadata: - name: cozy-victoria-metrics-operator diff --git a/packages/core/namespaces/templates/namespaces.yaml b/packages/core/namespaces/templates/namespaces.yaml new file mode 100644 index 00000000..ad89c719 --- /dev/null +++ b/packages/core/namespaces/templates/namespaces.yaml @@ -0,0 +1,13 @@ +{{- range $ns := .Values.namespaces }} +--- +apiVersion: v1 +kind: Namespace +metadata: + annotations: + "helm.sh/resource-policy": keep + {{- if $ns.privileged }} + labels: + pod-security.kubernetes.io/enforce: privileged + {{- end }} + name: {{ $ns.name }} +{{- end }} diff --git a/packages/core/namespaces/values.yaml b/packages/core/namespaces/values.yaml new file mode 100644 index 00000000..c1bbdb89 --- /dev/null +++ b/packages/core/namespaces/values.yaml @@ -0,0 +1,26 @@ +namespaces: +- name: cozy-system + privileged: true +- name: cozy-cert-manager +- name: cozy-cilium + privileged: true +- name: cozy-fluxcd +- name: cozy-grafana-operator +- name: cozy-ingress-nginx +- name: cozy-kubeapps +- name: cozy-kubeovn + privileged: true +- name: cozy-kubevirt + privileged: true +- name: cozy-linstor + privileged: true +- name: cozy-mariadb-operator +- name: cozy-metallb + privileged: true +- name: cozy-monitoring + privileged: true +- name: cozy-postgres-operator +- name: cozy-rabbitmq-operator +- name: cozy-redis-operator +- name: cozy-telepresence +- name: cozy-victoria-metrics-operator diff --git a/packages/system/.gitignore b/packages/system/.gitignore deleted file mode 100644 index e1cf0905..00000000 --- a/packages/system/.gitignore +++ /dev/null @@ -1 +0,0 @@ -.helmwave diff --git a/packages/system/Makefile b/packages/system/Makefile new file mode 100644 index 00000000..7c811bf6 --- /dev/null +++ b/packages/system/Makefile @@ -0,0 +1,18 @@ +apply show diff prepare: + 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 $@ diff --git a/packages/system/cert-manager-issuers/Makefile b/packages/system/cert-manager-issuers/Makefile index e69de29b..356763cc 100644 --- a/packages/system/cert-manager-issuers/Makefile +++ b/packages/system/cert-manager-issuers/Makefile @@ -0,0 +1,11 @@ +NAME=cert-manager-issuers +NAMESPACE=cozy-cert-manager + +show: + helm template -n $(NAMESPACE) $(NAME) . + +apply: + helm upgrade -i -n $(NAMESPACE) $(NAME) . + +diff: + helm diff upgrade --allow-unreleased -n $(NAMESPACE) $(NAME) . diff --git a/packages/system/cert-manager/Makefile b/packages/system/cert-manager/Makefile index 8b96ab0d..e1469bdf 100644 --- a/packages/system/cert-manager/Makefile +++ b/packages/system/cert-manager/Makefile @@ -1,3 +1,15 @@ +NAME=cert-manager +NAMESPACE=cozy-cert-manager + +show: + helm template -n $(NAMESPACE) $(NAME) . + +apply: + helm upgrade -i -n $(NAMESPACE) $(NAME) . + +diff: + helm diff upgrade --allow-unreleased -n $(NAMESPACE) $(NAME) . + update: rm -rf charts helm repo add jetstack https://charts.jetstack.io diff --git a/packages/system/grafana-operator/Makefile b/packages/system/grafana-operator/Makefile index d4721e21..a41006a2 100644 --- a/packages/system/grafana-operator/Makefile +++ b/packages/system/grafana-operator/Makefile @@ -1,3 +1,15 @@ +NAME=grafana-operator +NAMESPACE=cozy-grafana-operator + +show: + helm template -n $(NAMESPACE) $(NAME) . + +apply: + helm upgrade -i -n $(NAMESPACE) $(NAME) . + +diff: + helm diff upgrade --allow-unreleased -n $(NAMESPACE) $(NAME) . + update: rm -rf charts mkdir -p charts diff --git a/packages/system/helmwave.yml b/packages/system/helmwave.yml deleted file mode 100644 index 9f1dc4af..00000000 --- a/packages/system/helmwave.yml +++ /dev/null @@ -1,262 +0,0 @@ -project: cozystack -version: "0.0.0" - -.options: &options - wait: true - wait_for_jobs: true - force: false - timeout: 10m - atomic: false - max_history: 3 - create_namespace: true - offline_kube_version: 1.29.0 - pending_release_strategy: rollback - -releases: - - name: cilium - chart: cilium - namespace: cozy-cilium - <<: *options - tags: - - cilium - values: - - cilium/values.yaml - - - name: kubeovn - chart: kubeovn - namespace: cozy-kubeovn - <<: *options - reuse_values: true - tags: - - kubeovn - values: - - kubeovn/values.yaml - - kubeovn/values-runtime.yaml - depends_on: - - cilium@cozy-cilium - - - name: fluxcd - chart: fluxcd - namespace: cozy-fluxcd - <<: *options - tags: - - fluxcd - values: - - fluxcd/values.yaml - depends_on: - - cilium@cozy-cilium - - kubeovn@cozy-kubeovn - - - name: cert-manager - chart: cert-manager - namespace: cozy-cert-manager - <<: *options - tags: - - cert-manager - values: - - cert-manager/values.yaml - depends_on: - - cilium@cozy-cilium - - kubeovn@cozy-kubeovn - - - name: cert-manager-issuers - chart: cert-manager-issuers - namespace: cozy-cert-manager - <<: *options - tags: - - cert-manager - values: - - cert-manager-issuers/values.yaml - depends_on: - - cilium@cozy-cilium - - kubeovn@cozy-kubeovn - - cert-manager@cozy-cert-manager - - - name: victoria-metrics-operator - chart: victoria-metrics-operator - namespace: cozy-victoria-metrics-operator - <<: *options - tags: - - victoria-metrics-operator - values: - - victoria-metrics-operator/values.yaml - depends_on: - - cilium@cozy-cilium - - kubeovn@cozy-kubeovn - - cert-manager@cozy-cert-manager - - - name: monitoring - chart: monitoring - namespace: cozy-monitoring - <<: *options - tags: - - monitoring - values: - - monitoring/values.yaml - depends_on: - - cilium@cozy-cilium - - kubeovn@cozy-kubeovn - - victoria-metrics-operator@cozy-victoria-metrics-operator - - - name: kubevirt-operator - chart: kubevirt-operator - namespace: cozy-kubevirt - <<: *options - tags: - - kubevirt - values: - - kubevirt-operator/values.yaml - depends_on: - - cilium@cozy-cilium - - kubeovn@cozy-kubeovn - - - name: kubevirt - chart: kubevirt - namespace: cozy-kubevirt - <<: *options - tags: - - kubevirt - values: - - kubevirt/values.yaml - depends_on: - - cilium@cozy-cilium - - kubeovn@cozy-kubeovn - - kubevirt-operator@cozy-kubevirt - - - name: metallb - chart: metallb - namespace: cozy-metallb - <<: *options - tags: - - metallb - values: - - metallb/values.yaml - depends_on: - - cilium@cozy-cilium - - kubeovn@cozy-kubeovn - - - name: grafana-operator - chart: grafana-operator - namespace: cozy-grafana-operator - <<: *options - tags: - - grafana-operator - values: - - grafana-operator/values.yaml - depends_on: - - cilium@cozy-cilium - - kubeovn@cozy-kubeovn - - - name: mariadb-operator - chart: mariadb-operator - namespace: cozy-mariadb-operator - <<: *options - tags: - - mariadb-operator - values: - - mariadb-operator/values.yaml - depends_on: - - cilium@cozy-cilium - - kubeovn@cozy-kubeovn - - cert-manager@cozy-cert-manager - - victoria-metrics-operator@cozy-victoria-metrics-operator - - - name: postgres-operator - chart: postgres-operator - namespace: cozy-postgres-operator - <<: *options - tags: - - postgres-operator - values: - - postgres-operator/values.yaml - depends_on: - - cilium@cozy-cilium - - kubeovn@cozy-kubeovn - - cert-manager@cozy-cert-manager - - - name: rabbitmq-operator - chart: rabbitmq-operator - namespace: cozy-rabbitmq-operator - <<: *options - tags: - - rabbitmq-operator - values: - - rabbitmq-operator/values.yaml - depends_on: - - cilium@cozy-cilium - - kubeovn@cozy-kubeovn - - - name: redis-operator - chart: redis-operator - namespace: cozy-redis-operator - <<: *options - tags: - - redis-operator - values: - - redis-operator/values.yaml - depends_on: - - cilium@cozy-cilium - - kubeovn@cozy-kubeovn - - - name: piraeus-operator - chart: piraeus-operator - namespace: cozy-linstor - <<: *options - tags: - - piraeus-operator - values: - - piraeus-operator/values.yaml - depends_on: - - cilium@cozy-cilium - - kubeovn@cozy-kubeovn - - cert-manager@cozy-cert-manager - - - name: linstor - chart: linstor - namespace: cozy-linstor - <<: *options - tags: - - linstor - values: - - linstor/values.yaml - depends_on: - - cilium@cozy-cilium - - kubeovn@cozy-kubeovn - - piraeus-operator@cozy-linstor - - - name: traffic-manager - chart: telepresence - namespace: cozy-telepresence - <<: *options - tags: - - telepresence - values: - - telepresence/values.yaml - depends_on: - - cilium@cozy-cilium - - kubeovn@cozy-kubeovn - - - name: ingress-nginx - chart: ingress-nginx - namespace: cozy-ingress-nginx - <<: *options - tags: - - ingress-nginx - values: - - ingress-nginx/values.yaml - depends_on: - - cilium@cozy-cilium - - kubeovn@cozy-kubeovn - - cert-manager@cozy-cert-manager - - - name: kubeapps - chart: kubeapps - namespace: cozy-kubeapps - <<: *options - tags: - - kubeapps - values: - - kubeapps/values.yaml - depends_on: - - cilium@cozy-cilium - - kubeovn@cozy-kubeovn diff --git a/packages/system/ingress-nginx/Makefile b/packages/system/ingress-nginx/Makefile index ae9d34e4..244285e1 100644 --- a/packages/system/ingress-nginx/Makefile +++ b/packages/system/ingress-nginx/Makefile @@ -1,3 +1,15 @@ +NAME=ingress-nginx +NAMESPACE=cozy-ingress-nginx + +show: + helm template -n $(NAMESPACE) $(NAME) . + +apply: + helm upgrade -i -n $(NAMESPACE) $(NAME) . + +diff: + helm diff upgrade --allow-unreleased -n $(NAMESPACE) $(NAME) . + update: rm -rf charts helm repo add ingress-nginx https://kubernetes.github.io/ingress-nginx diff --git a/packages/system/kubeapps/Makefile b/packages/system/kubeapps/Makefile index d837e9ce..41392a13 100644 --- a/packages/system/kubeapps/Makefile +++ b/packages/system/kubeapps/Makefile @@ -1,4 +1,17 @@ +NAME=kubeapps +NAMESPACE=cozy-kubeapps + +show: + helm template -n $(NAMESPACE) $(NAME) . + +apply: + helm upgrade -i -n $(NAMESPACE) $(NAME) . + +diff: + helm diff upgrade --allow-unreleased -n $(NAMESPACE) $(NAME) . + update: update-chart update-dockerfiles +image: image-dashboard image-kubeapps-apis update-chart: rm -rf charts diff --git a/packages/system/kubevirt-operator/Makefile b/packages/system/kubevirt-operator/Makefile index 7a6908a2..20a73863 100644 --- a/packages/system/kubevirt-operator/Makefile +++ b/packages/system/kubevirt-operator/Makefile @@ -1,3 +1,15 @@ +NAME=kubevirt-operator +NAMESPACE=cozy-kubevirt + +show: + helm template -n $(NAMESPACE) $(NAME) . + +apply: + helm upgrade -i -n $(NAMESPACE) $(NAME) . + +diff: + helm diff upgrade --allow-unreleased -n $(NAMESPACE) $(NAME) . + update: rm -rf templates mkdir templates diff --git a/packages/system/kubevirt/Makefile b/packages/system/kubevirt/Makefile index ba453361..b6861d67 100644 --- a/packages/system/kubevirt/Makefile +++ b/packages/system/kubevirt/Makefile @@ -1,3 +1,15 @@ +NAME=kubevirt +NAMESPACE=cozy-kubevirt + +show: + helm template -n $(NAMESPACE) $(NAME) . + +apply: + helm upgrade -i -n $(NAMESPACE) $(NAME) . + +diff: + helm diff upgrade --allow-unreleased -n $(NAMESPACE) $(NAME) . + update: rm -rf templates mkdir templates diff --git a/packages/system/linstor/Makefile b/packages/system/linstor/Makefile index e69de29b..3f223888 100644 --- a/packages/system/linstor/Makefile +++ b/packages/system/linstor/Makefile @@ -0,0 +1,11 @@ +NAME=linstor +NAMESPACE=cozy-linstor + +show: + helm template -n $(NAMESPACE) $(NAME) . + +apply: + helm upgrade -i -n $(NAMESPACE) $(NAME) . + +diff: + helm diff upgrade --allow-unreleased -n $(NAMESPACE) $(NAME) . diff --git a/packages/system/mariadb-operator/Makefile b/packages/system/mariadb-operator/Makefile index 0875c03d..cd65126e 100644 --- a/packages/system/mariadb-operator/Makefile +++ b/packages/system/mariadb-operator/Makefile @@ -1,3 +1,15 @@ +NAME=mariadb-operator +NAMESPACE=cozy-mariadb-operator + +show: + helm template -n $(NAMESPACE) $(NAME) . + +apply: + helm upgrade -i -n $(NAMESPACE) $(NAME) . + +diff: + helm diff upgrade --allow-unreleased -n $(NAMESPACE) $(NAME) . + update: rm -rf charts helm repo add mariadb-operator https://mariadb-operator.github.io/mariadb-operator diff --git a/packages/system/metallb-addresses/Makefile b/packages/system/metallb-addresses/Makefile index e69de29b..5da600ba 100644 --- a/packages/system/metallb-addresses/Makefile +++ b/packages/system/metallb-addresses/Makefile @@ -0,0 +1,11 @@ +NAME=metallb-addresses +NAMESPACE=cozy-metallb + +show: + helm template -n $(NAMESPACE) $(NAME) . + +apply: + helm upgrade -i -n $(NAMESPACE) $(NAME) . + +diff: + helm diff upgrade --allow-unreleased -n $(NAMESPACE) $(NAME) . diff --git a/packages/system/metallb/Makefile b/packages/system/metallb/Makefile index b189e4bf..4d33abb0 100644 --- a/packages/system/metallb/Makefile +++ b/packages/system/metallb/Makefile @@ -1,3 +1,15 @@ +NAME=metallb +NAMESPACE=cozy-metallb + +show: + helm template -n $(NAMESPACE) $(NAME) . + +apply: + helm upgrade -i -n $(NAMESPACE) $(NAME) . + +diff: + helm diff upgrade --allow-unreleased -n $(NAMESPACE) $(NAME) . + update: rm -rf charts helm repo add metallb https://metallb.github.io/metallb diff --git a/packages/system/monitoring/Makefile b/packages/system/monitoring/Makefile index 0e1eb6d4..4b768024 100644 --- a/packages/system/monitoring/Makefile +++ b/packages/system/monitoring/Makefile @@ -1,3 +1,15 @@ +NAME=monitoring +NAMESPACE=cozy-monitoring + +show: + helm template -n $(NAMESPACE) $(NAME) . + +apply: + helm upgrade -i -n $(NAMESPACE) $(NAME) . + +diff: + helm diff upgrade --allow-unreleased -n $(NAMESPACE) $(NAME) . + update: rm -rf charts helm repo add prometheus-community https://prometheus-community.github.io/helm-charts diff --git a/packages/system/piraeus-operator/Makefile b/packages/system/piraeus-operator/Makefile index df8558fd..52ad006e 100644 --- a/packages/system/piraeus-operator/Makefile +++ b/packages/system/piraeus-operator/Makefile @@ -1,3 +1,15 @@ +NAME=piraeus-operator +NAMESPACE=cozy-linstor + +show: + helm template -n $(NAMESPACE) $(NAME) . + +apply: + helm upgrade -i -n $(NAMESPACE) $(NAME) . + +diff: + helm diff upgrade --allow-unreleased -n $(NAMESPACE) $(NAME) . + update: rm -rf charts tag=$$(git ls-remote --tags --sort="v:refname" https://github.com/piraeusdatastore/piraeus-operator | awk -F'[/^]' 'END{print $$3}') && \ diff --git a/packages/system/postgres-operator/Makefile b/packages/system/postgres-operator/Makefile index 4d1e778b..56b0052e 100644 --- a/packages/system/postgres-operator/Makefile +++ b/packages/system/postgres-operator/Makefile @@ -1,3 +1,15 @@ +NAME=postgres-operator +NAMESPACE=cozy-postgres-operator + +show: + helm template -n $(NAMESPACE) $(NAME) . + +apply: + helm upgrade -i -n $(NAMESPACE) $(NAME) . + +diff: + helm diff upgrade --allow-unreleased -n $(NAMESPACE) $(NAME) . + update: rm -rf charts helm repo add cnpg https://cloudnative-pg.github.io/charts diff --git a/packages/system/rabbitmq-operator/Makefile b/packages/system/rabbitmq-operator/Makefile index f9c9e017..3b4ac9a9 100644 --- a/packages/system/rabbitmq-operator/Makefile +++ b/packages/system/rabbitmq-operator/Makefile @@ -1,3 +1,15 @@ +NAME=rabbitmq-operator +NAMESPACE=cozy-rabbitmq-operator + +show: + helm template -n $(NAMESPACE) $(NAME) . + +apply: + helm upgrade -i -n $(NAMESPACE) $(NAME) . + +diff: + helm diff upgrade --allow-unreleased -n $(NAMESPACE) $(NAME) . + 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 diff --git a/packages/system/reconcile.sh b/packages/system/reconcile.sh deleted file mode 100755 index 2ff8791b..00000000 --- a/packages/system/reconcile.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh -# The script reacts to changes in the number of IP addresses for master nodes, and then starts reconciliation. - -get_ips() { - kubectl get nodes -lnode-role.kubernetes.io/control-plane -o jsonpath='{.items[*].status.addresses[?(@.type=="InternalIP")].address}' -} - -reconcile() { - kubectl apply -f namespaces.yaml - kubectl label node -lnode-role.kubernetes.io/control-plane kube-ovn/role=master --overwrite - - MASTER_NODES=$(kubectl get nodes -lnode-role.kubernetes.io/control-plane -o jsonpath='{.items[*].status.addresses[?(@.type=="InternalIP")].address}' | tr ' ' ',') - MASTER_COUNT=$(echo "$MASTER_NODES" | awk -F, '{ print NF }') - - echo "kube-ovn: - MASTER_NODES: \"${MASTER_NODES}\" - replicaCount: ${MASTER_COUNT}" > kubeovn/values-runtime.yaml - - helmwave --log-format text up --build || exit $? -} - -wait_for_new_ips() { - OLD_MASTER_NODES="$MASTER_NODES" - MASTER_NODES=$(get_ips | tr ' ' ',') - if [ "$MASTER_NODES" != "$MASTER_NODES" ]; then - return - fi - kubectl get nodes --watch-only=true -w -lnode-role.kubernetes.io/control-plane -o jsonpath='{.status.addresses[?(@.type=="InternalIP")].address}{"\n"}' | \ - while read address; do - if [ -n "$address" ] && ! echo ",$MASTER_NODES," | grep -q ",$address,"; then - return - fi - done -} - -reconcile -while wait_for_new_ips; do - reconcile -done diff --git a/packages/system/redis-operator/Makefile b/packages/system/redis-operator/Makefile index 6f4961c3..3c9a0d65 100644 --- a/packages/system/redis-operator/Makefile +++ b/packages/system/redis-operator/Makefile @@ -1,3 +1,15 @@ +NAME=redis-operator +NAMESPACE=cozy-redis-operator + +show: + helm template -n $(NAMESPACE) $(NAME) . + +apply: + helm upgrade -i -n $(NAMESPACE) $(NAME) . + +diff: + helm diff upgrade --allow-unreleased -n $(NAMESPACE) $(NAME) . + update: rm -rf charts helm repo add redis-operator https://spotahome.github.io/redis-operator diff --git a/packages/system/telepresence/Makefile b/packages/system/telepresence/Makefile index 813c983e..e68158fc 100644 --- a/packages/system/telepresence/Makefile +++ b/packages/system/telepresence/Makefile @@ -1,3 +1,15 @@ +NAME=traffic-manager +NAMESPACE=cozy-telepresence + +show: + helm template -n $(NAMESPACE) $(NAME) . + +apply: + helm upgrade -i -n $(NAMESPACE) $(NAME) . + +diff: + helm diff upgrade --allow-unreleased -n $(NAMESPACE) $(NAME) . + update: rm -rf charts helm repo add datawire https://app.getambassador.io diff --git a/packages/system/victoria-metrics-operator/Makefile b/packages/system/victoria-metrics-operator/Makefile index 8de0a122..db3adcfd 100644 --- a/packages/system/victoria-metrics-operator/Makefile +++ b/packages/system/victoria-metrics-operator/Makefile @@ -1,3 +1,15 @@ +NAME=victoria-metrics-operator +NAMESPACE=cozy-victoria-metrics-operator + +show: + helm template -n $(NAMESPACE) $(NAME) . + +apply: + helm upgrade -i -n $(NAMESPACE) $(NAME) . + +diff: + helm diff upgrade --allow-unreleased -n $(NAMESPACE) $(NAME) . + update: rm -rf charts # VictoriaMetrics operator