Skip to content

Commit

Permalink
feat: v24.4.1 (#40)
Browse files Browse the repository at this point in the history
* feat: tag immutability, closed #39

* feat(aws): remove sshuttle dependency, closed #38

* feat(aws): dependency between nginx helm release, alb and dns records, closed 37

* feat: bump release version to 24.4.1
  • Loading branch information
VladyslavKurmaz authored Apr 28, 2024
1 parent 98d6944 commit 3eddf5e
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 5 deletions.
1 change: 1 addition & 0 deletions .env.template
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ TF_VAR_tenant_id=

#TF_VAR_registry=
#TF_VAR_repositories=
#TF_VAR_image_tag_mutability=

TF_VAR_domain_name=myproject.dev
TF_VAR_dns_records=myproject.dev,api,admin
Expand Down
2 changes: 1 addition & 1 deletion aws/.tln.conf
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ module.exports = {
},
dotenvs: async (tln) => { if (fs.existsSync('.env')) return ['.env']; else return [] },
inherits: async (tln) => [],
depends: async (tln) => ['kubectl-1.29.0', 'helm-3.14.0', 'terraform-1.7.5', 'aws-cli-2.15.15', 'sshuttle'],
depends: async (tln) => ['kubectl-1.29.0', 'helm-3.14.0', 'terraform-1.7.5', 'aws-cli-2.15.15'],
steps: async (tln) => [
{ id: 'ls-ec2', builder: async (tln, script) => {
script.set(['aws ec2 describe-instances --output yaml --query "Reservations[*].Instances[*].{Instance:InstanceId}"']);
Expand Down
4 changes: 4 additions & 0 deletions aws/app/data.tf
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,10 @@ data "aws_lb" "primary" {
"kubernetes.io/cluster/${module.shared.k8s_name}" = "owned",
"kubernetes.io/service-name" = "nginx-ingress/nginx-ingress-nginx-controller"
}

depends_on = [
helm_release.nginx
]
}

data "aws_secretsmanager_secret" "rds_pg" {
Expand Down
3 changes: 2 additions & 1 deletion aws/app/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ resource "aws_route53_record" "record" {
evaluate_target_health = false
}
depends_on = [
helm_release.nginx
helm_release.nginx,
data.aws_lb.primary
]
}
2 changes: 1 addition & 1 deletion aws/provider/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ resource "aws_ecr_repository" "primary" {
for_each = var.repositories != "" ? toset(split(",", var.repositories)) : []

name = each.key
image_tag_mutability = "MUTABLE"
image_tag_mutability = var.image_tag_mutability

encryption_configuration {
encryption_type = "KMS"
Expand Down
6 changes: 5 additions & 1 deletion aws/provider/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,8 @@ variable "project_id" {
variable "repositories" {
type = string
default = ""
}
}
variable "image_tag_mutability" {
type = string
default = ""
}
2 changes: 1 addition & 1 deletion version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
24.4.0
24.4.1

0 comments on commit 3eddf5e

Please sign in to comment.