Merge pull request #487 from grafana/fl/crng-tanka-update-fix

Update Jsonnet lib to work with latest Tanka version
grafana · Mar 4, 2022 · cb9d8c5 · cb9d8c5
2 parents 6970b8c + b40bcc2
commit cb9d8c5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/docs/deploying-on-k8s.md b/docs/deploying-on-k8s.md
@@ -36,8 +36,8 @@ local crng = import 'carbon-relay-ng/crng.libsonnet';
   crng: crng {
     _config+:: {
       namespace: 'mynamespace',
-      crng_route_host: 'https://tsdb-1-<instance name>.hosted-metrics.grafana.net/metrics',
-      crng_user_id: 'api_key',
+      crng_route_host: '<graphite endpoint>/metrics',
+      crng_user_id: '<user id>',
       crng_api_key: '<base64 api key>',
     },
     _images+:: {

diff --git a/jsonnet/lib/carbon-relay-ng/crng.libsonnet b/jsonnet/lib/carbon-relay-ng/crng.libsonnet
@@ -45,8 +45,8 @@ local k = import 'ksonnet-util/kausal.libsonnet';
   local container = k.core.v1.container,
   carbon_relay_ng_container::
     container
-    .new('carbon-relay-ng', $._images.carbon_relay_ng)
-    .withImagePullPolicy('Always') +
+    .new('carbon-relay-ng', $._images.carbon_relay_ng) +
+    container.withImagePullPolicy('Always') +
     container.withPorts(k.core.v1.containerPort.new('carbon', 2003)) +
     container.withEnv([
       container.envType.fromFieldPath('INSTANCE', 'metadata.name'),
@@ -57,7 +57,7 @@ local k = import 'ksonnet-util/kausal.libsonnet';
     k.util.resourcesLimits('4', '10Gi') +
     k.util.resourcesRequests('1', '1Gi'),
 
-  local deployment = k.apps.v1beta1.deployment,
+  local deployment = k.apps.v1.deployment,
   carbon_relay_ng_deployment:
     deployment.new('carbon-relay-ng', $._config.crng_replicas, [$.carbon_relay_ng_container]) +
     deployment.mixin.metadata.withNamespace($._config.namespace) +