diff --git a/README.md b/README.md index 82bef4e..daa82d2 100644 --- a/README.md +++ b/README.md @@ -128,6 +128,7 @@ Common issues and solutions: | [profile](#input\_profile) | AWS config profile used to upload images into ECR | `string` | `""` | no | | [region](#input\_region) | AWS region | `string` | n/a | yes | | [service\_name](#input\_service\_name) | The name of the service to be deployed in the EKS cluster. | `string` | `"service"` | no | +| [utilities\_tag](#input\_utilities\_tag) | Used for chown and curl. | `string` | `"1.0.3"` | no | ## Outputs diff --git a/main.tf b/main.tf index ffe3b67..1aab4fe 100644 --- a/main.tf +++ b/main.tf @@ -70,7 +70,6 @@ resource "kubernetes_namespace" "keycloak" { module "service_account" { # tflint-ignore: terraform_module_pinned_source source = "git::https://github.e.it.census.gov/SCT-Engineering/tfmod-config-job.git//service-account" - # source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-config-job.git//service-account" namespace = kubernetes_namespace.keycloak.metadata[0].name } @@ -78,9 +77,8 @@ module "service_account" { module "pre_install" { # tflint-ignore: terraform_module_pinned_source source = "git::https://github.e.it.census.gov/SCT-Engineering/tfmod-config-job.git//config-job/?ref=mcmCluster" - # source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-config-job.git//config-job" - namespace = module.service_account.namespace + namespace = kubernetes_namespace.keycloak.metadata[0].name service_account_name = module.service_account.service_account_name job_name = "keycloak-config-secret-job" config_script = local.secrets_job_script @@ -191,14 +189,13 @@ module "ingress_resources" { public_hostname = var.service_name public_domain = var.cluster_domain service_name = format("%v-%v-%v", var.service_name, var.keycloak_namespace, "http") - service_namespace = var.keycloak_namespace + service_namespace = kubernetes_namespace.keycloak.metadata[0].name service_port = local.public_port_number } module "post_install" { # tflint-ignore: terraform_module_pinned_source source = "git::https://github.e.it.census.gov/SCT-Engineering/tfmod-config-job.git//config-job/?ref=mcmCluster" - # source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-config-job.git//config-job" namespace = helm_release.keycloak.namespace service_account_name = module.service_account.service_account_name diff --git a/variables.tf b/variables.tf index 524bfe2..20ade53 100644 --- a/variables.tf +++ b/variables.tf @@ -107,3 +107,10 @@ variable "service_name" { type = string default = "service" } + +# From bigbang utilities +variable "utilities_tag" { + description = "Used for chown and curl." + type = string + default = "1.0.3" +}