From bb6b5099dc4645204bf445d3dad958156c256fad Mon Sep 17 00:00:00 2001 From: Robert Nemeti <nrobert13@gmail.com> Date: Tue, 2 Oct 2018 15:14:21 +0200 Subject: [PATCH] allow backward compatibility with the textblock --- jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet b/jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet index ad3fb0e8..91cf05f1 100644 --- a/jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet +++ b/jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet @@ -47,7 +47,11 @@ local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet'; secret: local secret = k.core.v1.secret; - secret.new('alertmanager-' + $._config.alertmanager.name, { 'alertmanager.yaml': std.base64(std.manifestYamlDoc($._config.alertmanager.config)) }) + + if std.type($._config.alertmanager.config) == "object" then + secret.new('alertmanager-' + $._config.alertmanager.name, { 'alertmanager.yaml': std.base64(std.manifestYamlDoc($._config.alertmanager.config)) }) + else + secret.new('alertmanager-' + $._config.alertmanager.name, { 'alertmanager.yaml': std.base64($._config.alertmanager.config) }) + + secret.mixin.metadata.withNamespace($._config.namespace), serviceAccount: -- GitLab