From bb2e236f86042f028239abee2aeb2ff7ff820f90 Mon Sep 17 00:00:00 2001 From: viktorbarzin Date: Sun, 19 Mar 2023 03:40:26 +0000 Subject: [PATCH] add oauth env variables --- main.tf | 4 ++++ modules/kubernetes/finance_app/main.tf | 18 ++++++++++++++++-- modules/kubernetes/main.tf | 4 ++++ 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/main.tf b/main.tf index 049a0b55..a247a25a 100644 --- a/main.tf +++ b/main.tf @@ -56,6 +56,8 @@ variable "finance_app_imap_user" {} variable "finance_app_imap_password" {} variable "finance_app_imap_directory" {} variable "finance_app_monzo_registered_accounts_json" {} +variable "finance_app_oauth_google_client_id" {} +variable "finance_app_oauth_google_client_secret" {} variable "ansible_prefix" { default = "ANSIBLE_VAULT_PASSWORD_FILE=~/.ansible/vault_pass.txt ansible-playbook -i playbook/hosts.yaml playbook/linux.yml -t linux/initial_setup" @@ -275,4 +277,6 @@ module "kubernetes_cluster" { finance_app_imap_password = var.finance_app_imap_password finance_app_imap_directory = var.finance_app_imap_directory finance_app_monzo_registered_accounts_json = var.finance_app_monzo_registered_accounts_json + finance_app_oauth_google_client_id = var.finance_app_oauth_google_client_id + finance_app_oauth_google_client_secret = var.finance_app_oauth_google_client_secret } diff --git a/modules/kubernetes/finance_app/main.tf b/modules/kubernetes/finance_app/main.tf index 39504462..d37aadf7 100644 --- a/modules/kubernetes/finance_app/main.tf +++ b/modules/kubernetes/finance_app/main.tf @@ -10,6 +10,8 @@ variable "prod_graphql_endpoint" { default = "https://finance.viktorbarzin.me/graphql" } variable "monzo_registered_accounts_json" {} +variable "oauth_google_client_id" {} +variable "oauth_google_client_secret" {} resource "kubernetes_namespace" "finance_app" { @@ -116,6 +118,18 @@ resource "kubernetes_deployment" "finance_app" { name = "IMAP_DIRECTORY" value = var.imap_directory } + env { + name = "OAUTH_GOOGLE_CLIENT_ID" + value = var.oauth_google_client_id + } + env { + name = "OAUTH_GOOGLE_CLIENT_SECRET" + value = var.oauth_google_client_secret + } + env { + name = "FLASK_DEBUG" + value = "true" + } volume_mount { name = "data" mount_path = "/data" @@ -228,7 +242,7 @@ resource "kubernetes_service" "finance_app" { } port { name = "http" - port = "8000" + port = "5000" } } } @@ -311,7 +325,7 @@ resource "kubernetes_ingress_v1" "finance_app" { service { name = "finance-app" port { - number = 8000 + number = 5000 } } } diff --git a/modules/kubernetes/main.tf b/modules/kubernetes/main.tf index 80ff1c2c..8713166e 100644 --- a/modules/kubernetes/main.tf +++ b/modules/kubernetes/main.tf @@ -44,6 +44,8 @@ variable "finance_app_imap_user" {} variable "finance_app_imap_password" {} variable "finance_app_imap_directory" {} variable "finance_app_monzo_registered_accounts_json" {} +variable "finance_app_oauth_google_client_id" {} +variable "finance_app_oauth_google_client_secret" {} resource "null_resource" "core_services" { # List all the core modules that must be provisioned first @@ -267,4 +269,6 @@ module "finance_app" { imap_password = var.finance_app_imap_password imap_directory = var.finance_app_imap_directory monzo_registered_accounts_json = var.finance_app_monzo_registered_accounts_json + oauth_google_client_id = var.finance_app_oauth_google_client_id + oauth_google_client_secret = var.finance_app_oauth_google_client_secret }