Skip to content

Commit 52c1c59

Browse files
committed
fix: issue with admin_password - no more
1 parent 408ccbf commit 52c1c59

File tree

3 files changed

+16
-8
lines changed

3 files changed

+16
-8
lines changed

bootstrap/argocd/values.yaml

+14
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,20 @@ argo-cd:
4747
else
4848
argocd-vault-plugin generate ./
4949
fi
50+
51+
oidc.config: |
52+
name: Vault
53+
issuer: https://login.microsoftonline.com/TENANT_ID/v2.0
54+
clientID: CLIENT_ID
55+
clientSecret: $oidc.azuread.clientSecret
56+
requestedIDTokenClaims:
57+
groups:
58+
essential: true
59+
requestedScopes:
60+
- openid
61+
- profile
62+
- email
63+
5064
ingress:
5165
enabled: true
5266
ingressClassName: nginx

platform/Chart.yaml

+1-4
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,4 @@ dependencies:
1212
version: 1.15.6
1313
repository: https://kubernetes-charts.banzaicloud.com
1414
condition: vault.installOperator
15-
- name: vault-secrets-webhook
16-
version: 1.15.11
17-
repository: https://kubernetes-charts.banzaicloud.com
18-
condition: vault.installOperator
15+

platform/files/oidc/main.go

+1-4
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,8 @@ func main() {
5353

5454
admin_password, err := password.Generate(32, 3, 3, false, true)
5555
if secret_err == nil {
56-
decoded_password, _ := b64.StdEncoding.DecodeString(string(secret.Data["password"]))
57-
admin_password = string(decoded_password)
56+
admin_password = string(secret.Data["password"])
5857
log.Print("re-use admin password")
59-
log.Print(admin_password)
60-
// TO-DO: Fix an error with re-using admin password
6158
}
6259

6360
if err != nil {

0 commit comments

Comments
 (0)