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.

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

Fix empty check of var.{public,private}-subnets, delay health check, 2.0.0-beta.3 #16

Merged
merged 5 commits into from
Apr 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 4 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
# Changelog

## 2.0.0-beta.1 - In progress
## 2.0.0-beta.3 - In progress

([full changelog](https://github.com/hic-infra/ecs-keycloak/compare/1.0.0...2.0.0-beta.1))
([full changelog](https://github.com/hic-infra/ecs-keycloak/compare/1.0.0...2.0.0-beta.3))

- Fix empty check of `var.{public,private}-subnets`, delay health check, 2.0.0-beta.3 [#16](https://github.com/hic-infra/ecs-keycloak/pull/16)
- Release 2.0.0-beta.2 [#15](https://github.com/hic-infra/ecs-keycloak/pull/15)
- Add `terraform {backend s3}` back [#14](https://github.com/hic-infra/ecs-keycloak/pull/14)
- Release 2.0.0-beta.1 [#13](https://github.com/hic-infra/ecs-keycloak/pull/13)
- Optionally use existing VPC. Upgrade Keycloak to 24.0.2 [#12](https://github.com/hic-infra/ecs-keycloak/pull/12)
Expand Down
7 changes: 5 additions & 2 deletions ecs-cluster/keycloak.tf
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ locals {
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
public_subnets = var.public-subnets == [] ? module.vpc[0].public_subnets : var.public-subnets
private_subnets = var.private-subnets == [] ? module.vpc[0].private_subnets : var.private-subnets
public_subnets = length(var.public-subnets) == 0 ? module.vpc[0].public_subnets : var.public-subnets
private_subnets = length(var.private-subnets) == 0 ? module.vpc[0].private_subnets : var.private-subnets
manics marked this conversation as resolved.
Show resolved Hide resolved
}

resource "random_password" "db-password" {
Expand Down Expand Up @@ -369,6 +369,9 @@ resource "aws_ecs_service" "keycloak" {
container_port = local.container-port
}

# Java applications can be very slow to start
health_check_grace_period_seconds = 180

# lifecycle {
# ignore_changes = [desired_count]
# }
Expand Down
2 changes: 1 addition & 1 deletion ecs-cluster/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ variable "region" {

variable "keycloak-image" {
type = string
default = "ghcr.io/hic-infra/ecs-keycloak:2.0.0-beta.2"
default = "ghcr.io/hic-infra/ecs-keycloak:2.0.0-beta.3"
description = "Keycloak image including registry"
}

Expand Down
Loading