fix(ksonnet-util): allow overriding root level k import (grafana#428)

* fix(ksonnet-util): allow overriding root level k import * don't expect vanilla import to call top level function
stevesg · Jan 19, 2021 · 2cef89c · 2cef89c
1 parent 6aa643b
commit 2cef89c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/ksonnet-util/kausal.libsonnet b/ksonnet-util/kausal.libsonnet
@@ -3,14 +3,15 @@
 
 (import 'grafana.libsonnet')
 + {
+  local this = self,
   _config+:: {
     enable_rbac: true,
     enable_pod_priorities: false,
     namespace: error 'Must define a namespace',
   },
 
   util+::
-    (import 'util.libsonnet')
+    (import 'util.libsonnet').withK(this)
     + {
       rbac(name, rules)::
         if $._config.enable_rbac

diff --git a/ksonnet-util/util.libsonnet b/ksonnet-util/util.libsonnet
@@ -1,7 +1,6 @@
 // util.libsonnet provides a number of useful (opinionated) shortcuts to replace boilerplate code
-local k = import 'grafana.libsonnet';
 
-{
+local util(k) = {
   // mapToFlags converts a map to a set of golang-style command line flags.
   mapToFlags(map, prefix='-'): [
     '%s%s=%s' % [prefix, key, map[key]]
@@ -243,4 +242,8 @@ local k = import 'grafana.libsonnet';
   local deployment = k.apps.v1.deployment,
   podPriority(p):
     deployment.mixin.spec.template.spec.withPriorityClassName(p),
+};
+
+util((import 'grafana.libsonnet')) + {
+  withK(k):: util(k),
 }