diff --git a/modules/kubernetes/finance_app/main.tf b/modules/kubernetes/finance_app/main.tf index 49a55040..c10502bd 100644 --- a/modules/kubernetes/finance_app/main.tf +++ b/modules/kubernetes/finance_app/main.tf @@ -95,6 +95,10 @@ resource "kubernetes_deployment" "finance_app" { name = "finance-app" image_pull_policy = "Always" + env { + name = "ENVIRONMENT" + value = "prod" + } env { name = "DB_CONNECTION_STRING" value = var.db_connection_string diff --git a/modules/kubernetes/oauth-proxy/main.tf b/modules/kubernetes/oauth-proxy/main.tf index c17581aa..a6ac1fa3 100644 --- a/modules/kubernetes/oauth-proxy/main.tf +++ b/modules/kubernetes/oauth-proxy/main.tf @@ -134,6 +134,8 @@ resource "kubernetes_deployment" "oauth2-proxy" { image = "quay.io/pusher/oauth2_proxy:latest" name = "oauth2-proxy" args = ["--provider=google", "--upstream=file:///dev/null", "--upstream=http://localhost/redirect/", "--http-address=0.0.0.0:4180", "--cookie-domain=.viktorbarzin.me", "--footer=-", "--authenticated-emails-file=/etc/authorized_emails/authorized_emails.txt"] + # args = ["--provider=google", "--upstream=file:///dev/null", "--upstream=http://localhost/redirect/", "--http-address=0.0.0.0:4180", "--cookie-domain=.viktorbarzin.me", "--footer=-", "--email-domain=*", "--google-group=barzini-lab-admins@googlegroups.com", "--google-admin-email=vbarzin@gmail.com", "--google-service-account-json=/etc/google_service_account/google_service_account.json"] + # args = ["--provider=google", "--upstream=file:///dev/null", "--upstream=http://localhost/redirect/", "--http-address=0.0.0.0:4180", "--cookie-domain=.viktorbarzin.me", "--footer=-", "--email-domain=*", "--google-group=barzini-lab-admins", "--google-admin-email=533122798643-compute@developer.gserviceaccount.com", "--google-service-account-json=/etc/google_service_account/google_service_account.json"] env { name = "OAUTH2_PROXY_CLIENT_ID" value = var.oauth2_proxy_client_id @@ -155,6 +157,10 @@ resource "kubernetes_deployment" "oauth2-proxy" { name = "authorized-emails" mount_path = "/etc/authorized_emails" } + # volume_mount { + # name = "sa-json" + # mount_path = "/etc/google_service_account/" + # } } volume { name = "config" @@ -168,6 +174,12 @@ resource "kubernetes_deployment" "oauth2-proxy" { name = "authorized-emails" } } + # volume { + # name = "sa-json" + # config_map { + # name = "google-service-account" + # } + # } } } } diff --git a/terraform.tfstate b/terraform.tfstate index 0ee836a5..565f19b7 100644 Binary files a/terraform.tfstate and b/terraform.tfstate differ