Skip to content

Hotfix: Apply ingest_appeals to AppGW #161

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
szabozoltan69 merged 8 commits into from
Mar 6, 2026
Merged

Hotfix: Apply ingest_appeals to AppGW #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
01de99a
alert-hub(staging): deploy preparedness messages in email
thenav56 Mar 5, 2026
4967cfe
alert-hub(staging): fix preparedness 429 issue
thenav56 Mar 5, 2026
56e65c9
IP detection
szabozoltan69 Mar 5, 2026
4224b2e
Use better IP detection
szabozoltan69 Mar 5, 2026
e346c17
Rollback configuration-snippet changes
szabozoltan69 Mar 5, 2026
5f2fbac
Clean up subnet CIDR definitions
szabozoltan69 Mar 5, 2026
268a260
Use gunicorn for IP logging
szabozoltan69 Mar 6, 2026
76ab648
Apply ingest_appeals to AppGW
szabozoltan69 Mar 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion applications/argocd/staging/applications/alert-hub-backend.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ spec:
source:
repoURL: ghcr.io/ifrcgo
chart: ifrcgo-alert-hub-helm
targetRevision: 0.1.1-develop.cfa7aea0
targetRevision: 0.1.1-develop.c8fb21af
helm:
valueFiles:
- values-go-deploy.yaml
Expand Down
4 changes: 2 additions & 2 deletions applications/go-api/azure-pipelines.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
displayName: "Deploy staging instance of go-api"
env:
ENVIRONMENT: staging
VERSION: "0.0.2-develop.cafeccde"
VERSION: "0.0.2-develop.cbf85d80"
# For Azure CLI
AZURE_TENANT_ID: $(TERRAFORM_TENANT_ID)
AZURE_CLIENT_ID: $(TERRAFORM_SERVICE_PRINCIPAL_ID)
Expand Down Expand Up @@ -120,7 +120,7 @@ jobs:
displayName: "Deploy production instance of go-api"
env:
ENVIRONMENT: production
VERSION: "0.0.2-master.c2b61ff3"
VERSION: "0.0.2-master.c6ea97c4"
# For Azure CLI
AZURE_TENANT_ID: $(TERRAFORM_TENANT_ID)
AZURE_CLIENT_ID: $(TERRAFORM_SERVICE_PRINCIPAL_ID)
Expand Down
20 changes: 20 additions & 0 deletions base-infrastructure/terraform/resources/helm-ingress-nginx.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,25 @@ resource "helm_release" "ifrcgo-ingress-nginx" {
value = azurerm_public_ip.ifrcgo.ip_address
}

# IP logging (preserve client IPs for ingress logs)
set {
name = "controller.config.use-forwarded-headers"
value = "true"
}

set {
name = "controller.config.compute-full-forwarded-for"
value = "true"
}

set {
name = "controller.config.real-ip-header"
value = "X-Forwarded-For"
}

set {
name = "controller.config.set-real-ip-from"
value = local.aks_subnet_cidr
}

}
5 changes: 3 additions & 2 deletions base-infrastructure/terraform/resources/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,9 @@ variable "ifrcgo_prod_resources_db_server" {
# Local variables

locals {
location = lower(replace(var.REGION, " ", ""))
prefix = var.environment == "staging" ? "ifrctgo" : "ifrcpgo"
location = lower(replace(var.REGION, " ", ""))
prefix = var.environment == "staging" ? "ifrctgo" : "ifrcpgo"
aks_subnet_cidr = "10.1.0.0/16"
# stack_id = "ifrcgo"
# prefixnodashes = "${local.stack_id}${var.environment}"
storage = local.prefix
Expand Down
2 changes: 1 addition & 1 deletion base-infrastructure/terraform/resources/vnet.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ resource "azurerm_subnet" "aks" {
name = "${local.prefix}-aks-subnet"
virtual_network_name = azurerm_virtual_network.ifrcgo-cluster.name
resource_group_name = data.azurerm_resource_group.ifrcgo.name
address_prefixes = ["10.1.0.0/16"]
address_prefixes = [local.aks_subnet_cidr]
}

# subnet for postgres that's delegated
Expand Down