From 257031ec4950a996f6a44be0c09d95c2002351d9 Mon Sep 17 00:00:00 2001
From: Prem Sichanugrist <s@sikac.hu>
Date: Thu, 10 Mar 2022 13:44:08 +0900
Subject: [PATCH] Fix problems when enabling eks platform patch
---
jsonnet/kube-prometheus/addons/aws-vpc-cni.libsonnet | 8 ++++++--
jsonnet/kube-prometheus/platforms/platforms.libsonnet | 1 +
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/jsonnet/kube-prometheus/addons/aws-vpc-cni.libsonnet b/jsonnet/kube-prometheus/addons/aws-vpc-cni.libsonnet
index d7a617fd..c68ebae0 100644
--- a/jsonnet/kube-prometheus/addons/aws-vpc-cni.libsonnet
+++ b/jsonnet/kube-prometheus/addons/aws-vpc-cni.libsonnet
@@ -77,9 +77,13 @@
apiVersion: 'monitoring.coreos.com/v1',
kind: 'PrometheusRule',
metadata: {
- labels: $.prometheus._config.commonLabels + $.prometheus._config.mixin.ruleLabels,
+ labels: {
+ 'app.kubernetes.io/name': 'prometheus-vpc-cni-rules',
+ 'app.kubernetes.io/component': 'prometheus',
+ 'app.kubernetes.io/part-of': 'kube-prometheus',
+ },
name: 'aws-vpc-cni-rules',
- namespace: $.prometheus._config.namespace,
+ namespace: $.values.prometheus.namespace,
},
spec: {
groups: [
diff --git a/jsonnet/kube-prometheus/platforms/platforms.libsonnet b/jsonnet/kube-prometheus/platforms/platforms.libsonnet
index a3978a6c..8d337398 100644
--- a/jsonnet/kube-prometheus/platforms/platforms.libsonnet
+++ b/jsonnet/kube-prometheus/platforms/platforms.libsonnet
@@ -16,6 +16,7 @@ local platformPatch(p) = if p != null && std.objectHas(platforms, p) then platfo
{
// initialize the object to prevent "Indexed object has no field" lint errors
local p = {
+ values+:: $.values,
alertmanager: {},
blackboxExporter: {},
grafana: {},
--
GitLab