Skip to content

Commit ad0196a

Browse files
add storage, update backend
1 parent 8bca950 commit ad0196a

8 files changed

+71
-21
lines changed

.gitignore

+3-1
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,6 @@ override.tf.json
3131

3232
# Ignore CLI configuration files
3333
.terraformrc
34-
terraform.rc
34+
terraform.rc
35+
36+
.vscode

backend

terraform/container_app.tf

+24-10
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
resource "azurerm_container_app_environment" "lissi_eventplanner" {
1+
resource "azurerm_container_app_environment" "eventplanner" {
22
name = "cae-${local.stack}"
3-
location = azurerm_resource_group.lissi_eventplanner.location
4-
resource_group_name = azurerm_resource_group.lissi_eventplanner.name
5-
log_analytics_workspace_id = azurerm_log_analytics_workspace.lissi_eventplanner.id
3+
location = azurerm_resource_group.eventplanner.location
4+
resource_group_name = azurerm_resource_group.eventplanner.name
5+
log_analytics_workspace_id = azurerm_log_analytics_workspace.eventplanner.id
66
tags = local.default_tags
77
}
88

9-
resource "azurerm_container_app" "lissi_eventplanner" {
9+
resource "azurerm_container_app" "eventplanner" {
1010
name = "ca-${local.stack}"
11-
container_app_environment_id = azurerm_container_app_environment.lissi_eventplanner.id
12-
resource_group_name = azurerm_resource_group.lissi_eventplanner.name
11+
container_app_environment_id = azurerm_container_app_environment.eventplanner.id
12+
resource_group_name = azurerm_resource_group.eventplanner.name
1313
revision_mode = "Single"
1414
tags = local.default_tags
1515

@@ -33,18 +33,32 @@ resource "azurerm_container_app" "lissi_eventplanner" {
3333
lifecycle {
3434
// Required to not delete the manually created custom domain since it is not possible to create a managed certificate for a custom domain with terraform
3535
// https://github.com/hashicorp/terraform-provider-azurerm/issues/21866
36-
ignore_changes = ["ingress"]
36+
ignore_changes = [
37+
#ingress
38+
]
3739
}
3840

3941
template {
4042
min_replicas = 1
4143
max_replicas = 1
4244

45+
volume {
46+
name = "vol-eventplanner"
47+
storage_name = azurerm_container_app_environment_storage.eventplanner.name
48+
storage_type = "AzureFile"
49+
}
50+
4351
container {
4452
name = "eventplanner"
4553
image = "ghcr.io/grossherzogin-elisabeth/eventplanner:main"
46-
cpu = 0.5
47-
memory = "1Gi"
54+
cpu = 1.0
55+
memory = "2Gi"
56+
57+
volume_mounts {
58+
name = "vol-eventplanner"
59+
path = "/app/data"
60+
}
61+
4862
env {
4963
name = "AUTH_ISSUER_URI"
5064
value = "https://login.microsoftonline.com/63384ddf-6496-44bd-b22c-93e944e6ed88/v2.0"

terraform/main.tf

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@ locals {
77
}
88
}
99

10-
resource "azurerm_resource_group" "lissi_eventplanner" {
10+
resource "azurerm_resource_group" "eventplanner" {
1111
name = "rg-${local.stack}"
1212
location = var.region
1313
tags = local.default_tags
1414
}
1515

16-
resource "azurerm_log_analytics_workspace" "lissi_eventplanner" {
16+
resource "azurerm_log_analytics_workspace" "eventplanner" {
1717
name = "log-${local.stack}"
18-
location = azurerm_resource_group.lissi_eventplanner.location
19-
resource_group_name = azurerm_resource_group.lissi_eventplanner.name
18+
location = azurerm_resource_group.eventplanner.location
19+
resource_group_name = azurerm_resource_group.eventplanner.name
2020
sku = "PerGB2018"
2121
retention_in_days = 30
2222
tags = local.default_tags

terraform/outputs.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
output "azurerm_container_app_url" {
2-
value = azurerm_container_app.lissi_eventplanner.latest_revision_fqdn
2+
value = azurerm_container_app.eventplanner.latest_revision_fqdn
33
}

terraform/provider.tf

+11
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,15 @@ terraform {
1010

1111
provider "azurerm" {
1212
features {}
13+
client_id = "5dbeb429-820d-4f7c-bb17-dc98eac149df"
14+
#client_secret = "**********************"
15+
tenant_id = "63384ddf-6496-44bd-b22c-93e944e6ed88"
16+
subscription_id = "7cb8180c-c0ab-43e3-9088-7b1b359cc861"
1317
}
18+
19+
# https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/guides/service_principal_client_secret
20+
# Expires 01/01/2025
21+
#export ARM_CLIENT_ID="5dbeb429-820d-4f7c-bb17-dc98eac149df"
22+
#export ARM_CLIENT_SECRET=""
23+
#export ARM_SUBSCRIPTION_ID="7cb8180c-c0ab-43e3-9088-7b1b359cc861"
24+
#export ARM_TENANT_ID="63384ddf-6496-44bd-b22c-93e944e6ed88"

terraform/secrets.tf

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
data "azurerm_key_vault" "lissi_eventplanner" {
1+
data "azurerm_key_vault" "eventplanner" {
22
name = "kv-lissi"
33
resource_group_name = "rg-lissi"
44
}
55

66
data "azurerm_key_vault_secret" "client_id" {
77
name = "auth-client-id"
8-
key_vault_id = data.azurerm_key_vault.lissi_eventplanner.id
8+
key_vault_id = data.azurerm_key_vault.eventplanner.id
99
}
1010

1111
data "azurerm_key_vault_secret" "client_secret" {
1212
name = "auth-client-secret"
13-
key_vault_id = data.azurerm_key_vault.lissi_eventplanner.id
13+
key_vault_id = data.azurerm_key_vault.eventplanner.id
1414
}
1515

1616
data "azurerm_key_vault_certificate" "ssl_certificate" {
1717
name = "cert-crew-grosses-meer-surf"
18-
key_vault_id = data.azurerm_key_vault.lissi_eventplanner.id
18+
key_vault_id = data.azurerm_key_vault.eventplanner.id
1919
}

terraform/storage.tf

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
resource "azurerm_storage_account" "eventplanner" {
2+
name = "steventplanner"
3+
resource_group_name = azurerm_resource_group.eventplanner.name
4+
location = azurerm_resource_group.eventplanner.location
5+
account_tier = "Standard"
6+
account_replication_type = "LRS"
7+
tags = local.default_tags
8+
}
9+
10+
resource "azurerm_storage_share" "eventplanner" {
11+
name = "share-eventplanner"
12+
storage_account_name = azurerm_storage_account.eventplanner.name
13+
quota = 5
14+
}
15+
16+
resource "azurerm_container_app_environment_storage" "eventplanner" {
17+
name = "caes-eventplanner"
18+
container_app_environment_id = azurerm_container_app_environment.eventplanner.id
19+
account_name = azurerm_storage_account.eventplanner.name
20+
share_name = azurerm_storage_share.eventplanner.name
21+
access_key = azurerm_storage_account.eventplanner.primary_access_key
22+
access_mode = "ReadWrite"
23+
}

0 commit comments

Comments
 (0)