Mirrors/rpi.carlosedp.cluster-monitoring
1
0
Fork 0
mirror of https://github.com/carlosedp/cluster-monitoring.git synced 2024-11-20 19:07:17 +01:00
Code Issues Projects Releases Wiki Activity

Use a valid name for the TLS secret

Browse Source 
Fixes #66.
This commit is contained in:
Carlos de Paula 2020-06-22 13:35:11 -03:00
parent 71e9e55f4c
commit 9a9e92588c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
base_operator_stack.jsonnet
View File

@ -136,7 +136,7 @@ local vars = import 'vars.jsonnet';
local I = utils.newIngress('alertmanager-main', $._config.namespace, $._config.urls.alert_ingress, '/', 'alertmanager-main', 'web'); local I = utils.newIngress('alertmanager-main', $._config.namespace, $._config.urls.alert_ingress, '/', 'alertmanager-main', 'web');
if vars.TLSingress then if vars.TLSingress then
if vars.UseProvidedCerts then if vars.UseProvidedCerts then
utils.addIngressTLS(I, 'ingress-TLS-secret') utils.addIngressTLS(I, 'ingress-secret')
else else
utils.addIngressTLS(I) utils.addIngressTLS(I)
else else
@ -146,7 +146,7 @@ local vars = import 'vars.jsonnet';
local I = utils.newIngress('grafana', $._config.namespace, $._config.urls.grafana_ingress, '/', 'grafana', 'http'); local I = utils.newIngress('grafana', $._config.namespace, $._config.urls.grafana_ingress, '/', 'grafana', 'http');
if vars.TLSingress then if vars.TLSingress then
if vars.UseProvidedCerts then if vars.UseProvidedCerts then
utils.addIngressTLS(I, 'ingress-TLS-secret') utils.addIngressTLS(I, 'ingress-secret')
else else
utils.addIngressTLS(I) utils.addIngressTLS(I)
else else
@ -156,7 +156,7 @@ local vars = import 'vars.jsonnet';
local I = utils.newIngress('prometheus-k8s', $._config.namespace, $._config.urls.prom_ingress, '/', 'prometheus-k8s', 'web'); local I = utils.newIngress('prometheus-k8s', $._config.namespace, $._config.urls.prom_ingress, '/', 'prometheus-k8s', 'web');
if vars.TLSingress then if vars.TLSingress then
if vars.UseProvidedCerts then if vars.UseProvidedCerts then
utils.addIngressTLS(I, 'ingress-TLS-secret') utils.addIngressTLS(I, 'ingress-secret')
else else
utils.addIngressTLS(I) utils.addIngressTLS(I)
else else
@ -188,6 +188,6 @@ local vars = import 'vars.jsonnet';
// secret.mixin.metadata.withNamespace($._config.namespace), // secret.mixin.metadata.withNamespace($._config.namespace),
} + if vars.UseProvidedCerts then { } + if vars.UseProvidedCerts then {
secret: secret:
utils.newTLSSecret('ingress-TLS-secret', $._config.namespace, vars.TLSCertificate, vars.TLSKey), utils.newTLSSecret('ingress-secret', $._config.namespace, vars.TLSCertificate, vars.TLSKey),
} else {}, } else {},
} }