From eb4a2568ebac0b24d5a710883dfe8952b9b434d1 Mon Sep 17 00:00:00 2001 From: Denis Ryzhkov Date: Wed, 23 Jul 2025 13:42:45 +0200 Subject: [PATCH 1/2] fix: Added letter `v` to `cert-manager:v1.16.4` for compatibility with all registries --- charts/kof-mothership/README.md | 2 +- charts/kof-mothership/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/kof-mothership/README.md b/charts/kof-mothership/README.md index d96cfda0a..5d78da25c 100644 --- a/charts/kof-mothership/README.md +++ b/charts/kof-mothership/README.md @@ -20,7 +20,7 @@ A Helm chart that deploys Grafana, Promxy, and VictoriaMetrics. | Key | Type | Default | Description | |-----|------|---------|-------------| -| cert-manager-service-template | object | `{"chart":"cert-manager:1.16.4",`
`"namespace":"kcm-system",`
`"repo":{"name":"cert-manager",`
`"url":"https://charts.jetstack.io"}}` | Config of `ServiceTemplate` to use `cert-manager` in `MultiClusterService`. | +| cert-manager-service-template | object | `{"chart":"cert-manager:v1.16.4",`
`"namespace":"kcm-system",`
`"repo":{"name":"cert-manager",`
`"url":"https://charts.jetstack.io"}}` | Config of `ServiceTemplate` to use `cert-manager` in `MultiClusterService`. | | cert-manager
.cluster-issuer
.create | bool | `false` | Whether to create a default clusterissuer | | cert-manager
.cluster-issuer
.provider | string | `"letsencrypt"` | Default clusterissuer provider | | cert-manager
.email | string | `"mail@example.net"` | If we use letsencrypt (or similar) which email to use | diff --git a/charts/kof-mothership/values.yaml b/charts/kof-mothership/values.yaml index 3da8d3819..06982123d 100644 --- a/charts/kof-mothership/values.yaml +++ b/charts/kof-mothership/values.yaml @@ -40,7 +40,7 @@ cert-manager-service-template: repo: name: cert-manager url: https://charts.jetstack.io - chart: cert-manager:1.16.4 + chart: cert-manager:v1.16.4 namespace: kcm-system # -- Config of `ServiceTemplate` to use `ingress-nginx` in `MultiClusterService`. From 16bb7e86b355cdd8cca1a9814a15ffabf09e02db Mon Sep 17 00:00:00 2001 From: Denis Ryzhkov Date: Wed, 23 Jul 2025 14:46:36 +0200 Subject: [PATCH 2/2] fix: Using `cert-manager-v1-16-4` instead of `cert-manager-1-16-4` --- Makefile | 2 +- charts/kof-child/values.yaml | 2 +- charts/kof-regional/values.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 731151767..9fac8ed60 100644 --- a/Makefile +++ b/Makefile @@ -205,7 +205,7 @@ dev-ms-deploy: dev kof-operator-docker-build ## Deploy `kof-mothership` helm cha $(KUBECTL) apply -f ./charts/kof-mothership/crds/kof.k0rdent.mirantis.com_promxyservergroups.yaml $(HELM_UPGRADE) -n kof kof-mothership ./charts/kof-mothership -f dev/mothership-values.yaml $(KUBECTL) rollout restart -n kof deployment/kof-mothership-kof-operator - @svctmpls='cert-manager-1-16-4|ingress-nginx-4-12-1|kof-collectors-1-1-0|kof-operators-1-1-0|kof-storage-1-1-0'; \ + @svctmpls='cert-manager-v1-16-4|ingress-nginx-4-12-1|kof-collectors-1-1-0|kof-operators-1-1-0|kof-storage-1-1-0'; \ for attempt in $$(seq 1 10); do \ if [ $$($(KUBECTL) get svctmpl -A | grep -E "$$svctmpls" | grep -c true) -eq 5 ]; then break; fi; \ echo "|Waiting for the next service templates to become VALID:|$$svctmpls|Found:" | tr "|" "\n"; \ diff --git a/charts/kof-child/values.yaml b/charts/kof-child/values.yaml index 1cc6d1f64..a5136195f 100644 --- a/charts/kof-child/values.yaml +++ b/charts/kof-child/values.yaml @@ -1,6 +1,6 @@ cert-manager: enabled: true - template: cert-manager-1-16-4 + template: cert-manager-v1-16-4 kcm: namespace: kcm-system diff --git a/charts/kof-regional/values.yaml b/charts/kof-regional/values.yaml index 8a5e091f0..ac8ec36c5 100644 --- a/charts/kof-regional/values.yaml +++ b/charts/kof-regional/values.yaml @@ -1,6 +1,6 @@ cert-manager: enabled: true - template: cert-manager-1-16-4 + template: cert-manager-v1-16-4 ingress-nginx: enabled: true