Skip to content

Commit

Permalink
Merge pull request #86 from shopware/feat/disable-mTLS-prometheus
Browse files Browse the repository at this point in the history
Grafana ingress
  • Loading branch information
renaudhager authored Nov 5, 2024
2 parents 0c09567 + 8f9ffce commit 2452d3f
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 2 deletions.
4 changes: 2 additions & 2 deletions charts/shopware/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.0.25
version: 0.0.26

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes.
appVersion: "0.0.25"
appVersion: "0.0.26"

dependencies:
- name: pxc-operator
Expand Down
11 changes: 11 additions & 0 deletions charts/shopware/templates/istio.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,17 @@ spec:
mtls:
mode: STRICT
---
apiVersion: security.istio.io/v1beta1
kind: PeerAuthentication
metadata:
name: disable-mtls-prometheus
spec:
selector:
matchLabels:
app.kubernetes.io/name: prometheus
mtls:
mode: DISABLE
---
# https://github.com/kubernetes/ingress-nginx/issues/3171
apiVersion: networking.istio.io/v1beta1
kind: VirtualService
Expand Down
2 changes: 2 additions & 0 deletions charts/shopware/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -525,6 +525,8 @@ otel-collector:

grafana:
enabled: false
podAnnotations:
sidecar.istio.io/inject: 'false'
datasources:
datasources.yaml:
apiVersion: 1
Expand Down

0 comments on commit 2452d3f

Please sign in to comment.