Merge pull request #1675 from sikachu/fix-eks-platform

Fix problems when enabling eks platform patch

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: [

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: {},