diff --git a/jsonnet/kube-prometheus/components/blackbox-exporter.libsonnet b/jsonnet/kube-prometheus/components/blackbox-exporter.libsonnet index 1b3c7653e2228047125e057c1e4d201150cb6a05..24deb175ebc992b20f7f45eac4f7b1e2209d136c 100644 --- a/jsonnet/kube-prometheus/components/blackbox-exporter.libsonnet +++ b/jsonnet/kube-prometheus/components/blackbox-exporter.libsonnet @@ -258,6 +258,8 @@ function(params) { podSelector: { matchLabels: bb._config.selectorLabels, }, + policyTypes: ['Egress', 'Ingress'], + egress: [{}], ingress: [{ from: [{ podSelector: { diff --git a/jsonnet/kube-prometheus/components/kube-state-metrics.libsonnet b/jsonnet/kube-prometheus/components/kube-state-metrics.libsonnet index 4d7fe2d318adc2ff7dd051a0b93594f4278f5bfa..5893588fd646092cba1e5ac0074cf0e597900ad4 100644 --- a/jsonnet/kube-prometheus/components/kube-state-metrics.libsonnet +++ b/jsonnet/kube-prometheus/components/kube-state-metrics.libsonnet @@ -132,6 +132,8 @@ function(params) (import 'github.com/kubernetes/kube-state-metrics/jsonnet/kube- podSelector: { matchLabels: ksm._config.selectorLabels, }, + policyTypes: ['Egress', 'Ingress'], + egress: [{}], ingress: [{ from: [{ podSelector: { diff --git a/jsonnet/kube-prometheus/components/node-exporter.libsonnet b/jsonnet/kube-prometheus/components/node-exporter.libsonnet index c4276b0bfeb97fb307251c96c445565ef99a3d83..8de79f1825e1f3aebe7a9b0dca4be3d798b13704 100644 --- a/jsonnet/kube-prometheus/components/node-exporter.libsonnet +++ b/jsonnet/kube-prometheus/components/node-exporter.libsonnet @@ -168,6 +168,8 @@ function(params) { podSelector: { matchLabels: ne._config.selectorLabels, }, + policyTypes: ['Egress', 'Ingress'], + egress: [{}], ingress: [{ from: [{ podSelector: { diff --git a/kustomization.yaml b/kustomization.yaml index c79bca6b634d62d8a7af7b3a12c57c6292918a6e..ffdf7b6843a36e705d6e27d3420d4d14d5e0e00e 100644 --- a/kustomization.yaml +++ b/kustomization.yaml @@ -13,6 +13,7 @@ resources: - ./manifests/blackboxExporter-clusterRoleBinding.yaml - ./manifests/blackboxExporter-configuration.yaml - ./manifests/blackboxExporter-deployment.yaml +- ./manifests/blackboxExporter-networkPolicy.yaml - ./manifests/blackboxExporter-service.yaml - ./manifests/blackboxExporter-serviceAccount.yaml - ./manifests/blackboxExporter-serviceMonitor.yaml @@ -30,6 +31,7 @@ resources: - ./manifests/kubeStateMetrics-clusterRole.yaml - ./manifests/kubeStateMetrics-clusterRoleBinding.yaml - ./manifests/kubeStateMetrics-deployment.yaml +- ./manifests/kubeStateMetrics-networkPolicy.yaml - ./manifests/kubeStateMetrics-prometheusRule.yaml - ./manifests/kubeStateMetrics-service.yaml - ./manifests/kubeStateMetrics-serviceAccount.yaml @@ -43,6 +45,7 @@ resources: - ./manifests/nodeExporter-clusterRole.yaml - ./manifests/nodeExporter-clusterRoleBinding.yaml - ./manifests/nodeExporter-daemonset.yaml +- ./manifests/nodeExporter-networkPolicy.yaml - ./manifests/nodeExporter-prometheusRule.yaml - ./manifests/nodeExporter-service.yaml - ./manifests/nodeExporter-serviceAccount.yaml @@ -68,6 +71,7 @@ resources: - ./manifests/prometheusAdapter-clusterRoleServerResources.yaml - ./manifests/prometheusAdapter-configMap.yaml - ./manifests/prometheusAdapter-deployment.yaml +- ./manifests/prometheusAdapter-networkPolicy.yaml - ./manifests/prometheusAdapter-podDisruptionBudget.yaml - ./manifests/prometheusAdapter-roleBindingAuthReader.yaml - ./manifests/prometheusAdapter-service.yaml diff --git a/manifests/blackboxExporter-networkPolicy.yaml b/manifests/blackboxExporter-networkPolicy.yaml new file mode 100644 index 0000000000000000000000000000000000000000..8a6873aaca44d3f387f5f2ce9800eaada9b73db6 --- /dev/null +++ b/manifests/blackboxExporter-networkPolicy.yaml @@ -0,0 +1,31 @@ +apiVersion: networking.k8s.io/v1 +kind: NetworkPolicy +metadata: + labels: + app.kubernetes.io/component: exporter + app.kubernetes.io/name: blackbox-exporter + app.kubernetes.io/part-of: kube-prometheus + app.kubernetes.io/version: 0.19.0 + name: blackbox-exporter + namespace: monitoring +spec: + egress: + - {} + ingress: + - from: + - podSelector: + matchLabels: + app.kubernetes.io/name: prometheus + ports: + - port: 9115 + protocol: TCP + - port: 19115 + protocol: TCP + podSelector: + matchLabels: + app.kubernetes.io/component: exporter + app.kubernetes.io/name: blackbox-exporter + app.kubernetes.io/part-of: kube-prometheus + policyTypes: + - Egress + - Ingress diff --git a/manifests/grafana-networkPolicy.yaml b/manifests/grafana-networkPolicy.yaml index d842725e53019147504be5abd22ae89c10d39893..a5dd2aef7249ada2934a16c1019a259304ce08da 100644 --- a/manifests/grafana-networkPolicy.yaml +++ b/manifests/grafana-networkPolicy.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 8.3.6 + app.kubernetes.io/version: 8.4.3 name: grafana namespace: monitoring spec: diff --git a/manifests/kubeStateMetrics-networkPolicy.yaml b/manifests/kubeStateMetrics-networkPolicy.yaml index e295e722cd8db69916802548593e764dedff97a3..711077a2fd96af6cb020cf3c22bb070ba148e5c3 100644 --- a/manifests/kubeStateMetrics-networkPolicy.yaml +++ b/manifests/kubeStateMetrics-networkPolicy.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: exporter app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 2.3.0 + app.kubernetes.io/version: 2.4.1 name: kube-state-metrics namespace: monitoring spec: diff --git a/manifests/prometheus-networkPolicy.yaml b/manifests/prometheus-networkPolicy.yaml index 189c0529c4d359af87f38bcb1d33dfc040f7cf9e..eb2a4eb7b45817b1e001db1e5fc77ae68bf4c8ba 100644 --- a/manifests/prometheus-networkPolicy.yaml +++ b/manifests/prometheus-networkPolicy.yaml @@ -6,7 +6,7 @@ metadata: app.kubernetes.io/instance: k8s app.kubernetes.io/name: prometheus app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 2.33.3 + app.kubernetes.io/version: 2.33.4 name: prometheus-k8s namespace: monitoring spec: diff --git a/manifests/prometheusOperator-networkPolicy.yaml b/manifests/prometheusOperator-networkPolicy.yaml index d9244c6ae4481596080538392105d227845b0bc5..b7c0dba131ae191cfa58ed4a584517b4c405bc0a 100644 --- a/manifests/prometheusOperator-networkPolicy.yaml +++ b/manifests/prometheusOperator-networkPolicy.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 0.54.0 + app.kubernetes.io/version: 0.54.1 name: prometheus-operator namespace: monitoring spec: