Change examples to be more robust against customizations

Explicitly reference values we are interesting in (jsonnet style)
instead of just following conventions (helm style)
This commit is contained in:
Maxim Ivanov
2018-11-27 16:49:29 +00:00
parent 7ca0a02372
commit db07ca6e12

View File

@@ -50,8 +50,8 @@ local kp =
ingress+:: { ingress+:: {
'prometheus-k8s': 'prometheus-k8s':
ingress.new() + ingress.new() +
ingress.mixin.metadata.withName('prometheus-k8s') + ingress.mixin.metadata.withName($.prometheus.prometheus.metadata.name) +
ingress.mixin.metadata.withNamespace($._config.namespace) + ingress.mixin.metadata.withNamespace($.prometheus.prometheus.metadata.namespace) +
ingress.mixin.metadata.withAnnotations({ ingress.mixin.metadata.withAnnotations({
'nginx.ingress.kubernetes.io/auth-type': 'basic', 'nginx.ingress.kubernetes.io/auth-type': 'basic',
'nginx.ingress.kubernetes.io/auth-secret': 'basic-auth', 'nginx.ingress.kubernetes.io/auth-secret': 'basic-auth',
@@ -62,7 +62,7 @@ local kp =
ingressRule.withHost('prometheus.example.com') + ingressRule.withHost('prometheus.example.com') +
ingressRule.mixin.http.withPaths( ingressRule.mixin.http.withPaths(
httpIngressPath.new() + httpIngressPath.new() +
httpIngressPath.mixin.backend.withServiceName('prometheus-k8s') + httpIngressPath.mixin.backend.withServiceName($.prometheus.service.metadata.name) +
httpIngressPath.mixin.backend.withServicePort('web') httpIngressPath.mixin.backend.withServicePort('web')
), ),
), ),