Skip to content
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

Keycloak 25.0.1, update Terraform deps #17

Merged
merged 5 commits into from
Jul 16, 2024
Merged

Keycloak 25.0.1, update Terraform deps #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3af69e1
Keycloak 25.0.1
manics Jul 11, 2024
84a6b50
health_check: port 9000
manics Jul 15, 2024
578725a
Update Terraform provider versions
manics Jul 15, 2024
b12fdbd
terraform-aws-modules/vpc/aws: 5.9.0
manics Jul 15, 2024
f8dcf44
Add port-mapping for management-port
manics Jul 15, 2024
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 container/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# https://www.keycloak.org/server/containers

ARG KEYCLOAK_VERSION=24.0.2
ARG KEYCLOAK_VERSION=25.0.1
FROM quay.io/keycloak/keycloak:$KEYCLOAK_VERSION as builder

ENV KC_DB=postgres
Expand Down
114 changes: 56 additions & 58 deletions ecs-cluster/.terraform.lock.hcl
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions ecs-cluster/keycloak.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ data "aws_caller_identity" "current" {}

locals {
container-port = 8443
management-port = 9000
keycloak-hostname = var.keycloak-hostname == "" ? aws_lb.keycloak.dns_name : var.keycloak-hostname

vpc_id = var.vpc-id == "" ? module.vpc[0].vpc_id : var.vpc-id
Expand Down Expand Up @@ -68,6 +69,12 @@ resource "aws_security_group" "ecs-task-keycloak" {
to_port = local.container-port
security_groups = [aws_security_group.alb.id]
}
ingress {
protocol = "tcp"
from_port = local.management-port
to_port = local.management-port
security_groups = [aws_security_group.alb.id]
}

egress {
protocol = "-1"
Expand Down Expand Up @@ -105,6 +112,7 @@ resource "aws_alb_target_group" "keycloak" {
matcher = "200"
timeout = "5"
path = "/health"
port = local.management-port
unhealthy_threshold = "2"
}
}
Expand Down Expand Up @@ -331,6 +339,10 @@ resource "aws_ecs_task_definition" "keycloak" {
protocol = "tcp"
containerPort = local.container-port
hostPort = local.container-port
}, {
protocol = "tcp"
containerPort = local.management-port
hostPort = local.management-port
}]
logConfiguration = {
logDriver = "awslogs"
Expand Down
6 changes: 3 additions & 3 deletions ecs-cluster/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ terraform {
# by running `terraform init -backend=false -upgrade`
aws = {
source = "hashicorp/aws"
version = "~> 5.26"
version = "~> 5.58"
}

http = {
Expand All @@ -14,12 +14,12 @@ terraform {

random = {
source = "hashicorp/random"
version = "~> 3.5"
version = "~> 3.6"
}

local = {
source = "hashicorp/local"
version = "~> 2.4"
version = "~> 2.5"
}
}

Expand Down
2 changes: 1 addition & 1 deletion ecs-cluster/vpc.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ data "aws_availability_zones" "available" {}

module "vpc" {
source = "terraform-aws-modules/vpc/aws"
version = "5.2.0"
version = "5.9.0"
count = var.vpc-id == "" ? 1 : 0

name = "${var.name}-vpc"
Expand Down
Loading