Skip to content

Commit 0409409

Browse files
fix: Azure app integration
1 parent c7ccb44 commit 0409409

File tree

4 files changed

+32
-7
lines changed

4 files changed

+32
-7
lines changed

main.tf

+2
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,8 @@ module "helm_release" {
101101

102102
github_bot = var.github_bot
103103

104+
azure_app = var.azure_app
105+
104106
values = var.helm_values
105107

106108
redis_host = module.redis.redis_host

modules/helm_release/main.tf

+12-7
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ resource "kubernetes_manifest" "backend_config" {
77
"namespace" = "default"
88
}
99
"spec" = {
10-
"timeoutSec" = 1209600 # 2 weeks
10+
"timeoutSec" = 1209600 # 2 weeks
1111
}
1212
}
1313
}
@@ -32,13 +32,13 @@ locals {
3232
},
3333
},
3434

35-
webservice = { image = { tag = "8264bfc" } },
36-
migrations = { image = { tag = "c19dd39" } },
37-
event-worker = { image = { tag = "8264bfc" } },
38-
jobs = { image = { tag = "8264bfc" } },
35+
webservice = { image = { tag = "8264bfc" } },
36+
migrations = { image = { tag = "c19dd39" } },
37+
event-worker = { image = { tag = "8264bfc" } },
38+
jobs = { image = { tag = "8264bfc" } },
3939

40-
pty-proxy = {
41-
image = { tag = "8264bfc" }
40+
pty-proxy = {
41+
image = { tag = "8264bfc" }
4242
service = {
4343
annotations = {
4444
"beta.cloud.google.com/backend-config" = "{\"default\": \"ctrlplane-websocket\"}"
@@ -56,6 +56,11 @@ locals {
5656
"global.integrations.github.bot.webhookSecret" = var.github_bot.webhook_secret
5757
} : {}
5858

59+
azure_app_settings = var.azure_app != null ? {
60+
"global.integrations.azure.appClientId" = var.azure_app.client_id
61+
"global.integrations.azure.appClientSecret" = var.azure_app.client_secret
62+
} : {}
63+
5964
auth_providers_settings = {
6065
"global.authProviders.google.clientId" = var.google_auth.client_id,
6166
"global.authProviders.google.clientSecret" = var.google_auth.client_secret,

modules/helm_release/variables.tf

+9
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,15 @@ variable "github_bot" {
8181
default = null
8282
}
8383

84+
variable "azure_app" {
85+
type = object({
86+
client_id = string
87+
client_secret = string
88+
})
89+
description = "The Azure app client ID and secret."
90+
default = null
91+
}
92+
8493
variable "values" {
8594
type = any
8695
default = {}

variables.tf

+9
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,15 @@ variable "github_bot" {
7575
default = null
7676
}
7777

78+
variable "azure_app" {
79+
type = object({
80+
client_id = string
81+
client_secret = string
82+
})
83+
description = "The Azure app client ID and secret."
84+
default = null
85+
}
86+
7887
variable "helm_values" {
7988
type = any
8089
default = { otel = { install = true } }

0 commit comments

Comments
 (0)