initial commit

.github/workflows/template-sync.yaml

@@ -22,4 +22,6 @@ jobs:
           source_repo_path: lablabs/terraform-aws-eks-universal-addon
           upstream_branch: main
           pr_labels: kind/sync
-          is_pr_cleanup: true
+          pr_branch_name_prefix: "feat/universal-addon-sync"
+          pr_title: "feat(sync): sync universal-addon changes"
+          pr_commit_msg: "feat(sync): sync universal-addon changes"

.terraform-docs.yml

@@ -1,8 +1,19 @@
 formatter: markdown table
 
-header-from: docs/.header.md
+header-from: main.tf
 footer-from: docs/.footer.md
 
+content: |-
+  {{ .Header }}
+  {{ include "docs/.content.md" }}
+  {{ .Requirements }}
+  {{ .Providers }}
+  {{ .Modules }}
+  {{ .Resources }}
+  {{ .Inputs }}
+  {{ .Outputs }}
+  {{ .Footer }}
+
 output:
   file: README.md
   mode: replace

argo-helm.tf

@@ -1,10 +1,10 @@
 locals {
-  helm_argo_application_enabled      = var.enabled && var.argo_enabled && var.argo_helm_enabled
-  helm_argo_application_wait_enabled = local.helm_argo_application_enabled && length(keys(var.argo_kubernetes_manifest_wait_fields)) > 0
-  helm_argo_application_values = [
+  helm_argo_application_enabled      = var.enabled == true && var.argo_enabled == true && var.argo_helm_enabled == true
+  helm_argo_application_wait_enabled = local.helm_argo_application_enabled && try(length(keys(var.argo_kubernetes_manifest_wait_fields)) > 0, false)
+  helm_argo_application_values = compact([
     one(data.utils_deep_merge_yaml.argo_helm_values[*].output),
     var.argo_helm_values
-  ]
+  ])
 }
 
 data "utils_deep_merge_yaml" "argo_helm_values" {

argo.tf

@@ -30,7 +30,7 @@ locals {
 }
 
 resource "kubernetes_manifest" "this" {
-  count = var.enabled && var.argo_enabled && !var.argo_helm_enabled ? 1 : 0
+  count = var.enabled == true && var.argo_enabled == true && var.argo_helm_enabled == false ? 1 : 0
 
   manifest = {
     apiVersion = var.argo_apiversion

docs/.header.md → docs/.content.md

@@ -1,21 +1,13 @@
-# AWS EKS Universal Addon Terraform module
-
-[<img src="https://lablabs.io/static/ll-logo.png" width=350px>](https://lablabs.io/)
-
-We help companies build, run, deploy and scale software and infrastructure by embracing the right technologies and principles. Check out our website at <https://lablabs.io/>
 
 ---
 
-[![Terraform validate](https://github.com/lablabs/terraform-aws-eks-universal-addon/actions/workflows/validate.yaml/badge.svg)](https://github.com/lablabs/terraform-aws-eks-universal-addon/actions/workflows/validate.yaml)
-[![pre-commit](https://github.com/lablabs/terraform-aws-eks-universal-addon/actions/workflows/pre-commit.yml/badge.svg)](https://github.com/lablabs/terraform-aws-eks-universal-addon/actions/workflows/pre-commit.yml)
-
-## Description
+## Related Projects
 
-A Terraform module to deploy the universal addon on Amazon EKS cluster.
+Check out other [Terraform Kubernetes addons](https://github.com/orgs/lablabs/repositories?q=terraform-aws-eks&type=public&language=&sort=).
 
-## Related Projects
+[<img src="https://lablabs.io/static/ll-logo.png" width=350px>](https://lablabs.io/)
 
-Check out other [terraform kubernetes addons](https://github.com/orgs/lablabs/repositories?q=terraform-aws-eks&type=public&language=&sort=).
+We help companies build, run, deploy and scale software and infrastructure by embracing the right technologies and principles. Check out our website at <https://lablabs.io/>.
 
 ## Deployment methods
 
@@ -36,10 +28,13 @@ Deploy Helm chart as ArgoCD Application via Helm resource (set `enabled = true`,
 
 ## AWS IAM resources
 
-### IRSA policy
+### IRSA role
+To disable creation of IRSA role, set `irsa_role_create = false`.
+
+### IRSA role policy
 To disable creation of IRSA role and IRSA policy, set `irsa_role_create = false` and `irsa_policy_enabled = false`, respectively.
 
-### Role assuming
+### IRSA role another role assuming
 To assume role set `irsa_assume_role_enabled = true` and specify `irsa_assume_role_arn` variable.
 
 ## Examples

examples/basic/addon.tf

@@ -0,0 +1,89 @@
+# IMPORTANT: This file is synced with the "terraform-aws-eks-universal-addon" module. Any changes to this file might be overwritten upon the next release of that module.
+module "addon" {
+  source = "git::https://github.com/lablabs/terraform-aws-eks-universal-addon.git?ref=main"
+
+  # variable priority var (provided by the module user) > local (universal addon default override) > default (universal addon default)
+  enabled   = local.addon.enabled
+  namespace = var.namespace != null ? var.namespace : try(local.addon.namespace, local.addon.name)
+
+  helm_release_name               = var.helm_release_name != null ? var.helm_release_name : try(local.addon.helm_release_name, local.addon.name)
+  helm_chart_name                 = var.helm_chart_name != null ? var.helm_chart_name : try(local.addon.helm_chart_name, local.addon.name)
+  helm_chart_version              = var.helm_chart_version != null ? var.helm_chart_version : local.addon.helm_chart_version
+  helm_atomic                     = var.helm_atomic != null ? var.helm_atomic : try(local.addon.helm_atomic, false)
+  helm_cleanup_on_fail            = var.helm_cleanup_on_fail != null ? var.helm_cleanup_on_fail : try(local.addon.helm_cleanup_on_fail, false)
+  helm_create_namespace           = var.helm_create_namespace != null ? var.helm_create_namespace : try(local.addon.helm_create_namespace, true)
+  helm_dependency_update          = var.helm_dependency_update != null ? var.helm_dependency_update : try(local.addon.helm_dependency_update, false)
+  helm_description                = var.helm_description != null ? var.helm_description : try(local.addon.helm_description, "")
+  helm_devel                      = var.helm_devel != null ? var.helm_devel : try(local.addon.helm_devel, false)
+  helm_disable_openapi_validation = var.helm_disable_openapi_validation != null ? var.helm_disable_openapi_validation : try(local.addon.helm_disable_openapi_validation, false)
+  helm_disable_webhooks           = var.helm_disable_webhooks != null ? var.helm_disable_webhooks : try(local.addon.helm_disable_webhooks, false)
+  helm_force_update               = var.helm_force_update != null ? var.helm_force_update : try(local.addon.helm_force_update, false)
+  helm_keyring                    = var.helm_keyring != null ? var.helm_keyring : try(local.addon.helm_keyring, "~/.gnupg/pubring.gpg")
+  helm_lint                       = var.helm_lint != null ? var.helm_lint : try(local.addon.helm_lint, false)
+  helm_package_verify             = var.helm_package_verify != null ? var.helm_package_verify : try(local.addon.helm_package_verify, false)
+  helm_postrender                 = var.helm_postrender != null ? var.helm_postrender : try(local.addon.helm_postrender, {})
+  helm_recreate_pods              = var.helm_recreate_pods != null ? var.helm_recreate_pods : try(local.addon.helm_recreate_pods, false)
+  helm_release_max_history        = var.helm_release_max_history != null ? var.helm_release_max_history : try(local.addon.helm_release_max_history, 0)
+  helm_render_subchart_notes      = var.helm_render_subchart_notes != null ? var.helm_render_subchart_notes : try(local.addon.helm_render_subchart_notes, true)
+  helm_replace                    = var.helm_replace != null ? var.helm_replace : try(local.addon.helm_replace, false)
+  helm_repo_ca_file               = var.helm_repo_ca_file != null ? var.helm_repo_ca_file : try(local.addon.helm_repo_ca_file, "")
+  helm_repo_cert_file             = var.helm_repo_cert_file != null ? var.helm_repo_cert_file : try(local.addon.helm_repo_cert_file, "")
+  helm_repo_key_file              = var.helm_repo_key_file != null ? var.helm_repo_key_file : try(local.addon.helm_repo_key_file, "")
+  helm_repo_password              = var.helm_repo_password != null ? var.helm_repo_password : try(local.addon.helm_repo_password, "")
+  helm_repo_url                   = var.helm_repo_url != null ? var.helm_repo_url : local.addon.helm_repo_url
+  helm_repo_username              = var.helm_repo_username != null ? var.helm_repo_username : try(local.addon.helm_repo_username, "")
+  helm_reset_values               = var.helm_reset_values != null ? var.helm_reset_values : try(local.addon.helm_reset_values, false)
+  helm_reuse_values               = var.helm_reuse_values != null ? var.helm_reuse_values : try(local.addon.helm_reuse_values, false)
+  helm_set_sensitive              = var.helm_set_sensitive != null ? var.helm_set_sensitive : try(local.addon.helm_set_sensitive, {})
+  helm_skip_crds                  = var.helm_skip_crds != null ? var.helm_skip_crds : try(local.addon.helm_skip_crds, false)
+  helm_timeout                    = var.helm_timeout != null ? var.helm_timeout : try(local.addon.helm_timeout, 300)
+  helm_wait                       = var.helm_wait != null ? var.helm_wait : try(local.addon.helm_wait, false)
+  helm_wait_for_jobs              = var.helm_wait_for_jobs != null ? var.helm_wait_for_jobs : try(local.addon.helm_wait_for_jobs, false)
+
+  argo_apiversion                                        = var.argo_apiversion != null ? var.argo_apiversion : try(local.addon.argo_apiversion, "argoproj.io/v1alpha1")
+  argo_destination_server                                = var.argo_destination_server != null ? var.argo_destination_server : try(local.addon.argo_destination_server, "https://kubernetes.default.svc")
+  argo_enabled                                           = var.argo_enabled != null ? var.argo_enabled : try(local.addon.argo_enabled, false)
+  argo_helm_enabled                                      = var.argo_helm_enabled != null ? var.argo_helm_enabled : try(local.addon.argo_helm_enabled, false)
+  argo_helm_values                                       = var.argo_helm_values != null ? var.argo_helm_values : try(local.addon.argo_helm_values, "")
+  argo_helm_wait_backoff_limit                           = var.argo_helm_wait_backoff_limit != null ? var.argo_helm_wait_backoff_limit : try(local.addon.argo_helm_wait_backoff_limit, 6)
+  argo_helm_wait_node_selector                           = var.argo_helm_wait_node_selector != null ? var.argo_helm_wait_node_selector : try(local.addon.argo_helm_wait_node_selector, var.argo_helm_wait_node_selector)
+  argo_helm_wait_timeout                                 = var.argo_helm_wait_timeout != null ? var.argo_helm_wait_timeout : try(local.addon.argo_helm_wait_timeout, "10m")
+  argo_helm_wait_tolerations                             = var.argo_helm_wait_tolerations != null ? var.argo_helm_wait_tolerations : try(local.addon.argo_helm_wait_tolerations, [])
+  argo_info                                              = var.argo_info != null ? var.argo_info : try(local.addon.argo_info, [{ name = "terraform", value = "true" }])
+  argo_kubernetes_manifest_computed_fields               = var.argo_kubernetes_manifest_computed_fields != null ? var.argo_kubernetes_manifest_computed_fields : try(local.addon.argo_kubernetes_manifest_computed_fields, ["metadata.labels", "metadata.annotations", "metadata.finalizers"])
+  argo_kubernetes_manifest_field_manager_force_conflicts = var.argo_kubernetes_manifest_field_manager_force_conflicts != null ? var.argo_kubernetes_manifest_field_manager_force_conflicts : try(local.addon.argo_kubernetes_manifest_field_manager_force_conflicts, false)
+  argo_kubernetes_manifest_field_manager_name            = var.argo_kubernetes_manifest_field_manager_name != null ? var.argo_kubernetes_manifest_field_manager_name : try(local.addon.argo_kubernetes_manifest_field_manager_name, "Terraform")
+  argo_kubernetes_manifest_wait_fields                   = var.argo_kubernetes_manifest_wait_fields != null ? var.argo_kubernetes_manifest_wait_fields : try(local.addon.argo_kubernetes_manifest_wait_fields, {})
+  argo_metadata                                          = var.argo_metadata != null ? var.argo_metadata : try(local.addon.argo_metadata, { finalizers = ["resources-finalizer.argocd.argoproj.io"] })
+  argo_namespace                                         = var.argo_namespace != null ? var.argo_namespace : try(local.addon.argo_namespace, "argocd")
+  argo_project                                           = var.argo_project != null ? var.argo_project : try(local.addon.argo_project, "default")
+  argo_spec                                              = var.argo_spec != null ? var.argo_spec : try(local.addon.argo_spec, {})
+  argo_sync_policy                                       = var.argo_sync_policy != null ? var.argo_sync_policy : try(local.addon.argo_sync_policy, {})
+
+  cluster_identity_oidc_issuer     = var.cluster_identity_oidc_issuer != null ? var.cluster_identity_oidc_issuer : try(local.addon.cluster_identity_oidc_issuer, "")
+  cluster_identity_oidc_issuer_arn = var.cluster_identity_oidc_issuer_arn != null ? var.cluster_identity_oidc_issuer_arn : try(local.addon.cluster_identity_oidc_issuer_arn, "")
+  irsa_role_create                 = var.irsa_role_create != null ? var.irsa_role_create : try(local.addon.irsa_role_create, true)
+  irsa_additional_policies         = var.irsa_additional_policies != null ? var.irsa_additional_policies : try(local.addon.irsa_additional_policies, {})
+  irsa_assume_role_arn             = var.irsa_assume_role_arn != null ? var.irsa_assume_role_arn : try(local.addon.irsa_assume_role_arn, "")
+  irsa_assume_role_enabled         = var.irsa_assume_role_enabled != null ? var.irsa_assume_role_enabled : try(local.addon.irsa_assume_role_enabled, false)
+  irsa_policy                      = var.irsa_policy != null ? var.irsa_policy : try(local.addon.irsa_policy, "")
+  irsa_policy_enabled              = var.irsa_policy_enabled != null ? var.irsa_policy_enabled : try(local.addon.irsa_policy_enabled, false)
+  irsa_role_name_prefix            = var.irsa_role_name_prefix != null ? var.irsa_role_name_prefix : try(local.addon.irsa_role_name_prefix, "${local.addon.name}-irsa")
+  irsa_tags                        = var.irsa_tags != null ? var.irsa_tags : try(local.addon.irsa_tags, {})
+
+  rbac_create            = var.rbac_create != null ? var.rbac_create : try(local.addon.rbac_create, true)
+  service_account_create = var.service_account_create != null ? var.service_account_create : try(local.addon.service_account_create, true)
+  service_account_name   = var.service_account_name != null ? var.service_account_name : try(local.addon.service_account_name, local.addon.name)
+
+  settings = var.settings != null ? var.settings : try(local.addon.settings, {})
+  values   = one(data.utils_deep_merge_yaml.values[*].output)
+}
+
+data "utils_deep_merge_yaml" "values" {
+  count = var.enabled == true ? 1 : 0
+
+  input = compact([
+    try(local.addon.values, ""),
+    var.values
+  ])
+}