From 738556677fd599e96279d17140a2a7e8e028b865 Mon Sep 17 00:00:00 2001 From: Branden Cobb Date: Wed, 30 Jun 2021 15:38:14 +0000 Subject: [PATCH 1/6] Add new file --- .../bigbang/networkpolicies/prometheus.yaml | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 chart/templates/bigbang/networkpolicies/prometheus.yaml diff --git a/chart/templates/bigbang/networkpolicies/prometheus.yaml b/chart/templates/bigbang/networkpolicies/prometheus.yaml new file mode 100644 index 0000000..dd5e1d5 --- /dev/null +++ b/chart/templates/bigbang/networkpolicies/prometheus.yaml @@ -0,0 +1,22 @@ +{{- if and .Values.networkPolicies.enabled .Values.monitoring.enabled }} +apiVersion: networking.k8s.io/v1 +kind: NetworkPolicy +metadata: + name: allow-ingress-prometheus + namespace: {{ .Release.Namespace }} +spec: + podSelector: {} + policyTypes: + - Ingress + ingress: + - from: + - namespaceSelector: + matchLabels: + app.kubernetes.io/name: monitoring + podSelector: + matchLabels: + app: prometheus + ports: + - protocol: TCP + port: 15020 +{{- end }} -- GitLab From 981df03c4dcf5acc51358d27239e0c5fda87c408 Mon Sep 17 00:00:00 2001 From: Branden Cobb Date: Wed, 30 Jun 2021 16:07:16 +0000 Subject: [PATCH 2/6] Update prometheus.yaml --- chart/templates/bigbang/networkpolicies/prometheus.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/chart/templates/bigbang/networkpolicies/prometheus.yaml b/chart/templates/bigbang/networkpolicies/prometheus.yaml index dd5e1d5..fa784dd 100644 --- a/chart/templates/bigbang/networkpolicies/prometheus.yaml +++ b/chart/templates/bigbang/networkpolicies/prometheus.yaml @@ -19,4 +19,6 @@ spec: ports: - protocol: TCP port: 15020 + - protocol: TCP + port: 10250 {{- end }} -- GitLab From f9ff7b81bf6fc70844e68df2263897f83b394084 Mon Sep 17 00:00:00 2001 From: Branden Cobb Date: Wed, 30 Jun 2021 16:09:35 +0000 Subject: [PATCH 3/6] Update prometheus.yaml --- chart/templates/bigbang/networkpolicies/prometheus.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/chart/templates/bigbang/networkpolicies/prometheus.yaml b/chart/templates/bigbang/networkpolicies/prometheus.yaml index fa784dd..dd5e1d5 100644 --- a/chart/templates/bigbang/networkpolicies/prometheus.yaml +++ b/chart/templates/bigbang/networkpolicies/prometheus.yaml @@ -19,6 +19,4 @@ spec: ports: - protocol: TCP port: 15020 - - protocol: TCP - port: 10250 {{- end }} -- GitLab From 0d3a3c8870d6e066de0dd064491076f22f84f07a Mon Sep 17 00:00:00 2001 From: Branden Cobb Date: Wed, 30 Jun 2021 16:20:30 +0000 Subject: [PATCH 4/6] Update Chart.yaml --- chart/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chart/Chart.yaml b/chart/Chart.yaml index 9e9aac2..878cde7 100644 --- a/chart/Chart.yaml +++ b/chart/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: nexus-repository-manager -version: 29.1.0-bb.4 +version: 29.1.0-bb.5 appVersion: 3.29.0 description: Sonatype Nexus Repository Manager - Universal Binary repository type: application -- GitLab From cdf2d27c7edd591b3e04df495c464d30687dfea0 Mon Sep 17 00:00:00 2001 From: Branden Cobb Date: Wed, 30 Jun 2021 16:23:31 +0000 Subject: [PATCH 5/6] Update CHANGELOG.md --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 618a676..d4d5ae8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +--- +## [29.1.0-bb.5] - 2021-06-30 +### Added +- Network policy to allow prometheus scraping of istio envoy sidecar + ## [29.1.0-bb.4] ### Changed - kube-api network policy toggle -- GitLab From 47262c2fdb543063a00aa5578499b64565db51bd Mon Sep 17 00:00:00 2001 From: Branden Cobb Date: Wed, 30 Jun 2021 21:03:32 +0000 Subject: [PATCH 6/6] Update chart/templates/bigbang/networkpolicies/allow-ingress-prometheus.yaml --- .../{prometheus.yaml => allow-ingress-prometheus.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename chart/templates/bigbang/networkpolicies/{prometheus.yaml => allow-ingress-prometheus.yaml} (100%) diff --git a/chart/templates/bigbang/networkpolicies/prometheus.yaml b/chart/templates/bigbang/networkpolicies/allow-ingress-prometheus.yaml similarity index 100% rename from chart/templates/bigbang/networkpolicies/prometheus.yaml rename to chart/templates/bigbang/networkpolicies/allow-ingress-prometheus.yaml -- GitLab