Upgrade to jsonnet-libs 1.19 and update tk examples

CHANGELOG.md

@@ -51,6 +51,7 @@
 * [ENHANCEMENT] Support global denylist and per-tenant allowlist of tags for search data. [#960](https://github.com/grafana/tempo/pull/960) (@annanay25)
 * [ENHANCEMENT] Add `search_query_timeout` to Querier config. [#984](https://github.com/grafana/tempo/pull/984) (@kvrhdn)
 * [ENHANCEMENT] Jsonnet: add `$._config.memcached.memory_limit_mb` [#987](https://github.com/grafana/tempo/pull/987) (@kvrhdn)
+* [ENHANCEMENT] Upgrade jsonnet-libs to 1.19 and update tk examples [#1001](https://github.com/grafana/tempo/pull/1001) (@mapno)
 * [BUGFIX] Update port spec for GCS docker-compose example [#869](https://github.com/grafana/tempo/pull/869) (@zalegrala)
 * [BUGFIX] Fix "magic number" errors and other block mishandling when an ingester forcefully shuts down [#937](https://github.com/grafana/tempo/issues/937) (@mdisibio)
 * [BUGFIX] Fix compactor memory leak [#806](https://github.com/grafana/tempo/pull/806) (@mdisibio)

example/tk/jsonnetfile.json

@@ -22,11 +22,11 @@
     {
       "source": {
         "git": {
-          "remote": "https://github.com/ksonnet/ksonnet-lib.git",
-          "subdir": "ksonnet.beta.4"
+          "remote": "https://github.com/jsonnet-libs/k8s-libsonnet.git",
+          "subdir": "1.19"
         }
       },
-      "version": "master"
+      "version": "main"
     }
   ],
   "legacyImports": true

example/tk/jsonnetfile.lock.json

@@ -8,8 +8,8 @@
           "subdir": "ksonnet-util"
         }
       },
-      "version": "eae352a28812274df34ccee8a7edec3a97a1ef95",
-      "sum": "sI6Hgng7yR8fkgHqJ10e3rQagVhpHhumAKqqzbOZUSM="
+      "version": "37319e21e546579eab2c3ed459e956a262c28f8c",
+      "sum": "OxgtIWL4hjvG0xkMwUzZ7Yjs52zUhLhaVQpwHCbqf8A="
     },
     {
       "source": {
@@ -18,18 +18,18 @@
           "subdir": "memcached"
         }
       },
-      "version": "2829b0f8e18ec87c3a451fa01fcd11b6508b25b2",
-      "sum": "AIspZ151p0qkxVc9tuoAEYNrkazV6QncWWsIsarK9GE="
+      "version": "37319e21e546579eab2c3ed459e956a262c28f8c",
+      "sum": "dTOeEux3t9bYSqP2L/uCuLo/wUDpCKH4w+4OD9fePUk="
     },
     {
       "source": {
         "git": {
-          "remote": "https://github.com/ksonnet/ksonnet-lib.git",
-          "subdir": "ksonnet.beta.4"
+          "remote": "https://github.com/jsonnet-libs/k8s-libsonnet.git",
+          "subdir": "1.19"
         }
       },
-      "version": "0d2f82676817bbf9e4acf6495b2090205f323b9f",
-      "sum": "ur22hPQq0JAPBxm8hNMcwjumj4MkozDwOKiGZvVMYh4="
+      "version": "f47562c4e3bfaf46a5a5bc6a9e1e76a4fc76c18e",
+      "sum": "m/53207lTQJGAA9H2D7SrM+qIMJxHxXPzlsx3GuyYLg="
     }
   ],
   "legacyImports": false

example/tk/lib/grafana/main.libsonnet

@@ -55,6 +55,10 @@
   grafana_service:
     k.util.serviceFor($.grafana_deployment)
     + service.mixin.spec.withPortsMixin([
-      servicePort.withName('http').withPort(3000).withTargetPort(3000),
+      servicePort.newNamed(
+         name='http',
+         port=3000,
+         targetPort=3000,
+      ),
     ]),
 }

example/tk/lib/k.libsonnet

@@ -1 +1 @@
-import "ksonnet.beta.4/k.libsonnet"
+import 'github.com/jsonnet-libs/k8s-libsonnet/1.19/main.libsonnet'

example/tk/lib/minio/minio.libsonnet

@@ -13,7 +13,7 @@
     container.withCommand([
         'sh',
         '-euc',
-        'mkdir -p /data/tempo && /usr/bin/minio server /data',
+        'mkdir -p /data/tempo && minio server /data',
     ]) +
     container.withEnvMap({
       MINIO_ACCESS_KEY: 'tempo',

example/tk/tempo-microservices/main.jsonnet

@@ -104,19 +104,21 @@ minio + grafana + load + tempo {
         }
     },
 
-    local ingress = k.networking.v1beta1.ingress,
+    local ingress = k.networking.v1.ingress,
+    local rule = k.networking.v1.ingressRule,
+    local path = k.networking.v1.httpIngressPath,
     ingress:
-        ingress.new() +
+        ingress.new('ingress') +
         ingress.mixin.metadata
-            .withName('ingress')
-            .withAnnotations({
+            .withAnnotationsMixin({
                 'ingress.kubernetes.io/ssl-redirect': 'false'
             }) +
         ingress.mixin.spec.withRules(
-            ingress.mixin.specType.rulesType.mixin.http.withPaths(
-                ingress.mixin.spec.rulesType.mixin.httpType.pathsType.withPath('/') +
-                ingress.mixin.specType.mixin.backend.withServiceName('grafana') +
-                ingress.mixin.specType.mixin.backend.withServicePort(3000)
-            ),
+            rule.http.withPaths([
+                path.withPath('/')
+                + path.withPathType('ImplementationSpecific')
+                + path.backend.service.withName('grafana')
+                + path.backend.service.port.withNumber(3000)
+            ]),
         ),
 }

example/tk/tempo-single-binary/main.jsonnet

@@ -28,19 +28,21 @@ grafana + load + tempo {
             containerPort.new('jaeger-http', 14268),
         ]),
 
-    local ingress = k.networking.v1beta1.ingress,
+    local ingress = k.networking.v1.ingress,
+    local rule = k.networking.v1.ingressRule,
+    local path = k.networking.v1.httpIngressPath,
     ingress:
-        ingress.new() +
+        ingress.new('ingress') +
         ingress.mixin.metadata
-            .withName('ingress')
-            .withAnnotations({
+            .withAnnotationsMixin({
                 'ingress.kubernetes.io/ssl-redirect': 'false'
             }) +
         ingress.mixin.spec.withRules(
-            ingress.mixin.specType.rulesType.mixin.http.withPaths(
-                ingress.mixin.spec.rulesType.mixin.httpType.pathsType.withPath('/') +
-                ingress.mixin.specType.mixin.backend.withServiceName('grafana') +
-                ingress.mixin.specType.mixin.backend.withServicePort(3000)
-            ),
+            rule.http.withPaths([
+                path.withPath('/')
+                + path.withPathType('ImplementationSpecific')
+                + path.backend.service.withName('grafana')
+                + path.backend.service.port.withNumber(3000)
+            ]),
         ),
 }

example/tk/vendor/1.19

@@ -0,0 +1 @@
+github.com/jsonnet-libs/k8s-libsonnet/1.19