diff --git a/charts/sn-platform-slim/templates/prometheus/prometheus-configmap.yaml b/charts/sn-platform-slim/templates/prometheus/prometheus-configmap.yaml index e4b32c0f5..79aa35c5b 100644 --- a/charts/sn-platform-slim/templates/prometheus/prometheus-configmap.yaml +++ b/charts/sn-platform-slim/templates/prometheus/prometheus-configmap.yaml @@ -53,6 +53,10 @@ data: - {{ template "pulsar.namespace" . }} {{- end }} {{- if .Values.istio.enabled }} +{{- if .Values.istio.migration }} + scheme: http + enable_http2: false +{{- else }} scheme: https # Disable http2 for Prometheus issue: https://github.com/prometheus/prometheus/issues/10213 enable_http2: false @@ -61,6 +65,7 @@ data: cert_file: /etc/prom-certs/cert-chain.pem key_file: /etc/prom-certs/key.pem insecure_skip_verify: true +{{- end }} {{- end }} relabel_configs: {{- if .Values.istio.enabled }} diff --git a/charts/sn-platform-slim/templates/pulsar-coordinator/pulsar-coordinator.yaml b/charts/sn-platform-slim/templates/pulsar-coordinator/pulsar-coordinator.yaml index 886073a3b..c20875c93 100644 --- a/charts/sn-platform-slim/templates/pulsar-coordinator/pulsar-coordinator.yaml +++ b/charts/sn-platform-slim/templates/pulsar-coordinator/pulsar-coordinator.yaml @@ -7,7 +7,4 @@ kind: PulsarCoordinator metadata: name: "{{ template "pulsar.fullname" . }}-coordinator" namespace: {{ template "pulsar.namespace" . }} -spec: - toolSet: - enabled: false {{- end }} \ No newline at end of file diff --git a/charts/sn-platform/templates/prometheus/prometheus-configmap.yaml b/charts/sn-platform/templates/prometheus/prometheus-configmap.yaml index e4b32c0f5..79aa35c5b 100644 --- a/charts/sn-platform/templates/prometheus/prometheus-configmap.yaml +++ b/charts/sn-platform/templates/prometheus/prometheus-configmap.yaml @@ -53,6 +53,10 @@ data: - {{ template "pulsar.namespace" . }} {{- end }} {{- if .Values.istio.enabled }} +{{- if .Values.istio.migration }} + scheme: http + enable_http2: false +{{- else }} scheme: https # Disable http2 for Prometheus issue: https://github.com/prometheus/prometheus/issues/10213 enable_http2: false @@ -61,6 +65,7 @@ data: cert_file: /etc/prom-certs/cert-chain.pem key_file: /etc/prom-certs/key.pem insecure_skip_verify: true +{{- end }} {{- end }} relabel_configs: {{- if .Values.istio.enabled }} diff --git a/charts/sn-platform/templates/pulsar-coordinator/pulsar-coordinator.yaml b/charts/sn-platform/templates/pulsar-coordinator/pulsar-coordinator.yaml index 886073a3b..c20875c93 100644 --- a/charts/sn-platform/templates/pulsar-coordinator/pulsar-coordinator.yaml +++ b/charts/sn-platform/templates/pulsar-coordinator/pulsar-coordinator.yaml @@ -7,7 +7,4 @@ kind: PulsarCoordinator metadata: name: "{{ template "pulsar.fullname" . }}-coordinator" namespace: {{ template "pulsar.namespace" . }} -spec: - toolSet: - enabled: false {{- end }} \ No newline at end of file