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

feat(sync): sync universal-addon changes #5

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat(sync): sync universal-addon changes #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 0 additions & 8 deletions .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.

2 changes: 1 addition & 1 deletion LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
9 changes: 7 additions & 2 deletions addon.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
}
2 changes: 1 addition & 1 deletion docs/.addon.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
24 changes: 5 additions & 19 deletions examples/basic/.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.

2 changes: 1 addition & 1 deletion variables-addon.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand Down