Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add auth in proxy health check #1106

Open
wants to merge 3 commits into
base: bp-283
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ci/helm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion charts/pulsar/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```

Expand Down
27 changes: 18 additions & 9 deletions charts/pulsar/templates/proxy/proxy-statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion charts/sn-platform/requirements.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading