2martens/terraform
1
0
Fork 0
mirror of https://github.com/2martens/terraform.git synced 2026-10-17 15:46:52 +02:00
Code Issues Activity

Add missing ArgoCD url configuration
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Jim Martens
2024-09-09 13:52:26 +02:00
parent 8f8d78a909
commit 9f92288af4
5 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
terraform/main.tf
+2
View File
@@ -74,6 +74,7 @@ module "test_cluster" {
aws_access_key = var.aws_access_key
aws_secret_key = var.aws_secret_key
argocd_keycloak_client_secret = var.argocd_test_keycloak_client_secret
argocd_url = "https://argocd.k8s.test.2martens.de"
}
module "monitoring_cluster" {
@@ -124,4 +125,5 @@ module "monitoring_cluster" {
aws_access_key = var.aws_access_key
aws_secret_key = var.aws_secret_key
argocd_keycloak_client_secret = var.argocd_monitoring_keycloak_client_secret
argocd_url = "https://argocd.k8s.monitoring.2martens.de"
}
terraform/modules/k8s-cluster/manager-node.tf
+4 -2
View File
@@ -126,10 +126,12 @@ resource "hcloud_server" "manager" {
aws_secret_key : var.aws_secret_key
}))
argocd_ha_values : base64encode(templatefile("${path.module}/templates/helm/argocd-values-ha.yaml", {
argocd_keycloak_client_secret : var.argocd_keycloak_client_secret
argocd_keycloak_client_secret : var.argocd_keycloak_client_secret,
argocd_url : var.argocd_url
}))
argocd_values : base64encode(templatefile("${path.module}/templates/helm/argocd-values.yaml", {
argocd_keycloak_client_secret : var.argocd_keycloak_client_secret
argocd_keycloak_client_secret : var.argocd_keycloak_client_secret,
argocd_url : var.argocd_url
}))
cluster_setup : base64encode(templatefile("${path.module}/templates/scripts/cluster-setup.sh", {
argocd_environment : var.argocd_environment
terraform/modules/k8s-cluster/templates/helm/argocd-values-ha.yaml
+1
View File
@@ -4,6 +4,7 @@ global:
configs:
cm:
url: ${argocd_url}
oidc.config: |
name: Keycloak
issuer: https://id.2martens.de/realms/2martens
terraform/modules/k8s-cluster/templates/helm/argocd-values.yaml
+1
View File
@@ -3,6 +3,7 @@ global:
format: text
configs:
cm:
url: ${argocd_url}
oidc.config: |
name: Keycloak
issuer: https://id.2martens.de/realms/2martens
terraform/modules/k8s-cluster/variables.tf
+11 -5
View File
@@ -55,13 +55,13 @@ variable "server_subnet_id" {
variable "private_node_ips" {
description = "One IP in the private network subnet for each manager node created."
type = list(string)
type = list(string)
}
variable "private_worker_node_ips" {
description = "One IP in the private network subnet for each worker node created."
type = list(string)
default = []
type = list(string)
default = []
}
variable "basic_firewall_id" {
@@ -151,8 +151,8 @@ variable "vault_service_principal" {
variable "vault_allowed_namespaces" {
description = "Namespaces that are allowed to access secrets from the Vault"
type = list(string)
default = []
type = list(string)
default = []
}
variable "hcloud_token_enabled" {
@@ -212,3 +212,9 @@ variable "argocd_keycloak_client_secret" {
default = ""
sensitive = true
}
variable "argocd_url" {
description = "Base URL of ArgoCD application"
type = string
default = ""
sensitive = false
}