From 54270d5979f7fa571d0261117f3e85104efc2a27 Mon Sep 17 00:00:00 2001 From: c0ffeec0der <64681762+c0ffeec0der@users.noreply.github.com> Date: Fri, 22 Jan 2021 15:46:01 +0700 Subject: [PATCH] Fix daemonset --- ksonnet-util/grafana.libsonnet | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/ksonnet-util/grafana.libsonnet b/ksonnet-util/grafana.libsonnet index 827740222..5557e8e4e 100644 --- a/ksonnet-util/grafana.libsonnet +++ b/ksonnet-util/grafana.libsonnet @@ -24,7 +24,12 @@ local appsExtentions = { daemonSet+: { new(name, containers, podLabels={}):: - super.new(name, containers, podLabels={}) + + local labels = podLabels { name: name }; + + super.new() + + super.mixin.metadata.withName(name) + + super.mixin.spec.template.metadata.withLabels(labels) + + super.mixin.spec.template.spec.withContainers(containers) + // Can't think of a reason we wouldn't want a DaemonSet to run on // every node. @@ -37,7 +42,10 @@ // We want to specify a minReadySeconds on every deamonset, so we get some // very basic canarying, for instance, with bad arguments. super.mixin.spec.withMinReadySeconds(10) + - super.mixin.spec.updateStrategy.withType('RollingUpdate'), + super.mixin.spec.updateStrategy.withType('RollingUpdate') + + + // apps.v1 requires an explicit selector: + super.mixin.spec.selector.withMatchLabels(labels), }, deployment+: {