fix(ksonnet): backwards compatibility with ksonnet

grafana · Aug 20, 2020 · 647a1a5 · 647a1a5
1 parent 3d7a0fc
commit 647a1a5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/production/ksonnet/loki-canary/loki-canary.libsonnet b/production/ksonnet/loki-canary/loki-canary.libsonnet
@@ -1,6 +1,9 @@
 local config = import 'config.libsonnet';
 local k = import 'ksonnet-util/kausal.libsonnet';
 
+// backwards compatibility with ksonnet
+local envVar = if std.objectHasAll(k.core.v1, 'envVar') then k.core.v1.envVar else k.core.v1.container.envType;
+
 k + config {
   namespace: $.core.v1.namespace.new($._config.namespace),
 
@@ -16,8 +19,8 @@ k + config {
     container.withPorts($.core.v1.containerPort.new(name='http-metrics', port=80)) +
     container.withArgsMixin($.util.mapToFlags($.loki_canary_args)) +
     container.withEnv([
-      $.core.v1.envVar.fromFieldPath('HOSTNAME', 'spec.nodeName'),
-      $.core.v1.envVar.fromFieldPath('POD_NAME', 'metadata.name'),
+      envVar.fromFieldPath('HOSTNAME', 'spec.nodeName'),
+      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
@@ -2,6 +2,9 @@ local scrape_config = import './scrape_config.libsonnet';
 local config = import 'config.libsonnet';
 local k = import 'ksonnet-util/kausal.libsonnet';
 
+// backwards compatibility with ksonnet
+local envVar = if std.objectHasAll(k.core.v1, 'envVar') then k.core.v1.envVar else k.core.v1.container.envType;
+
 k + config + scrape_config {
   namespace:
     $.core.v1.namespace.new($._config.namespace),
@@ -49,7 +52,7 @@ k + config + scrape_config {
     container.withPorts($.core.v1.containerPort.new(name='http-metrics', port=80)) +
     container.withArgsMixin($.util.mapToFlags($.promtail_args)) +
     container.withEnv([
-      $.core.v1.envVar.fromFieldPath('HOSTNAME', 'spec.nodeName'),
+      envVar.fromFieldPath('HOSTNAME', 'spec.nodeName'),
     ]) +
     container.mixin.readinessProbe.httpGet.withPath('/ready') +
     container.mixin.readinessProbe.httpGet.withPort(80) +