diff --git a/.ci/helm.sh b/.ci/helm.sh index cda7aa680..16e56375f 100644 --- a/.ci/helm.sh +++ b/.ci/helm.sh @@ -177,7 +177,7 @@ function ci::test_pulsar_function() { function ci::upgrade_pulsar_chart() { local value_file=$1 echo "Upgrading the pulsar chart" - ${HELM} repo add loki https://grafana.github.io/loki/charts + ${HELM} repo add loki https://grafana.github.io/helm-charts ${HELM} dependency update ${CHARTS_HOME}/charts/pulsar ${HELM} upgrade -n ${NAMESPACE} --values ${value_file} ${CLUSTER} ${CHARTS_HOME}/charts/pulsar --timeout 1h --debug # wait the upgrade process start then to check the status diff --git a/charts/pulsar/README.md b/charts/pulsar/README.md index b9688c0a4..26f643c0f 100644 --- a/charts/pulsar/README.md +++ b/charts/pulsar/README.md @@ -97,7 +97,7 @@ We provide some instructions to guide you through the preparation for the [Googl 3. Add Loki Helm Charts repository and update charts. ```bash - helm repo add loki https://grafana.github.io/loki/charts + helm repo add loki https://grafana.github.io/helm-charts helm dependency update charts/pulsar ``` diff --git a/charts/pulsar/templates/proxy/proxy-statefulset.yaml b/charts/pulsar/templates/proxy/proxy-statefulset.yaml index b204f1dc3..f26ebd9f4 100644 --- a/charts/pulsar/templates/proxy/proxy-statefulset.yaml +++ b/charts/pulsar/templates/proxy/proxy-statefulset.yaml @@ -192,27 +192,36 @@ spec: imagePullPolicy: {{ .Values.images.proxy.pullPolicy }} {{- if .Values.proxy.probe.liveness.enabled }} livenessProbe: - httpGet: - path: /status.html - port: {{ .Values.proxy.ports.http }} + httpGet: null + exec: + command: + - /bin/bash + - -c + - 'res=$(curl -H "Authorization: Bearer $brokerClientAuthenticationParameters" http://localhost:8080/status.html);if [[ $res == "OK" ]]; then exit 0; else exit 1; fi' initialDelaySeconds: {{ .Values.proxy.probe.liveness.initialDelaySeconds }} periodSeconds: {{ .Values.proxy.probe.liveness.periodSeconds }} failureThreshold: {{ .Values.proxy.probe.liveness.failureThreshold }} {{- end }} {{- if .Values.proxy.probe.readiness.enabled }} readinessProbe: - httpGet: - path: /status.html - port: {{ .Values.proxy.ports.http }} + httpGet: null + exec: + command: + - /bin/bash + - -c + - 'res=$(curl -H "Authorization: Bearer $brokerClientAuthenticationParameters" http://localhost:8080/status.html);if [[ $res == "OK" ]]; then exit 0; else exit 1; fi' initialDelaySeconds: {{ .Values.proxy.probe.readiness.initialDelaySeconds }} periodSeconds: {{ .Values.proxy.probe.readiness.periodSeconds }} failureThreshold: {{ .Values.proxy.probe.readiness.failureThreshold }} {{- end }} {{- if .Values.proxy.probe.startup.enabled }} startupProbe: - httpGet: - path: /status.html - port: {{ .Values.proxy.ports.http }} + httpGet: null + exec: + command: + - /bin/bash + - -c + - 'res=$(curl -H "Authorization: Bearer $brokerClientAuthenticationParameters" http://localhost:8080/status.html);if [[ $res == "OK" ]]; then exit 0; else exit 1; fi' initialDelaySeconds: {{ .Values.proxy.probe.startup.initialDelaySeconds }} periodSeconds: {{ .Values.proxy.probe.startup.periodSeconds }} failureThreshold: {{ .Values.proxy.probe.startup.failureThreshold }} diff --git a/charts/sn-platform/requirements.yaml b/charts/sn-platform/requirements.yaml index fb0df2398..e4b38f1d7 100644 --- a/charts/sn-platform/requirements.yaml +++ b/charts/sn-platform/requirements.yaml @@ -20,7 +20,7 @@ dependencies: - name: loki-stack version: 0.36.1 - repository: https://grafana.github.io/loki/charts + repository: https://grafana.github.io/helm-charts condition: monitoring.loki #- name: superset # version: 0.1.1