VirtualServices should not be deployed when [ Alertmanager | Prometheus ] is disabled

Bug

Description

When Alertmanager is disabled (alertmanager.enabled=false), the corresponding VirtualService is still deployed.

See here. I believe this line should change from

{{- if and .Values.istio.enabled .Values.istio.alertmanager.enabled -}}

to

{{- if and .Values.istio.enabled .Values.istio.alertmanager.enabled .Values.alertmanager.enabled -}}

Based upon the Prometheus VirtualService values, the same change needs to be made there as well. I.e. from

{{- if and .Values.istio.enabled .Values.istio.prometheus.enabled -}}

to

{{- if and .Values.istio.enabled .Values.istio.prometheus.enabled .Values.prometheus.enabled -}}

Note that there may be other resources which are also not properly templated; I did not comb through them all, but I did find these ones.

BigBang Version

3.1.0