From b9f1a9fb34d76f71d78dfbbdd99ae1652b6f8554 Mon Sep 17 00:00:00 2001
From: Danijel Simeunovic <danijel.simeunovic@fortedigital.com>
Date: Fri, 24 Apr 2026 22:31:55 +0200
Subject: [PATCH] env

---
 bootstrap.sh                         | 1 +
 infra/values/base/argocd-values.yaml | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/bootstrap.sh b/bootstrap.sh
index a9effb3..3e2363b 100644
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -41,6 +41,7 @@ ArgoCd()
     echo "Installing ArgoCD..."
     helm upgrade --install argocd argo-cd \
             --repo https://argoproj.github.io/argo-helm \
+            --version "7.8.0" \
             --namespace argocd --create-namespace \
             --values infra/values/base/argocd-values.yaml \
             --values "infra/values/${CLUSTER}/argocd-values.yaml" \
diff --git a/infra/values/base/argocd-values.yaml b/infra/values/base/argocd-values.yaml
index fad535b..09c6166 100644
--- a/infra/values/base/argocd-values.yaml
+++ b/infra/values/base/argocd-values.yaml
@@ -17,7 +17,7 @@ configs:
       issuer: https://id.forteapps.net/realms/forte
       clientID: argocd
       clientSecret: $oidc.clientSecret
-      requestedScopes: ["email", "profile", "groups"]
+      requestedScopes: ["openid", "email", "profile"]
   rbacConfig:
     policy.csv: |
       g, ArgoCD Admins, role:admin
@@ -27,9 +27,9 @@ configs:
   params:
     "server.insecure": true
 repoServer:
-  env:
   # Disable git submodule checkout - submodules (e.g. shared-prompts)
   # are not needed for K8s manifest generation
+  extraEnv:
   - name: ARGOCD_GIT_MODULES_ENABLED
     value: "false"
 server: