Skip to content

Commit 1291174

Browse files
committed
Add Dex secret key variable and update Helm release configuration for ArgoCD
1 parent 560b613 commit 1291174

File tree

2 files changed

+26
-5
lines changed

2 files changed

+26
-5
lines changed

Terraform/modules/argocd/main.tf

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,28 @@
1+
resource "random_password" "dex_secret" {
2+
length = 64
3+
special = true
4+
}
5+
6+
17
# Install ArgoCD using Helm
28
resource "helm_release" "argocd" {
39
name = "argocd"
410
repository = "https://argoproj.github.io/argo-helm"
511
chart = "argo-cd"
612
namespace = var.namespace
713
version = var.chart_version
8-
14+
915
create_namespace = true
1016
wait = true
1117
timeout = var.timeout
12-
18+
19+
# Server service type
1320
set {
1421
name = "server.service.type"
1522
value = var.service_type
1623
}
17-
24+
25+
# Extra server arguments
1826
dynamic "set" {
1927
for_each = var.insecure ? [1] : []
2028
content {
@@ -23,13 +31,12 @@ resource "helm_release" "argocd" {
2331
}
2432
}
2533

26-
# Additional ArgoCD configurations
2734
set {
2835
name = "server.extraArgs[1]"
2936
value = "--grpc-web"
3037
}
3138

32-
# Configure ArgoCD to work with LoadBalancer
39+
# LoadBalancer annotations
3340
set {
3441
name = "server.service.annotations.service\\.beta\\.kubernetes\\.io/aws-load-balancer-type"
3542
value = "nlb"
@@ -39,6 +46,12 @@ resource "helm_release" "argocd" {
3946
name = "server.service.annotations.service\\.beta\\.kubernetes\\.io/aws-load-balancer-scheme"
4047
value = "internet-facing"
4148
}
49+
50+
# ✅ Dex secret key (production)
51+
set {
52+
name = "dex.config.server.secretKey"
53+
value = var.dex_secret_key != null ? var.dex_secret_key : random_password.dex_secret.result
54+
}
4255
}
4356

4457
# Wait for ArgoCD to be ready before creating applications

Terraform/modules/argocd/variables.tf

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,3 +54,11 @@ variable "wait_for_ready" {
5454
type = string
5555
default = "60s"
5656
}
57+
58+
variable "dex_secret_key" {
59+
description = "Dex server secret key for ArgoCD (production)"
60+
type = string
61+
sensitive = true
62+
default = random_password.dex_secret.result
63+
}
64+

0 commit comments

Comments
 (0)