From 49afe11fae4777264b2d76e4ef359b7ebb613d1f Mon Sep 17 00:00:00 2001 From: Duologic Date: Mon, 3 Aug 2020 10:54:47 +0200 Subject: [PATCH] refactor: use $.core.v1.envVar --- production/ksonnet/loki-canary/loki-canary.libsonnet | 4 ++-- production/ksonnet/promtail/promtail.libsonnet | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/production/ksonnet/loki-canary/loki-canary.libsonnet b/production/ksonnet/loki-canary/loki-canary.libsonnet index 72e20766f219..5b46ae3c80d6 100644 --- a/production/ksonnet/loki-canary/loki-canary.libsonnet +++ b/production/ksonnet/loki-canary/loki-canary.libsonnet @@ -16,8 +16,8 @@ k + config { container.withPorts($.core.v1.containerPort.new(name='http-metrics', port=80)) + container.withArgsMixin($.util.mapToFlags($.loki_canary_args)) + container.withEnv([ - container.envType.fromFieldPath('HOSTNAME', 'spec.nodeName'), - container.envType.fromFieldPath('POD_NAME', 'metadata.name'), + $.core.v1.envVar.fromFieldPath('HOSTNAME', 'spec.nodeName'), + $.core.v1.envVar.fromFieldPath('POD_NAME', 'metadata.name'), ]), local daemonSet = $.apps.v1.daemonSet, diff --git a/production/ksonnet/promtail/promtail.libsonnet b/production/ksonnet/promtail/promtail.libsonnet index e1180251f25f..6d6c7c70a842 100644 --- a/production/ksonnet/promtail/promtail.libsonnet +++ b/production/ksonnet/promtail/promtail.libsonnet @@ -49,7 +49,7 @@ k + config + scrape_config { container.withPorts($.core.v1.containerPort.new(name='http-metrics', port=80)) + container.withArgsMixin($.util.mapToFlags($.promtail_args)) + container.withEnv([ - container.envType.fromFieldPath('HOSTNAME', 'spec.nodeName'), + $.core.v1.envVar.fromFieldPath('HOSTNAME', 'spec.nodeName'), ]) + container.mixin.readinessProbe.httpGet.withPath('/ready') + container.mixin.readinessProbe.httpGet.withPort(80) +