Skip to content

Commit

Permalink
fix: passing of argocd cookie to backstage proxy
Browse files Browse the repository at this point in the history
  • Loading branch information
iocanel committed Dec 4, 2024
1 parent 83a40c4 commit 39f5309
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
3 changes: 3 additions & 0 deletions bin/qshift
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,8 @@ set_defaults() {
setf ARGOCD_ADMIN_PASSWORD `kubectl get secrets -n openshift-gitops argocd-cluster -o yaml | grep password | awk '{print $2}' | base64 -d`
setf ARGOCD_COOKIE `kubectl get secrets -n openshift-gitops argocd-secret -o yaml | grep clientSecret | awk '{print $2}' | base64 -d`
setf ARGOCD_SERVER "https://openshift-gitops-server-openshift-gitops.apps.qshift.snowdrop.dev"
setf ARGOCD_ADMIN_PASSWORD `kubectl get secrets -n openshift-gitops argocd-cluster -o yaml | grep password | awk '{print $2}' | base64 -d`


# Github
if [ -z "$GITHUB_PERSONAL_ACCESS_TOKEN" ]; then
Expand Down Expand Up @@ -483,6 +485,7 @@ provision_namespace() {
echo "ARGOCD_SERVER=$ARGOCD_SERVER" >> backstage_env_secret.env
echo "ARGOCD_ADMIN_USER=$ARGOCD_ADMIN_USER" >> backstage_env_secret.env
echo "ARGOCD_ADMIN_PASSWORD=$ARGOCD_ADMIN_PASSWORD" >> backstage_env_secret.env
echo "ARGOCD_COOKIE=$ARGOCD_COOKIE" >> backstage_env_secret.env
echo "KUBERNETES_API_URL=$KUBERNETES_API_URL" >> backstage_env_secret.env

if $REPLACE; then
Expand Down
2 changes: 1 addition & 1 deletion manifest/helm/configmap/app-config.qshift.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -115,4 +115,4 @@ proxy:
secure: false
headers:
Cookie:
$env: ${ARGOCD_AUTH_TOKEN}
$env: ${ARGOCD_COOKIE}

0 comments on commit 39f5309

Please sign in to comment.