Skip to content

Commit

Permalink
fix(RHIDP-2675): fix backend secret for ver 1.1
Browse files Browse the repository at this point in the history
Patch adds backward compatibility to use RHDH 1.1 helm repo,
by setting backend secret name in the helm charts as a variable.
Tested with below config:
For RHDH 1.1
RHDH_HELM_REPO="https://raw.githubusercontent.com/rhdh-bot/openshift-helm-charts/developer-hub-1.1.0/installation/"
RHDH_HELM_CHART="developer-hub"

For RHDH 1.2
RHDH_HELM_REPO=https://raw.githubusercontent.com/rhdh-bot/openshift-helm-charts/redhat-developer-hub-1.2-103-CI/installation/
RHDH_HELM_CHART=redhat-developer-hub
  • Loading branch information
yogananth-subramanian committed Jun 27, 2024
1 parent 27c9fa8 commit b07ba6c
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ deploy-locust: namespace
else \
echo "Helm release \"$(LOCUST_OPERATOR)\" already exists"; \
fi
kubectl wait --timeout=180s --namespace $(LOCUST_NAMESPACE) --for=condition=ready $$(kubectl get --namespace $(LOCUST_NAMESPACE) pod -o name)

## Uninstall locust operator helm chart
.PHONY: undeploy-locust
Expand Down Expand Up @@ -184,7 +185,7 @@ endif
cat locust-test-template.yaml | envsubst | kubectl apply --namespace $(LOCUST_NAMESPACE) -f -
kubectl create --namespace $(LOCUST_NAMESPACE) configmap locust.$(SCENARIO) --from-file scenarios/$(SCENARIO).py --dry-run=client -o yaml | kubectl apply --namespace $(LOCUST_NAMESPACE) -f -
date --utc -Ins>$(TMP_DIR)/benchmark-before
timeout=$$(date -d "480 seconds" "+%s"); while [ -z "$$(kubectl get --namespace $(LOCUST_NAMESPACE) pod -l performance-test-pod-name=$(SCENARIO)-test-master -o name)" ]; do if [ "$$(date "+%s")" -gt "$$timeout" ]; then echo "ERROR: Timeout waiting for locust master pod to start"; exit 1; else echo "Waiting for locust master pod to start..."; sleep 5s; fi; done
timeout=$$(date -d "680 seconds" "+%s"); while [ -z "$$(kubectl get --namespace $(LOCUST_NAMESPACE) pod -l performance-test-pod-name=$(SCENARIO)-test-master -o name)" ]; do if [ "$$(date "+%s")" -gt "$$timeout" ]; then echo "ERROR: Timeout waiting for locust master pod to start"; exit 1; else echo "Waiting for locust master pod to start..."; sleep 5s; fi; done
kubectl wait --namespace $(LOCUST_NAMESPACE) --for=condition=Ready=true $$(kubectl get --namespace $(LOCUST_NAMESPACE) pod -l performance-test-pod-name=$(SCENARIO)-test-master -o name)
@echo "Getting locust master log:"
kubectl logs --namespace $(LOCUST_NAMESPACE) -f -l performance-test-pod-name=$(SCENARIO)-test-master | tee load-test.log
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ upstream:
valueFrom:
secretKeyRef:
key: backend-secret
name: "{{ .Release.Name }}-auth"
name: '{{ include "janus-idp.backend-secret-name" $ }}'
- name: GITHUB_TOKEN
valueFrom:
secretKeyRef:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ upstream:
valueFrom:
secretKeyRef:
key: backend-secret
name: "{{ .Release.Name }}-auth"
name: '{{ include "janus-idp.backend-secret-name" $ }}'
- name: GITHUB_TOKEN
valueFrom:
secretKeyRef:
Expand Down

0 comments on commit b07ba6c

Please sign in to comment.