From 1665e0f9431de24d5dc7a85649aefcbe7c4491b8 Mon Sep 17 00:00:00 2001 From: jaygridley Date: Fri, 28 Jun 2024 00:18:12 +0000 Subject: [PATCH] feat(sync): sync universal-addon changes Signed-off-by: jaygridley --- .terraform.lock.hcl | 8 -------- LICENSE | 2 +- addon.tf | 9 +++++++-- docs/.addon.md | 2 +- examples/basic/.terraform.lock.hcl | 24 +++++------------------- variables-addon.tf | 2 +- 6 files changed, 15 insertions(+), 32 deletions(-) diff --git a/.terraform.lock.hcl b/.terraform.lock.hcl index e70ba62..f9bceba 100644 --- a/.terraform.lock.hcl +++ b/.terraform.lock.hcl @@ -5,9 +5,7 @@ provider "registry.terraform.io/cloudposse/utils" { version = "1.19.2" constraints = ">= 0.17.0" hashes = [ - "h1:gqYR81ADrA9HeWCMnEOg/x9RIMce6dwOXOC/DxjsYto=", "h1:yy3kB4scsoyM81yyyUMPxuJXeFvexBL5KMrCKrjrUkE=", - "h1:zeLrxuXDYEA5+hArYpigYKZJiIB57WQ3nn7VGTc0QDc=", "zh:1002d1c3f458b569119b31eb2f732c093922b7f86aa59d999d77c3f3ca297f53", "zh:367ca0d95bf24db1ff6632da94affe1ac0b51679e00f6ca3f1b8f927b9724c3b", "zh:3e48ef23e276d18a88405926f39b476d40fb543859f2fcfc316f70501071c1ed", @@ -29,8 +27,6 @@ provider "registry.terraform.io/hashicorp/aws" { version = "5.42.0" constraints = "~> 5.0" hashes = [ - "h1:0lkSSlK45Qil9fO1kFy8RXVC/k6qfC4LDZIaCKnWcUc=", - "h1:Gwe5HXZYD/3M5j6LwKhp8amb1SraCR9p+G96d381RVc=", "h1:Yxsj34z606m8wssYDHyleuBlQ9i+94MHwRs38thQPZU=", "zh:0fb12bd56a3ad777b29f957c56dd2119776dbc01b6074458f597990e368c82de", "zh:16e99c13bef6e3777f67c240c916f57c01c9c142254cfb2720e08281ff906447", @@ -54,9 +50,7 @@ provider "registry.terraform.io/hashicorp/helm" { version = "2.12.1" constraints = ">= 2.6.0" hashes = [ - "h1:7wfYOAeSEchHB8idNl+2jf+OkFi9zFSOLWkEZFuTCik=", "h1:aBfcqM4cbywa7TAxfT1YoFS+Cst9waerlm4XErFmJlk=", - "h1:sgYI7lwGqJqPopY3NGmhb1eQ0YbH8PIXaAZAmnJrAvw=", "zh:1d623fb1662703f2feb7860e3c795d849c77640eecbc5a776784d08807b15004", "zh:253a5bc62ba2c4314875139e3fbd2feaad5ef6b0fb420302a474ab49e8e51a38", "zh:282358f4ad4f20d0ccaab670b8645228bfad1c03ac0d0df5889f0aea8aeac01a", @@ -76,9 +70,7 @@ provider "registry.terraform.io/hashicorp/kubernetes" { version = "2.27.0" constraints = ">= 2.20.0" hashes = [ - "h1:/3kLyOR2jTaWS1MKso4xAztrocGBMxi8yVadWiqSWOg=", "h1:GzU0FzYAT/+IgAhnSBcFH3bT+4I5N6oSga6iZgNJAus=", - "h1:TrlG/sofnDv8kAbzKOD5pIPeUiI5VQY61NuWH+cItDw=", "zh:3bdba30ae67c55dc7e9a317ac0da3b208ea7926fe9c2f0ae6587ee88dcc58d1f", "zh:3f35138a831c00b188d2ffee27111dd0cf59afad2dd5653ed9e67d59646de12c", "zh:64066d18f6ae9a316c2bc840ef3e641d7ab94e1ea3a41d12523e77345ad442ef", diff --git a/LICENSE b/LICENSE index f6f1438..9e712fa 100644 --- a/LICENSE +++ b/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright [2020] [Labyrinth Labs] + Copyright [2022] [Labyrinth Labs] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/addon.tf b/addon.tf index 542f123..bbb3d7c 100644 --- a/addon.tf +++ b/addon.tf @@ -6,7 +6,7 @@ locals { } module "addon" { - source = "git::https://github.com/lablabs/terraform-aws-eks-universal-addon.git//modules/addon?ref=v0.0.5" + source = "git::https://github.com/lablabs/terraform-aws-eks-universal-addon.git//modules/addon?ref=v0.0.4" enabled = var.enabled @@ -72,10 +72,15 @@ module "addon" { } data "utils_deep_merge_yaml" "values" { - count = var.enabled == true ? 1 : 0 + count = var.enabled ? 1 : 0 input = compact([ try(local.addon_values, ""), var.values ]) } + +output "addon" { + description = "The addon module outputs" + value = module.addon +} diff --git a/docs/.addon.md b/docs/.addon.md index f0a08b2..156c110 100644 --- a/docs/.addon.md +++ b/docs/.addon.md @@ -28,4 +28,4 @@ Deploy Helm chart as ArgoCD Application via Helm resource (set `enabled = true`, ## Examples -See [Basic example](examples/basic/README.md) for further information. +See [basic example](examples/basic) for further information. diff --git a/examples/basic/.terraform.lock.hcl b/examples/basic/.terraform.lock.hcl index 44bba7c..3c1279a 100644 --- a/examples/basic/.terraform.lock.hcl +++ b/examples/basic/.terraform.lock.hcl @@ -5,9 +5,7 @@ provider "registry.terraform.io/cloudposse/utils" { version = "1.18.0" constraints = ">= 0.17.0" hashes = [ - "h1:/vyNN6DuHSLpmrc/4d1OZVyDbkj5PckP/pGW8z3lAhE=", "h1:UdRh991C59aDB5nrpBN1PZzyZucsmbgvoDHq4uHKiE0=", - "h1:eHwxhgfHZeW3sKYICNwu9XEaKoAh6YPuj/LSVidyo7w=", "zh:1a6a1f1c354a2e1f92369fd331e1578ee8942600406c83629278b1d88e857421", "zh:35847cc6575844c05e2cbbe199e9d1190c01ed1b91dfe05b897bb6c83825debe", "zh:3b4f263c7c4b9ab08f59577c133f7112b380487dacc1d75b2802488a53dcb23d", @@ -27,11 +25,9 @@ provider "registry.terraform.io/cloudposse/utils" { provider "registry.terraform.io/hashicorp/aws" { version = "5.41.0" - constraints = ">= 3.0.0, >= 4.48.0, ~> 5.0, >= 5.30.0, >= 5.34.0" + constraints = ">= 3.0.0, >= 3.38.0, >= 3.56.0, >= 4.35.0, ~> 5.0" hashes = [ "h1:DiX7N35G2NUQRyRGy90+gyePnhP4w77f8LrJUronotE=", - "h1:SgIWBDBA1uNB/Y7CaLFeNX/Ju2xboSSQmRv35Vbi46M=", - "h1:uNln7837/ZTVgQBk+hhfgB9Y87icES6X0lMSOfK5c7g=", "zh:0553331a6287c146353b6daf6f71987d8c000f407b5e29d6e004ea88faec2e67", "zh:1a11118984bb2950e8ee7ef17b0f91fc9eb4a42c8e7a9cafd7eb4aca771d06e4", "zh:236fedd266d152a8233a7fe27ffdd99ca27d9e66a9618a988a4c3da1ac24a33f", @@ -54,9 +50,7 @@ provider "registry.terraform.io/hashicorp/helm" { version = "2.12.1" constraints = ">= 2.6.0" hashes = [ - "h1:7wfYOAeSEchHB8idNl+2jf+OkFi9zFSOLWkEZFuTCik=", "h1:aBfcqM4cbywa7TAxfT1YoFS+Cst9waerlm4XErFmJlk=", - "h1:sgYI7lwGqJqPopY3NGmhb1eQ0YbH8PIXaAZAmnJrAvw=", "zh:1d623fb1662703f2feb7860e3c795d849c77640eecbc5a776784d08807b15004", "zh:253a5bc62ba2c4314875139e3fbd2feaad5ef6b0fb420302a474ab49e8e51a38", "zh:282358f4ad4f20d0ccaab670b8645228bfad1c03ac0d0df5889f0aea8aeac01a", @@ -74,11 +68,9 @@ provider "registry.terraform.io/hashicorp/helm" { provider "registry.terraform.io/hashicorp/kubernetes" { version = "2.27.0" - constraints = ">= 2.20.0" + constraints = ">= 2.7.1, >= 2.20.0" hashes = [ - "h1:/3kLyOR2jTaWS1MKso4xAztrocGBMxi8yVadWiqSWOg=", "h1:GzU0FzYAT/+IgAhnSBcFH3bT+4I5N6oSga6iZgNJAus=", - "h1:TrlG/sofnDv8kAbzKOD5pIPeUiI5VQY61NuWH+cItDw=", "zh:3bdba30ae67c55dc7e9a317ac0da3b208ea7926fe9c2f0ae6587ee88dcc58d1f", "zh:3f35138a831c00b188d2ffee27111dd0cf59afad2dd5653ed9e67d59646de12c", "zh:64066d18f6ae9a316c2bc840ef3e641d7ab94e1ea3a41d12523e77345ad442ef", @@ -96,11 +88,9 @@ provider "registry.terraform.io/hashicorp/kubernetes" { provider "registry.terraform.io/hashicorp/null" { version = "3.2.2" - constraints = ">= 3.0.0" + constraints = ">= 2.0.0" hashes = [ "h1:IMVAUHKoydFrlPrl9OzasDnw/8ntZFerCC9iXw1rXQY=", - "h1:vWAsYRd7MjYr3adj8BVKRohVfHpWQdvkIwUQ2Jf5FVM=", - "h1:zT1ZbegaAYHwQa+QwIFugArWikRJI9dqohj8xb0GY88=", "zh:3248aae6a2198f3ec8394218d05bd5e42be59f43a3a7c0b71c66ec0df08b69e7", "zh:32b1aaa1c3013d33c245493f4a65465eab9436b454d250102729321a44c8ab9a", "zh:38eff7e470acb48f66380a73a5c7cdd76cc9b9c9ba9a7249c7991488abe22fe3", @@ -118,11 +108,9 @@ provider "registry.terraform.io/hashicorp/null" { provider "registry.terraform.io/hashicorp/random" { version = "3.6.0" - constraints = ">= 2.0.0, >= 3.0.0" + constraints = ">= 2.0.0" hashes = [ "h1:I8MBeauYA8J8yheLJ8oSMWqB0kovn16dF/wKZ1QTdkk=", - "h1:R5Ucn26riKIEijcsiOMBR3uOAjuOMfI1x7XvH4P6B1w=", - "h1:p6WG1IPHnqx1fnJVKNjv733FBaArIugqy58HRZnpPCk=", "zh:03360ed3ecd31e8c5dac9c95fe0858be50f3e9a0d0c654b5e504109c2159287d", "zh:1c67ac51254ba2a2bb53a25e8ae7e4d076103483f55f39b426ec55e47d1fe211", "zh:24a17bba7f6d679538ff51b3a2f378cedadede97af8a1db7dad4fd8d6d50f829", @@ -140,10 +128,8 @@ provider "registry.terraform.io/hashicorp/random" { provider "registry.terraform.io/hashicorp/tls" { version = "4.0.5" - constraints = ">= 3.1.0, != 4.0.0" + constraints = ">= 3.1.0" hashes = [ - "h1:e4LBdJoZJNOQXPWgOAG0UuPBVhCStu98PieNlqJTmeU=", - "h1:yLqz+skP3+EbU3yyvw8JqzflQTKDQGsC9QyZAg+S4dg=", "h1:zeG5RmggBZW/8JWIVrdaeSJa0OG62uFX5HY1eE8SjzY=", "zh:01cfb11cb74654c003f6d4e32bbef8f5969ee2856394a96d127da4949c65153e", "zh:0472ea1574026aa1e8ca82bb6df2c40cd0478e9336b7a8a64e652119a2fa4f32", diff --git a/variables-addon.tf b/variables-addon.tf index 338090f..7a41ab5 100644 --- a/variables-addon.tf +++ b/variables-addon.tf @@ -35,7 +35,7 @@ variable "helm_create_namespace" { variable "namespace" { type = string default = null - description = "The Kubernetes Namespace in which the Helm chart will be installed. Defaults to `local.addon.name` (required)." + description = "The Kubernetes Namespace in which the Helm chart will be installed. Defaults to `local.addon.name`." } variable "settings" {