Skip to content

Commit d6ce160

Browse files
csantanaprcsantanapr
committed
clean up the outputs
Signed-off-by: Carlos Santana <csantana23@gmail.com>
1 parent 528d0cf commit d6ce160

File tree

10 files changed

+101
-46
lines changed

10 files changed

+101
-46
lines changed

‎argocd/iac/terraform/examples/eks/aws-secrets-manager/outputs.tf‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,9 @@ output "configure_argocd" {
1414
export ARGOCD_OPTS="--port-forward --port-forward-namespace argocd --grpc-web"
1515
kubectl config set-context --current --namespace argocd
1616
argocd login --port-forward --username admin --password $(argocd admin initial-password | head -1)
17-
argocd admin dashboard --port 8080
17+
echo "ArgoCD Username: admin"
18+
echo "ArgoCD Password: $(aws secretsmanager get-secret-value --secret-id argocd)"
19+
echo Port Forward: http://localhost:8080
20+
kubectl port-forward -n argocd svc/argo-cd-argocd-server 8080:80
1821
EOT
1922
}
20-
21-
output "argocd_cluster" {
22-
description = "ArgoCD cluster resource"
23-
value = module.gitops_bridge_metadata.argocd
24-
}

‎argocd/iac/terraform/examples/eks/complete/outputs.tf‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,20 @@ output "configure_argocd" {
1414
export ARGOCD_OPTS="--port-forward --port-forward-namespace argocd --grpc-web"
1515
kubectl config set-context --current --namespace argocd
1616
argocd login --port-forward --username admin --password $(argocd admin initial-password | head -1)
17-
argocd admin dashboard --port 8080
17+
echo "ArgoCD Username: admin"
18+
echo "ArgoCD Password: $(kubectl get secrets argocd-initial-admin-secret -n argocd --template="{{index .data.password | base64decode}}")"
19+
echo Port Forward: http://localhost:8080
20+
kubectl port-forward -n argocd svc/argo-cd-argocd-server 8080:80
1821
EOT
1922
}
2023

