Merge argoless branch into master #30

Merged
stefan merged 47 commits from argoless into master 2021-01-12 15:03:36 +00:00
2 changed files with 6 additions and 3 deletions
Showing only changes of commit 1715ba00d4 - Show all commits

View File

@ -10,13 +10,13 @@ metadata:
{{ include "kubezero-lib.labels" $ | indent 4 }}
spec:
hosts:
- {{ index $service.url }}
- {{ $service.url }}
gateways:
- {{ index $service.gateway }}
- {{ $service.gateway }}
http:
- route:
- destination:
host: metrics-{{- $name }}
host: {{ $service.destination }}
---
{{- end }}

View File

@ -181,15 +181,18 @@ istio:
ipBlocks: []
url: ""
gateway: istio-ingress/ingressgateway
destination: metrics-grafana
prometheus:
enabled: false
ipBlocks: []
url: ""
gateway: istio-ingress/ingressgateway
destination: metrics-kube-prometheus-st-prometheus
alertmanager:
enabled: false
ipBlocks: []
url: ""
gateway: istio-ingress/ingressgateway
destination: metrics-kube-prometheus-st-alertmanager