From 5fe4ccbe1d9f106fa132bc0b4ab0a555a66ba054 Mon Sep 17 00:00:00 2001
From: Edward Welch <edward.welch@grafana.com>
Date: Tue, 14 May 2019 12:37:07 -0400
Subject: [PATCH] adding namespace to ksonnet config, moved images into a
config file
---
.gitignore | 2 +-
production/ksonnet/loki-canary/config.libsonnet | 5 +++++
production/ksonnet/loki-canary/loki-canary.libsonnet | 9 ++++-----
3 files changed, 10 insertions(+), 6 deletions(-)
create mode 100644 production/ksonnet/loki-canary/config.libsonnet
diff --git a/.gitignore b/.gitignore
index eae84e7a..8615ce54 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-loki-canary
\ No newline at end of file
+./loki-canary
\ No newline at end of file
diff --git a/production/ksonnet/loki-canary/config.libsonnet b/production/ksonnet/loki-canary/config.libsonnet
new file mode 100644
index 00000000..d1043c45
--- /dev/null
+++ b/production/ksonnet/loki-canary/config.libsonnet
@@ -0,0 +1,5 @@
+{
+ _images+:: {
+ loki_canary: 'grafana/loki-canary:latest',
+ },
+}
\ No newline at end of file
diff --git a/production/ksonnet/loki-canary/loki-canary.libsonnet b/production/ksonnet/loki-canary/loki-canary.libsonnet
index b5a6bf65..e940a417 100644
--- a/production/ksonnet/loki-canary/loki-canary.libsonnet
+++ b/production/ksonnet/loki-canary/loki-canary.libsonnet
@@ -1,16 +1,15 @@
local k = import 'ksonnet-util/kausal.libsonnet';
+local config = import 'config.libsonnet';
+
+k + config {
+ namespace: $.core.v1.namespace.new($._config.namespace),
-k {
local container = $.core.v1.container,
loki_canary_args:: {
labelvalue: "$(POD_NAME)",
},
- _images+:: {
- loki_canary: 'grafana/loki-canary:latest',
- },
-
loki_canary_container::
container.new('loki-canary', $._images.loki_canary) +
container.withPorts($.core.v1.containerPort.new('http-metrics', 80)) +
--
GitLab