From 53842a8239e161d1c6b77b3e6ab1e99a896df0da Mon Sep 17 00:00:00 2001 From: "Matthew C. Morgan" Date: Mon, 22 Jul 2024 22:38:28 -0400 Subject: [PATCH] updates --- README.md | 10 +++++++++- copy_images.tf | 7 +++++-- main.tf | 2 +- variables.tf | 5 ++--- version.tf | 2 +- 5 files changed, 18 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index a75289c..5738c66 100644 --- a/README.md +++ b/README.md @@ -21,6 +21,15 @@ have a istio proxy configured, prevent communication with that pod.) configuration of which identities are allowed to call services, and which services are allowed to interact with other services. +# CHANGELOG + +* 1.0.2 -- 2024-07-22 + - updated istio chart/app to 1.22.3 + - add force_delete and lifecycle policies to copy_images + - updated version.tf to 1.0.2 + - included module.images in depends on helm charts + - created changelog + ## Requirements | Name | Version | @@ -69,4 +78,3 @@ have a istio proxy configured, prevent communication with that pod.) | Name | Source | Version | |------|--------|---------| | [images](#module\_images) | git@github.e.it.census.gov:terraform-modules/aws-ecr-copy-images.git/ | 2.0.2 | - diff --git a/copy_images.tf b/copy_images.tf index d5b94c1..2d1895d 100644 --- a/copy_images.tf +++ b/copy_images.tf @@ -25,7 +25,7 @@ locals { } module "images" { - source = "git@github.e.it.census.gov:terraform-modules/aws-ecr-copy-images.git/?ref=2.0.2" + source = "git@github.e.it.census.gov:terraform-modules/aws-ecr-copy-images.git/?ref=tf-upgrade" profile = var.profile application_name = var.cluster_name @@ -41,5 +41,8 @@ module "images" { region = var.region ## source_password = "" ## source_username = "" -} + enable_lifecycle_policy = true + lifecycle_policy_all = true + force_delete = true +} diff --git a/main.tf b/main.tf index f599126..bdda2d0 100644 --- a/main.tf +++ b/main.tf @@ -62,6 +62,7 @@ data "kubernetes_service" "apiserver" { } resource "helm_release" "base" { + depends_on = [module.images] chart = "base" name = "istio-base" namespace = kubernetes_namespace.ns.metadata[0].name @@ -181,4 +182,3 @@ resource "helm_release" "egress" { value = "ClusterIP" } } - diff --git a/variables.tf b/variables.tf index 42ec972..cbd692a 100644 --- a/variables.tf +++ b/variables.tf @@ -40,14 +40,14 @@ variable "tags" { variable "istio_chart_version" { description = "The version of istio to install into the cluster." type = string - default = "1.18.2" + default = "1.22.3" } # The `APP VERSION` of the output found while determining the chart version variable "istio_version" { description = "The version of istio to install into the cluster." type = string - default = "1.18.2" + default = "1.22.3" } variable "enable_telemetry" { @@ -61,4 +61,3 @@ variable "enable_egress_gateway" { type = bool default = true } - diff --git a/version.tf b/version.tf index e4d9729..27eae9e 100644 --- a/version.tf +++ b/version.tf @@ -1,4 +1,4 @@ locals { _module_name = "tfmod-istio" - _module_version = "1.0.1" + _module_version = "1.0.2" }