From 4bd005c8a1a5f5b837a604a58c910eb7eb23dd51 Mon Sep 17 00:00:00 2001 From: Andrii Chubatiuk Date: Sun, 25 Aug 2024 13:51:00 +0300 Subject: [PATCH] fixed issuer indent (#1316) --- charts/victoria-metrics-operator/CHANGELOG.md | 3 ++- charts/victoria-metrics-operator/templates/webhook.yaml | 5 +++-- charts/victoria-metrics-operator/values.yaml | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/charts/victoria-metrics-operator/CHANGELOG.md b/charts/victoria-metrics-operator/CHANGELOG.md index ccc148ed8..c5cf0fb3c 100644 --- a/charts/victoria-metrics-operator/CHANGELOG.md +++ b/charts/victoria-metrics-operator/CHANGELOG.md @@ -2,7 +2,8 @@ ## Next release -- TODO +- set `admissionWebhooks.keepTLSSecret` to `true` by default +- fixed indent, for Issuer crd, when `cert-manager.enabled: true` ## 0.34.1 diff --git a/charts/victoria-metrics-operator/templates/webhook.yaml b/charts/victoria-metrics-operator/templates/webhook.yaml index 9d64f39fe..ca83a93c5 100644 --- a/charts/victoria-metrics-operator/templates/webhook.yaml +++ b/charts/victoria-metrics-operator/templates/webhook.yaml @@ -1,5 +1,6 @@ {{- if .Values.admissionWebhooks.enabled }} {{- $tls := fromYaml (include "vm-operator.certs" .) }} +--- apiVersion: admissionregistration.k8s.io/v1 kind: ValidatingWebhookConfiguration metadata: @@ -41,11 +42,11 @@ webhooks: - UPDATE resources: - {{ $name }}{{ ternary "" "s" (hasSuffix "s" $name) }} ---- {{- end }} {{- end }} {{- if .Values.admissionWebhooks.certManager.enabled }} -{{- if not .Values.admissionWebhooks.certManager.issuer -}} +{{- if not .Values.admissionWebhooks.certManager.issuer }} +--- apiVersion: cert-manager.io/v1 kind: Issuer metadata: diff --git a/charts/victoria-metrics-operator/values.yaml b/charts/victoria-metrics-operator/values.yaml index a40d25487..f737abcf5 100644 --- a/charts/victoria-metrics-operator/values.yaml +++ b/charts/victoria-metrics-operator/values.yaml @@ -210,7 +210,7 @@ admissionWebhooks: enabled: false # --If needed, provide own issuer. Operator will create self-signed if empty. issuer: {} - keepTLSSecret: false + keepTLSSecret: true # tls specifies TLS cert/key for the webhook tls: caCert: