From a59fe6bf28bf9579e6f5815b1c807bf76c49117f Mon Sep 17 00:00:00 2001 From: Branden Cobb Date: Fri, 2 Jul 2021 14:43:16 +0000 Subject: [PATCH 1/5] Add new file --- .../allow-sidecar-scraping.yaml | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 chart/templates/bigbang/networkpolicies/allow-sidecar-scraping.yaml diff --git a/chart/templates/bigbang/networkpolicies/allow-sidecar-scraping.yaml b/chart/templates/bigbang/networkpolicies/allow-sidecar-scraping.yaml new file mode 100644 index 0000000..fe99454 --- /dev/null +++ b/chart/templates/bigbang/networkpolicies/allow-sidecar-scraping.yaml @@ -0,0 +1,22 @@ +{{- if and .Values.networkPolicies.enabled .Values.istio.enabled }} +apiVersion: networking.k8s.io/v1 +kind: NetworkPolicy +metadata: + name: allow-sidecar-scraping + 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 a82da4fb546168e3c6f00d178467cfe390526504 Mon Sep 17 00:00:00 2001 From: Branden Cobb Date: Fri, 2 Jul 2021 14:46:54 +0000 Subject: [PATCH 2/5] 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 f8778f6..51b0dec 100644 --- a/chart/Chart.yaml +++ b/chart/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: logging -version: 0.1.15-bb.0 +version: 0.1.15-bb.1 appVersion: 7.12.0 dependencies: - name: bb-test-lib -- GitLab From 0364ef671ddb98a4f53642e841eabf7e6186356a Mon Sep 17 00:00:00 2001 From: Branden Cobb Date: Fri, 2 Jul 2021 14:48:19 +0000 Subject: [PATCH 3/5] Update CHANGELOG.md --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1f229bb..62e633d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), --- +## [0.1.15-bb.1] - 2021-07-02 +### Added +- Network policy to allow prometheus scraping of istio envoy sidecar. + ## [0.1.15-bb.0] - 2021-06-22 ### Changed - Upgrade to version 7.12.0 of Kibana and Elasticsearch -- GitLab From 43aebb66c54fcbdbd75117484f04eb55aa26ec33 Mon Sep 17 00:00:00 2001 From: Branden Cobb Date: Fri, 2 Jul 2021 16:42:16 +0000 Subject: [PATCH 4/5] Update allow-sidecar-scraping.yaml --- .../bigbang/networkpolicies/allow-sidecar-scraping.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chart/templates/bigbang/networkpolicies/allow-sidecar-scraping.yaml b/chart/templates/bigbang/networkpolicies/allow-sidecar-scraping.yaml index fe99454..2f4f9c5 100644 --- a/chart/templates/bigbang/networkpolicies/allow-sidecar-scraping.yaml +++ b/chart/templates/bigbang/networkpolicies/allow-sidecar-scraping.yaml @@ -18,5 +18,5 @@ spec: app: prometheus ports: - protocol: TCP - port: 15020 + port: 15090 {{- end }} -- GitLab From d66ea2b778671135bf7f9f1245b406984bfcf74e Mon Sep 17 00:00:00 2001 From: Branden Cobb Date: Fri, 2 Jul 2021 18:55:48 +0000 Subject: [PATCH 5/5] Update allow-sidecar-scraping.yaml --- .../bigbang/networkpolicies/allow-sidecar-scraping.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/chart/templates/bigbang/networkpolicies/allow-sidecar-scraping.yaml b/chart/templates/bigbang/networkpolicies/allow-sidecar-scraping.yaml index 2f4f9c5..0d45971 100644 --- a/chart/templates/bigbang/networkpolicies/allow-sidecar-scraping.yaml +++ b/chart/templates/bigbang/networkpolicies/allow-sidecar-scraping.yaml @@ -19,4 +19,6 @@ spec: ports: - protocol: TCP port: 15090 + - protocol: TCP + port: 15020 {{- end }} -- GitLab