diff --git a/examples/kustomize.jsonnet b/examples/kustomize.jsonnet index 438e69b188a9de8cc0b2453927c099a42231c3be..2bd3c532c159ecd29c638c915e738eb8b4d543e2 100644 --- a/examples/kustomize.jsonnet +++ b/examples/kustomize.jsonnet @@ -1,4 +1,5 @@ local kp = + (import 'kube-prometheus/kube-prometheus.libsonnet') + (import 'kube-prometheus/kube-prometheus-aws-eks-cni.libsonnet') + { _config+:: { namespace: 'monitoring', diff --git a/jsonnet/kube-prometheus/kube-prometheus-aws-eks-cni.libsonnet b/jsonnet/kube-prometheus/kube-prometheus-aws-eks-cni.libsonnet index e6dce38b0920ce35e23f04cc4dafe12514c34c25..1fd3b9a3bb0115c3f8eefd66d02713e16564c748 100644 --- a/jsonnet/kube-prometheus/kube-prometheus-aws-eks-cni.libsonnet +++ b/jsonnet/kube-prometheus/kube-prometheus-aws-eks-cni.libsonnet @@ -5,9 +5,9 @@ local servicePort = k.core.v1.service.mixin.spec.portsType; { prometheus+: { kubePrometheusAwsEksCniMetricService: - service.new('aws-eks-cni', { 'k8s-app' : 'eks-cni' } , servicePort.newNamed('cni-metrics-port', 61678, 61678)) + + service.new('aws-aws-node', { 'k8s-app' : 'aws-node' } , servicePort.newNamed('cni-metrics-port', 61678, 61678)) + service.mixin.metadata.withNamespace('kube-system') + - service.mixin.metadata.withLabels({ 'k8s-app': 'eks-cni' }) + + service.mixin.metadata.withLabels({ 'k8s-app': 'aws-node' }) + service.mixin.spec.withClusterIp('None'), }, } diff --git a/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet b/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet index 860623bc0e370778fe222a0c1f1eb523e4f92bf8..a2e311b1765f291f66cecf06aa59996b0ad5ee72 100644 --- a/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet +++ b/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet @@ -455,7 +455,7 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; jobLabel: 'k8s-app', selector: { matchLabels: { - 'k8s-app': 'eks-cni', + 'k8s-app': 'aws-node', }, }, namespaceSelector: {