From f38635f4de63a66f645bca3c9d6a239695a1ab2a Mon Sep 17 00:00:00 2001 From: Tyler Gillson Date: Fri, 17 Nov 2023 09:26:16 -0700 Subject: [PATCH] fix: format alertmanager cert properly (#120) * fix: format alertmanager cert properly Signed-off-by: Tyler Gillson * chore: update VR CRD Signed-off-by: Tyler Gillson --------- Signed-off-by: Tyler Gillson --- .../crds/validation.spectrocloud.labs_validationresults.yaml | 3 +++ chart/validator/templates/sink-secret.yaml | 5 +++-- chart/validator/templates/validator-config.yaml | 2 +- chart/validator/values.yaml | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/chart/validator/crds/validation.spectrocloud.labs_validationresults.yaml b/chart/validator/crds/validation.spectrocloud.labs_validationresults.yaml index a4e5e456..e027bc44 100644 --- a/chart/validator/crds/validation.spectrocloud.labs_validationresults.yaml +++ b/chart/validator/crds/validation.spectrocloud.labs_validationresults.yaml @@ -48,6 +48,9 @@ spec: description: ValidationResultSpec defines the desired state of ValidationResult properties: expectedResults: + description: The number of rules in the validator plugin spec, hence + the number of expected ValidationResults. + minimum: 1 type: integer plugin: type: string diff --git a/chart/validator/templates/sink-secret.yaml b/chart/validator/templates/sink-secret.yaml index da0f14ba..5e70d497 100644 --- a/chart/validator/templates/sink-secret.yaml +++ b/chart/validator/templates/sink-secret.yaml @@ -6,10 +6,11 @@ metadata: stringData: {{- if eq .Values.sink.type "alertmanager" }} endpoint: {{ required ".Values.sink.endpoint is required!" .Values.sink.endpoint }} - insecureSkipVerify: {{ .Values.sink.insecureSkipVerify }} - caCert: {{ .Values.sink.caCert }} username: {{ .Values.sink.username }} password: {{ .Values.sink.password }} + insecureSkipVerify: {{ .Values.sink.insecureSkipVerify | quote }} + caCert: | +{{ .Values.sink.caCert | indent 4 }} {{- else if eq .Values.sink.type "slack" }} apiToken: {{ required ".Values.sink.apiToken is required!" .Values.sink.apiToken }} channelId: {{ required ".Values.sink.channelId is required!" .Values.sink.channelId }} diff --git a/chart/validator/templates/validator-config.yaml b/chart/validator/templates/validator-config.yaml index fe059c18..a2a09217 100644 --- a/chart/validator/templates/validator-config.yaml +++ b/chart/validator/templates/validator-config.yaml @@ -4,7 +4,7 @@ metadata: name: validator-config spec: plugins: -{{ toYaml .Values.plugins | indent 2 }} +{{ toYaml .Values.plugins | indent 2 }} {{- if .Values.sink }} sink: type: {{ required ".Values.sink.type is required!" .Values.sink.type }} diff --git a/chart/validator/values.yaml b/chart/validator/values.yaml index 8495bede..797b096c 100644 --- a/chart/validator/values.yaml +++ b/chart/validator/values.yaml @@ -56,7 +56,7 @@ metricsService: sink: {} # type: alertmanager # secretName: alertmanager-sink-secret - # endpoint: "http://alertmanager.alertmanager.svc.cluster.local:9093" + # endpoint: "https://alertmanager.alertmanager.svc.cluster.local:9093" # insecureSkipVerify: "false" # caCert: "" # (TLS CA certificate, optional) # username: "" # (HTTP basic auth, optional)