Correct ingress jsonnet object naming to match projects general naming convention

This commit is contained in:
Karl Skewes
2018-10-29 22:00:35 +13:00
parent cfc4a9867b
commit 5eec3fc643

View File

@@ -37,7 +37,7 @@ local kp =
}, },
// Create ingress objects per application // Create ingress objects per application
ingress+:: { ingress+:: {
alertmanager: 'alertmanager-main':
ingress.new() + ingress.new() +
ingress.mixin.metadata.withName('alertmanager-main') + ingress.mixin.metadata.withName('alertmanager-main') +
ingress.mixin.metadata.withNamespace($._config.namespace) + ingress.mixin.metadata.withNamespace($._config.namespace) +
@@ -73,9 +73,9 @@ local kp =
httpIngressPath.mixin.backend.withServicePort('http') httpIngressPath.mixin.backend.withServicePort('http')
), ),
), ),
prometheus: 'prometheus-k8s':
ingress.new() + ingress.new() +
ingress.mixin.metadata.withName('prometheus') + ingress.mixin.metadata.withName('prometheus-k8s') +
ingress.mixin.metadata.withNamespace($._config.namespace) + ingress.mixin.metadata.withNamespace($._config.namespace) +
ingress.mixin.metadata.withAnnotations({ ingress.mixin.metadata.withAnnotations({
'nginx.ingress.kubernetes.io/auth-type': 'basic', 'nginx.ingress.kubernetes.io/auth-type': 'basic',