21-
output "argocd_cluster" {
22-
description = "ArgoCD cluster resource"
23-
value = module.gitops_bridge_metadata.argocd
24+
output "access_argocd" {
25+
description = "ArgoCD Access"
26+
value = <<-EOT
27+
export KUBECONFIG="/tmp/${module.eks.cluster_name}"
28+
aws eks --region ${local.region} update-kubeconfig --name ${module.eks.cluster_name}
29+
echo "ArgoCD URL: https://$(kubectl get svc -n argocd argo-cd-argocd-server -o jsonpath='{.status.loadBalancer.ingress[0].hostname}')"
30+
echo "ArgoCD Username: admin"
31+
echo "ArgoCD Password: $(kubectl get secrets argocd-initial-admin-secret -n argocd --template="{{index .data.password | base64decode}}")"
32+
EOT
2433
}

‎argocd/iac/terraform/examples/eks/crossplane/outputs.tf‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,20 @@ output "configure_argocd" {
1414
export ARGOCD_OPTS="--port-forward --port-forward-namespace argocd --grpc-web"
1515
kubectl config set-context --current --namespace argocd
1616
argocd login --port-forward --username admin --password $(argocd admin initial-password | head -1)
17-
argocd admin dashboard --port 8080
17+
echo "ArgoCD Username: admin"
18+
echo "ArgoCD Password: $(kubectl get secrets argocd-initial-admin-secret -n argocd --template="{{index .data.password | base64decode}}")"
19+
echo Port Forward: http://localhost:8080
20+
kubectl port-forward -n argocd svc/argo-cd-argocd-server 8080:80
1821
EOT
1922
}
2023

21-
output "argocd_cluster" {
22-
description = "ArgoCD cluster resource"
23-
value = module.gitops_bridge_metadata.argocd
24+
output "access_argocd" {
25+
description = "ArgoCD Access"
26+
value = <<-EOT
27+
export KUBECONFIG="/tmp/${module.eks.cluster_name}"
28+
aws eks --region ${local.region} update-kubeconfig --name ${module.eks.cluster_name}
29+
echo "ArgoCD URL: https://$(kubectl get svc -n argocd argo-cd-argocd-server -o jsonpath='{.status.loadBalancer.ingress[0].hostname}')"
30+
echo "ArgoCD Username: admin"
31+
echo "ArgoCD Password: $(kubectl get secrets argocd-initial-admin-secret -n argocd --template="{{index .data.password | base64decode}}")"
32+
EOT
2433
}

‎argocd/iac/terraform/examples/eks/hello-world/outputs.tf‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,20 @@ output "configure_argocd" {
1414
export ARGOCD_OPTS="--port-forward --port-forward-namespace argocd --grpc-web"
1515
kubectl config set-context --current --namespace argocd
1616
argocd login --port-forward --username admin --password $(argocd admin initial-password | head -1)
17-
argocd admin dashboard --port 8080
17+
echo "ArgoCD Username: admin"
18+
echo "ArgoCD Password: $(kubectl get secrets argocd-initial-admin-secret -n argocd --template="{{index .data.password | base64decode}}")"
19+
echo Port Forward: http://localhost:8080
20+
kubectl port-forward -n argocd svc/argo-cd-argocd-server 8080:80
1821
EOT
1922
}
2023

21-
output "argocd_cluster" {
22-
description = "ArgoCD cluster resource"
23-
value = module.gitops_bridge_metadata.argocd
24+
output "access_argocd" {
25+
description = "ArgoCD Access"
26+
value = <<-EOT
27+
export KUBECONFIG="/tmp/${module.eks.cluster_name}"
28+
aws eks --region ${local.region} update-kubeconfig --name ${module.eks.cluster_name}
29+
echo "ArgoCD URL: https://$(kubectl get svc -n argocd argo-cd-argocd-server -o jsonpath='{.status.loadBalancer.ingress[0].hostname}')"
30+
echo "ArgoCD Username: admin"
31+
echo "ArgoCD Password: $(kubectl get secrets argocd-initial-admin-secret -n argocd --template="{{index .data.password | base64decode}}")"
32+
EOT
2433
}

‎argocd/iac/terraform/examples/eks/ingress-alb/outputs.tf‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,20 @@ output "configure_argocd" {
1414
export ARGOCD_OPTS="--port-forward --port-forward-namespace argocd --grpc-web"
1515
kubectl config set-context --current --namespace argocd
1616
argocd login --port-forward --username admin --password $(argocd admin initial-password | head -1)
17-
argocd admin dashboard --port 8080
17+
echo "ArgoCD Username: admin"
18+
echo "ArgoCD Password: $(kubectl get secrets argocd-initial-admin-secret -n argocd --template="{{index .data.password | base64decode}}")"
19+
kubectl port-forward -n argocd svc/argo-cd-argocd-server 8080:80
1820
EOT
1921
}
2022

21-
output "argocd_cluster" {
22-
description = "ArgoCD cluster resource"
23-
value = module.gitops_bridge_metadata.argocd
23+
output "access_argocd" {
24+
description = "ArgoCD Access"
25+
value = <<-EOT
26+
export KUBECONFIG="/tmp/${module.eks.cluster_name}"
27+
aws eks --region ${local.region} update-kubeconfig --name ${module.eks.cluster_name}
28+
echo "ArgoCD URL: https://$(kubectl get ing -n argocd argo-cd-argocd-server -o jsonpath='{.spec.tls[0].hosts[0]}')"
29+
echo "ArgoCD Username: admin"
30+
echo "ArgoCD Password: $(kubectl get secrets argocd-initial-admin-secret -n argocd --template="{{index .data.password | base64decode}}")"
31+
EOT
2432
}
33+

‎argocd/iac/terraform/examples/eks/multi-cluster/distributed/outputs.tf‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,21 @@ output "configure_argocd" {
1414
export ARGOCD_OPTS="--port-forward --port-forward-namespace argocd --grpc-web"
1515
kubectl config set-context --current --namespace argocd
1616
argocd login --port-forward --username admin --password $(argocd admin initial-password | head -1)
17-
argocd admin dashboard --port 8080
17+
echo "ArgoCD Username: admin"
18+
echo "ArgoCD Password: $(kubectl get secrets argocd-initial-admin-secret -n argocd --template="{{index .data.password | base64decode}}")"
19+
echo Port Forward: http://localhost:8080
20+
kubectl port-forward -n argocd svc/argo-cd-argocd-server 8080:80
1821
EOT
1922
}
2023

21-
output "argocd_cluster" {
22-
description = "ArgoCD cluster resource"
23-
value = module.gitops_bridge_metadata.argocd
24+
output "access_argocd" {
25+
description = "ArgoCD Access"
26+
value = <<-EOT
27+
export KUBECONFIG="/tmp/${module.eks.cluster_name}"
28+
aws eks --region ${local.region} update-kubeconfig --name ${module.eks.cluster_name}
29+
echo "ArgoCD URL: https://$(kubectl get svc -n argocd argo-cd-argocd-server -o jsonpath='{.status.loadBalancer.ingress[0].hostname}')"
30+
echo "ArgoCD Username: admin"
31+
echo "ArgoCD Password: $(kubectl get secrets argocd-initial-admin-secret -n argocd --template="{{index .data.password | base64decode}}")"
32+
EOT
2433
}
34+

‎argocd/iac/terraform/examples/eks/multi-cluster/hub-spoke-shared/hub/outputs.tf‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,25 @@ output "configure_argocd" {
1515
export ARGOCD_OPTS="--port-forward --port-forward-namespace argocd --grpc-web"
1616
kubectl config set-context --current --namespace argocd
1717
argocd login --port-forward --username admin --password $(argocd admin initial-password | head -1)
18-
argocd admin dashboard --port 8080
18+
echo "ArgoCD Username: admin"
19+
echo "ArgoCD Password: $(kubectl get secrets argocd-initial-admin-secret -n argocd --template="{{index .data.password | base64decode}}")"
20+
echo Port Forward: http://localhost:8080
21+
kubectl port-forward -n argocd svc/argo-cd-argocd-server 8080:80
1922
EOT
2023
}
2124

22-
output "argocd_cluster" {
23-
description = "ArgoCD cluster resource"
24-
value = module.gitops_bridge_metadata.argocd
25+
output "access_argocd" {
26+
description = "ArgoCD Access"
27+
value = <<-EOT
28+
export KUBECONFIG="/tmp/${module.eks.cluster_name}"
29+
aws eks --region ${local.region} update-kubeconfig --name ${module.eks.cluster_name}
30+
echo "ArgoCD URL: https://$(kubectl get svc -n argocd argo-cd-argocd-server -o jsonpath='{.status.loadBalancer.ingress[0].hostname}')"
31+
echo "ArgoCD Username: admin"
32+
echo "ArgoCD Password: $(kubectl get secrets argocd-initial-admin-secret -n argocd --template="{{index .data.password | base64decode}}")"
33+
EOT
2534
}
2635

2736

28-
2937
output "argocd_iam_role_arn" {
3038
description = "IAM Role for ArgoCD Cluster Hub, use to connect to spoke clusters"
3139
value = module.argocd_irsa.iam_role_arn

‎argocd/iac/terraform/examples/eks/multi-cluster/hub-spoke-shared/spokes/outputs.tf‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,9 @@ output "configure_argocd" {
1414
export ARGOCD_OPTS="--port-forward --port-forward-namespace argocd --grpc-web"
1515
kubectl config set-context --current --namespace argocd
1616
argocd login --port-forward --username admin --password $(argocd admin initial-password | head -1)
17-
argocd admin dashboard --port 8081
17+
echo "ArgoCD Username: admin"
18+
echo "ArgoCD Password: $(kubectl get secrets argocd-initial-admin-secret -n argocd --template="{{index .data.password | base64decode}}")"
19+
echo Port Forward: http://localhost:8081
20+
kubectl port-forward -n argocd svc/argo-cd-argocd-server 8081:80
1821
EOT
1922
}
20-
21-
output "argocd_cluster" {
22-
description = "ArgoCD cluster resource"
23-
value = module.gitops_bridge_metadata_hub.argocd
24-
}

‎argocd/iac/terraform/examples/eks/multi-cluster/hub-spoke/hub/outputs.tf‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,25 @@ output "configure_argocd" {
1515
export ARGOCD_OPTS="--port-forward --port-forward-namespace argocd --grpc-web"
1616
kubectl config set-context --current --namespace argocd
1717
argocd login --port-forward --username admin --password $(argocd admin initial-password | head -1)
18-
argocd admin dashboard --port 8080
18+
echo "ArgoCD Username: admin"
19+
echo "ArgoCD Password: $(kubectl get secrets argocd-initial-admin-secret -n argocd --template="{{index .data.password | base64decode}}")"
20+
echo Port Forward: http://localhost:8080
21+
kubectl port-forward -n argocd svc/argo-cd-argocd-server 8080:80
1922
EOT
2023
}
2124

22-
output "argocd_cluster" {
23-
description = "ArgoCD cluster resource"
24-
value = module.gitops_bridge_metadata.argocd
25+
output "access_argocd" {
26+
description = "ArgoCD Access"
27+
value = <<-EOT
28+
export KUBECONFIG="/tmp/${module.eks.cluster_name}"
29+
aws eks --region ${local.region} update-kubeconfig --name ${module.eks.cluster_name}
30+
echo "ArgoCD URL: https://$(kubectl get svc -n argocd argo-cd-argocd-server -o jsonpath='{.status.loadBalancer.ingress[0].hostname}')"
31+
echo "ArgoCD Username: admin"
32+
echo "ArgoCD Password: $(kubectl get secrets argocd-initial-admin-secret -n argocd --template="{{index .data.password | base64decode}}")"
33+
EOT
2534
}
2635

36+
2737
output "argocd_iam_role_arn" {
2838
description = "IAM Role for ArgoCD Cluster Hub, use to connect to spoke clusters"
2939
value = module.argocd_irsa.iam_role_arn

‎argocd/iac/terraform/examples/eks/multi-cluster/hub-spoke/spokes/outputs.tf‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,3 @@ output "configure_argocd" {
1414
aws eks --region ${local.region} update-kubeconfig --name ${module.eks.cluster_name}
1515
EOT
1616
}
17-
18-
output "argocd_cluster" {
19-
description = "ArgoCD cluster resource"
20-
value = module.gitops_bridge_metadata_hub.argocd
21-
}

0 commit comments

Comments
 (0)