Merge pull request #47 from awsitcloudpro/terraform-aws-eks-accelerator-v3.0.0

.pre-commit-config.yaml

@@ -4,6 +4,7 @@ repos:
     hooks:
       - id: trailing-whitespace
       - id: check-yaml
+        exclude: '[\w\-\/]+/templates/'
       - id: end-of-file-fixer
       - id: check-merge-conflict
       - id: no-commit-to-branch

kubernetes-addons.tf

@@ -110,32 +110,21 @@ module "agones" {
   depends_on = [module.aws_eks]
 }
 
-# TODO Upgrade
 module "cert_manager" {
-  count  = var.create_eks && var.cert_manager_enable ? 1 : 0
+  count  = var.create_eks && (var.cert_manager_enable || var.enable_windows_support) ? 1 : 0
   source = "./kubernetes-addons/cert-manager"
 
-  private_container_repo_url      = var.private_container_repo_url
-  public_docker_repo              = var.public_docker_repo
-  cert_manager_helm_chart_version = var.cert_manager_helm_chart_version
-  cert_manager_image_tag          = var.cert_manager_image_tag
-  cert_manager_install_crds       = var.cert_manager_install_crds
-  cert_manager_helm_chart_name    = var.cert_manager_helm_chart_name
-  cert_manager_helm_chart_url     = var.cert_manager_helm_chart_url
-  cert_manager_image_repo_name    = var.cert_manager_image_repo_name
+  cert_manager_helm_chart = var.cert_manager_helm_chart
 
   depends_on = [module.aws_eks]
 }
 
-# TODO Upgrade
 module "windows_vpc_controllers" {
   count  = var.create_eks && var.enable_windows_support ? 1 : 0
   source = "./kubernetes-addons/windows-vpc-controllers"
 
-  private_container_repo_url    = var.private_container_repo_url
-  public_docker_repo            = var.public_docker_repo
-  resource_controller_image_tag = var.windows_vpc_resource_controller_image_tag
-  admission_webhook_image_tag   = var.windows_vpc_admission_webhook_image_tag
+  windows_vpc_controllers_helm_chart = var.windows_vpc_controllers_helm_chart
+
   depends_on = [
     module.cert_manager, module.aws_eks
   ]

kubernetes-addons/cert-manager/README.md

@@ -43,7 +43,7 @@ No requirements.
 
 | Name | Version |
 |------|---------|
-| <a name="provider_helm"></a> [helm](#provider\_helm) | n/a |
+| <a name="provider_helm"></a> [helm](#provider\_helm) | 2.3.0 |
 
 ## Modules
 
@@ -60,14 +60,7 @@ No modules.
 
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
-| <a name="input_cert_manager_helm_chart_name"></a> [cert\_manager\_helm\_chart\_name](#input\_cert\_manager\_helm\_chart\_name) | n/a | `string` | `"cert-manager"` | no |
-| <a name="input_cert_manager_helm_chart_url"></a> [cert\_manager\_helm\_chart\_url](#input\_cert\_manager\_helm\_chart\_url) | n/a | `string` | `"https://charts.jetstack.io"` | no |
-| <a name="input_cert_manager_helm_chart_version"></a> [cert\_manager\_helm\_chart\_version](#input\_cert\_manager\_helm\_chart\_version) | Helm chart version for cert-manager | `string` | `"v1.5.3"` | no |
-| <a name="input_cert_manager_image_repo_name"></a> [cert\_manager\_image\_repo\_name](#input\_cert\_manager\_image\_repo\_name) | n/a | `string` | `"quay.io/jetstack/cert-manager-controller"` | no |
-| <a name="input_cert_manager_image_tag"></a> [cert\_manager\_image\_tag](#input\_cert\_manager\_image\_tag) | Docker image tag for cert-manager controller | `string` | `"v1.5.3"` | no |
-| <a name="input_cert_manager_install_crds"></a> [cert\_manager\_install\_crds](#input\_cert\_manager\_install\_crds) | Whether Cert Manager CRDs should be installed as part of the cert-manager Helm chart installation | `bool` | `true` | no |
-| <a name="input_private_container_repo_url"></a> [private\_container\_repo\_url](#input\_private\_container\_repo\_url) | n/a | `string` | n/a | yes |
-| <a name="input_public_docker_repo"></a> [public\_docker\_repo](#input\_public\_docker\_repo) | n/a | `string` | n/a | yes |
+| <a name="input_cert_manager_helm_chart"></a> [cert\_manager\_helm\_chart](#input\_cert\_manager\_helm\_chart) | Cert Manager Helm chart configuration | `any` | `{}` | no |
 
 ## Outputs
 

kubernetes-addons/cert-manager/chart/cert-manager-ca/Chart.yaml → kubernetes-addons/cert-manager/cert-manager-ca/Chart.yaml

 apiVersion: v2
 name: cert-manager-ca
-description: A Helm chart for Cert Manager CA
+description: A Helm chart to install a Cert Manager CA
 type: application
-version: 0.1.0
-appVersion: v1.5.3
+version: 0.2.0
+appVersion: v0.1.0

kubernetes-addons/cert-manager/cert-manager-ca/templates/certificate.yaml

+{{- range .Values.clusterIssuers }}
+{{- if eq .type "CA" }}
+apiVersion: cert-manager.io/v1
+kind: Certificate
+metadata:
+  name: {{ .name }}
+  namespace: {{ $.Release.Namespace }}
+spec:
+  isCA: true
+  commonName: {{ .name }}
+  secretName: {{ .secretName }}
+  {{- with .privateKey }}
+  privateKey:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- with .issuer }}
+  issuerRef:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+{{- end }}
+{{- end }}

kubernetes-addons/cert-manager/cert-manager-ca/templates/clusterissuers.yaml

+{{- range .Values.clusterIssuers }}
+---
+apiVersion: cert-manager.io/v1
+kind: ClusterIssuer
+metadata:
+  name: {{ .name }}
+spec:
+  {{- if eq .type "selfSigned" }}
+  selfSigned: {}
+  {{- else if eq .type "CA" }}
+  ca:
+    secretName: {{ .secretName }}
+  {{- end }}
+{{- end }}

kubernetes-addons/cert-manager/cert-manager-ca/values.yaml

+clusterIssuers:
+  - name: cert-manager-selfsigned
+    type: selfSigned
+  - name: cert-manager-ca
+    type: CA
+    secretName: cert-manager-ca-root
+    privateKey:
+      algorithm: ECDSA
+      size: 256
+    issuer:
+      name: cert-manager-selfsigned
+      kind: ClusterIssuer
+      group: cert-manager.io

kubernetes-addons/cert-manager/cert-manager-values.tpl

-extraArgs:
-  - --enable-certificate-owner-ref=true
-
-image:
-  repository: ${image}
-  tag: ${tag}
-
-installCRDs: ${installCRDs}
-
-nodeSelector:
-  kubernetes.io/os: linux
-
-cainjector:
-  nodeSelector:
-    kubernetes.io/os: linux
-
-startupapicheck:
-  nodeSelector:
-    kubernetes.io/os: linux
-
-webhook:
-  nodeSelector:
-    kubernetes.io/os: linux

kubernetes-addons/cert-manager/chart/cert-manager-ca/templates/ca.yaml

-apiVersion: cert-manager.io/v1
-kind: ClusterIssuer
-metadata:
-  name: cert-manager-selfsigned-issuer
-spec:
-  selfSigned: {}
----
-apiVersion: cert-manager.io/v1
-kind: Certificate
-metadata:
-  name: cert-manager-ca
-  namespace: kube-system
-spec:
-  isCA: true
-  commonName: cert-manager-ca
-  secretName: cert-manager-ca-root-secret
-  privateKey:
-    algorithm: ECDSA
-    size: 256
-  issuerRef:
-    name: cert-manager-selfsigned-issuer
-    kind: ClusterIssuer
-    group: cert-manager.io
----
-apiVersion: cert-manager.io/v1
-kind: ClusterIssuer
-metadata:
-  name: cert-manager-ca-issuer
-spec:
-  ca:
-    secretName: cert-manager-ca-root-secret

kubernetes-addons/cert-manager/locals.tf

+
+locals {
+  default_cert_manager_helm_app = {
+    name             = "cert-manager"
+    chart            = "cert-manager"
+    repository       = "https://charts.jetstack.io"
+    version          = "v1.5.4"
+    namespace        = "kube-system"
+    timeout          = "600"
+    create_namespace = false
+    set = [{
+      name  = "extraArgs[0]"
+      value = "--enable-certificate-owner-ref=true"
+      }, {
+      name  = "installCRDs"
+      value = "true"
+      }, {
+      name  = "nodeSelector.kubernetes\\.io/os"
+      value = "linux"
+      }, {
+      name  = "cainjector.nodeSelector.kubernetes\\.io/os"
+      value = "linux"
+      }, {
+      name  = "startupapicheck.nodeSelector.kubernetes\\.io/os"
+      value = "linux"
+      }, {
+      name  = "webhook.nodeSelector.kubernetes\\.io/os"
+      value = "linux"
+    }]
+    set_sensitive              = null
+    lint                       = false
+    values                     = null
+    wait                       = true
+    wait_for_jobs              = false
+    description                = "Cert Manager Helm chart deployment configuration"
+    verify                     = false
+    keyring                    = ""
+    repository_key_file        = ""
+    repository_cert_file       = ""
+    repository_ca_file         = ""
+    repository_username        = ""
+    repository_password        = ""
+    disable_webhooks           = false
+    reuse_values               = false
+    reset_values               = false
+    force_update               = false
+    recreate_pods              = false
+    cleanup_on_fail            = false
+    max_history                = 0
+    atomic                     = false
+    skip_crds                  = false
+    render_subchart_notes      = true
+    disable_openapi_validation = false
+    dependency_update          = false
+    replace                    = false
+    postrender                 = ""
+    # Install a CA issuer with a helper chart
+    # See ./cert-manager-ca/templates/ca.yaml
+    install_default_ca = true
+  }
+  cert_manager_helm_app = merge(
+    local.default_cert_manager_helm_app,
+  var.cert_manager_helm_chart)
+}

kubernetes-addons/cert-manager/main.tf

@@ -16,30 +16,72 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-locals {
-  image_url = var.public_docker_repo ? var.cert_manager_image_repo_name : "${var.private_container_repo_url}/${var.cert_manager_image_repo_name}"
-}
-
 resource "helm_release" "cert_manager" {
-  name       = var.cert_manager_helm_chart_name
-  repository = var.cert_manager_helm_chart_url
-  chart      = var.cert_manager_helm_chart_name
-  version    = var.cert_manager_helm_chart_version
-  namespace  = "kube-system"
-  timeout    = "600"
-
-  values = [templatefile("${path.module}/cert-manager-values.tpl", {
-    image       = local.image_url
-    tag         = var.cert_manager_image_tag
-    installCRDs = var.cert_manager_install_crds
-  })]
+  name                       = local.cert_manager_helm_app["name"]
+  repository                 = local.cert_manager_helm_app["repository"]
+  chart                      = local.cert_manager_helm_app["chart"]
+  version                    = local.cert_manager_helm_app["version"]
+  namespace                  = local.cert_manager_helm_app["namespace"]
+  timeout                    = local.cert_manager_helm_app["timeout"]
+  values                     = local.cert_manager_helm_app["values"]
+  create_namespace           = local.cert_manager_helm_app["create_namespace"]
+  lint                       = local.cert_manager_helm_app["lint"]
+  description                = local.cert_manager_helm_app["description"]
+  repository_key_file        = local.cert_manager_helm_app["repository_key_file"]
+  repository_cert_file       = local.cert_manager_helm_app["repository_cert_file"]
+  repository_ca_file         = local.cert_manager_helm_app["repository_ca_file"]
+  repository_username        = local.cert_manager_helm_app["repository_username"]
+  repository_password        = local.cert_manager_helm_app["repository_password"]
+  verify                     = local.cert_manager_helm_app["verify"]
+  keyring                    = local.cert_manager_helm_app["keyring"]
+  disable_webhooks           = local.cert_manager_helm_app["disable_webhooks"]
+  reuse_values               = local.cert_manager_helm_app["reuse_values"]
+  reset_values               = local.cert_manager_helm_app["reset_values"]
+  force_update               = local.cert_manager_helm_app["force_update"]
+  recreate_pods              = local.cert_manager_helm_app["recreate_pods"]
+  cleanup_on_fail            = local.cert_manager_helm_app["cleanup_on_fail"]
+  max_history                = local.cert_manager_helm_app["max_history"]
+  atomic                     = local.cert_manager_helm_app["atomic"]
+  skip_crds                  = local.cert_manager_helm_app["skip_crds"]
+  render_subchart_notes      = local.cert_manager_helm_app["render_subchart_notes"]
+  disable_openapi_validation = local.cert_manager_helm_app["disable_openapi_validation"]
+  wait                       = local.cert_manager_helm_app["wait"]
+  wait_for_jobs              = local.cert_manager_helm_app["wait_for_jobs"]
+  dependency_update          = local.cert_manager_helm_app["dependency_update"]
+  replace                    = local.cert_manager_helm_app["replace"]
+
+  postrender {
+    binary_path = local.cert_manager_helm_app["postrender"]
+  }
+
+  dynamic "set" {
+    iterator = each_item
+    for_each = local.cert_manager_helm_app["set"] == null ? [] : local.cert_manager_helm_app["set"]
 
+    content {
+      name  = each_item.value.name
+      value = each_item.value.value
+    }
+  }
+
+  dynamic "set_sensitive" {
+    iterator = each_item
+    for_each = local.cert_manager_helm_app["set_sensitive"] == null ? [] : local.cert_manager_helm_app["set_sensitive"]
+
+    content {
+      name  = each_item.value.name
+      value = each_item.value.value
+    }
+  }
 }
 
 resource "helm_release" "cert_manager_ca" {
-  chart     = "${path.module}/chart/cert-manager-ca"
+  count     = local.cert_manager_helm_app["install_default_ca"] ? 1 : 0
   name      = "cert-manager-ca"
+  chart     = "${path.module}/cert-manager-ca"
+  version   = "0.2.0"
   namespace = "kube-system"
+
   depends_on = [
     helm_release.cert_manager
   ]

kubernetes-addons/cert-manager/variables.tf

@@ -16,40 +16,8 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-variable "public_docker_repo" {
-  type = string
-}
-variable "private_container_repo_url" {
-  type = string
-}
-
-variable "cert_manager_helm_chart_name" {
-  type    = string
-  default = "cert-manager"
-}
-
-variable "cert_manager_helm_chart_url" {
-  type    = string
-  default = "https://charts.jetstack.io"
-}
-
-variable "cert_manager_image_repo_name" {
-  type    = string
-  default = "quay.io/jetstack/cert-manager-controller"
-}
-
-variable "cert_manager_image_tag" {
-  type        = string
-  default     = "v1.5.3"
-  description = "Docker image tag for cert-manager controller"
-}
-variable "cert_manager_helm_chart_version" {
-  type        = string
-  default     = "v1.5.3"
-  description = "Helm chart version for cert-manager"
-}
-variable "cert_manager_install_crds" {
-  type        = bool
-  description = "Whether Cert Manager CRDs should be installed as part of the cert-manager Helm chart installation"
-  default     = true
+variable "cert_manager_helm_chart" {
+  type        = any
+  description = "Cert Manager Helm chart configuration"
+  default     = {}
 }

kubernetes-addons/windows-vpc-controllers/README.md

@@ -27,7 +27,7 @@ No requirements.
 
 | Name | Version |
 |------|---------|
-| <a name="provider_helm"></a> [helm](#provider\_helm) | n/a |
+| <a name="provider_helm"></a> [helm](#provider\_helm) | 2.3.0 |
 
 ## Modules
 
@@ -43,13 +43,7 @@ No modules.
 
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
-| <a name="input_admission_webhook_image_repo_name"></a> [admission\_webhook\_image\_repo\_name](#input\_admission\_webhook\_image\_repo\_name) | n/a | `string` | `"eks/vpc-admission-webhook"` | no |
-| <a name="input_admission_webhook_image_tag"></a> [admission\_webhook\_image\_tag](#input\_admission\_webhook\_image\_tag) | Docker image tag for Windows VPC admission webhook controller | `string` | `"v0.2.7"` | no |
-| <a name="input_private_container_repo_url"></a> [private\_container\_repo\_url](#input\_private\_container\_repo\_url) | n/a | `string` | n/a | yes |
-| <a name="input_public_docker_repo"></a> [public\_docker\_repo](#input\_public\_docker\_repo) | n/a | `bool` | n/a | yes |
-| <a name="input_public_image_repo"></a> [public\_image\_repo](#input\_public\_image\_repo) | n/a | `string` | `"602401143452.dkr.ecr.us-west-2.amazonaws.com"` | no |
-| <a name="input_resource_controller_image_repo_name"></a> [resource\_controller\_image\_repo\_name](#input\_resource\_controller\_image\_repo\_name) | n/a | `string` | `"eks/windows-vpc-resource-controller"` | no |
-| <a name="input_resource_controller_image_tag"></a> [resource\_controller\_image\_tag](#input\_resource\_controller\_image\_tag) | Docker image tag for Windows VPC resource controller | `string` | `"v0.2.7"` | no |
+| <a name="input_windows_vpc_controllers_helm_chart"></a> [windows\_vpc\_controllers\_helm\_chart](#input\_windows\_vpc\_controllers\_helm\_chart) | Windows VPC Controllers Helm chart configuration | `any` | `{}` | no |
 
 ## Outputs
 

kubernetes-addons/windows-vpc-controllers/chart/Chart.yaml

@@ -2,5 +2,5 @@ apiVersion: v2
 name: windows-vpc-resources
 description: A Helm chart for K8s VPC resources needed for Windows workloads
 type: application
-version: 0.1.0
-appVersion: 0.2.6
+version: 0.2.0
+appVersion: 0.2.7

kubernetes-addons/windows-vpc-controllers/chart/windows-vpc-controllers-values.tpl → kubernetes-addons/windows-vpc-controllers/chart/values.yaml

@@ -2,25 +2,23 @@ resourceController:
   # name of most K8s resources - container, service account etc.
   name: windows-vpc-resource-controller
   image:
-    repository: ${resource_controller_image_repo}
-    tag: ${resource_controller_image_tag}
-    pullPolicy: Always
+    repository: 602401143452.dkr.ecr.us-east-1.amazonaws.com/eks/windows-vpc-resource-controller
+    tag: v0.2.7
   livenessProbe:
     failureThreshold: 5
     initialDelaySeconds: 30
     periodSeconds: 30
     timeoutSeconds: 5
-  containerCommand:
-    args:
-      - -stderrthreshold=info
+  # containerCommand:
+  #   args:
+  #     - -stderrthreshold=info
 
 admissionWebhook:
   # name of most K8s resources - container, service, mutating webhook etc.
   name: windows-vpc-admission-webhook
   image:
-    repository: ${admission_webhook_image_repo}
-    tag: ${admission_webhook_image_tag}
-    pullPolicy: Always
+    repository: 602401143452.dkr.ecr.us-east-1.amazonaws.com/eks/vpc-admission-webhook
+    tag: v0.2.7
   containerCommand:
     args:
       - -tlsCertFile=/etc/webhook/tls/tls.crt
@@ -40,7 +38,6 @@ admissionWebhook:
     key:
       algorithm: ECDSA
       size: 256
-      rotationPolicy: Always
     usages:
       - server auth
       - key encipherment

kubernetes-addons/windows-vpc-controllers/locals.tf

+
+locals {
+  default_windows_vpc_controllers_helm_app = {
+    name             = "windows-vpc-controllers"
+    chart            = "windows-vpc-controllers"
+    repository       = "https://charts.jetstack.io"
+    version          = "v1.5.4"
+    namespace        = "kube-system"
+    timeout          = "600"
+    create_namespace = false
+    set = [{
+      name  = "resourceController.containerCommand.args[0]"
+      value = "-stderrthreshold=info"
+      }, {
+      name  = "admissionWebhook.certificate.key.rotationPolicy"
+      value = "Always"
+      }, {
+      name  = "admissionWebhook.certificate.issuer.name"
+      value = "cert-manager-ca"
+    }]
+    set_sensitive              = null
+    lint                       = false
+    values                     = null
+    wait                       = true
+    wait_for_jobs              = false
+    description                = "Cert Manager Helm chart deployment configuration"
+    verify                     = false
+    keyring                    = ""
+    repository_key_file        = ""
+    repository_cert_file       = ""
+    repository_ca_file         = ""
+    repository_username        = ""
+    repository_password        = ""
+    disable_webhooks           = false
+    reuse_values               = false
+    reset_values               = false
+    force_update               = false
+    recreate_pods              = false
+    cleanup_on_fail            = false
+    max_history                = 0
+    atomic                     = false
+    skip_crds                  = false
+    render_subchart_notes      = true
+    disable_openapi_validation = false
+    dependency_update          = false
+    replace                    = false
+    postrender                 = ""
+  }
+  windows_vpc_controllers_helm_app = merge(
+    local.default_windows_vpc_controllers_helm_app,
+  var.windows_vpc_controllers_helm_chart)
+}

kubernetes-addons/windows-vpc-controllers/main.tf

@@ -16,22 +16,61 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-locals {
-  public_image_repo              = var.public_image_repo
-  resource_controller_image_repo = var.public_docker_repo ? "${local.public_image_repo}/${var.resource_controller_image_repo_name}" : "${var.private_container_repo_url}/${var.resource_controller_image_repo_name}"
-  admission_webhook_image_repo   = var.public_docker_repo ? "${local.public_image_repo}/${var.admission_webhook_image_repo_name}" : "${var.private_container_repo_url}/${var.admission_webhook_image_repo_name}"
-}
-
 resource "helm_release" "windows_vpc_controllers" {
-  chart     = "${path.module}/chart"
-  name      = "windows-vpc-controllers"
-  namespace = "kube-system"
-  timeout   = "600"
+  name                       = local.windows_vpc_controllers_helm_app["name"]
+  repository                 = local.windows_vpc_controllers_helm_app["repository"]
+  chart                      = "${path.module}/chart"
+  version                    = local.windows_vpc_controllers_helm_app["version"]
+  namespace                  = local.windows_vpc_controllers_helm_app["namespace"]
+  timeout                    = local.windows_vpc_controllers_helm_app["timeout"]
+  values                     = local.windows_vpc_controllers_helm_app["values"]
+  create_namespace           = local.windows_vpc_controllers_helm_app["create_namespace"]
+  lint                       = local.windows_vpc_controllers_helm_app["lint"]
+  description                = local.windows_vpc_controllers_helm_app["description"]
+  repository_key_file        = local.windows_vpc_controllers_helm_app["repository_key_file"]
+  repository_cert_file       = local.windows_vpc_controllers_helm_app["repository_cert_file"]
+  repository_ca_file         = local.windows_vpc_controllers_helm_app["repository_ca_file"]
+  repository_username        = local.windows_vpc_controllers_helm_app["repository_username"]
+  repository_password        = local.windows_vpc_controllers_helm_app["repository_password"]
+  verify                     = local.windows_vpc_controllers_helm_app["verify"]
+  keyring                    = local.windows_vpc_controllers_helm_app["keyring"]
+  disable_webhooks           = local.windows_vpc_controllers_helm_app["disable_webhooks"]
+  reuse_values               = local.windows_vpc_controllers_helm_app["reuse_values"]
+  reset_values               = local.windows_vpc_controllers_helm_app["reset_values"]
+  force_update               = local.windows_vpc_controllers_helm_app["force_update"]
+  recreate_pods              = local.windows_vpc_controllers_helm_app["recreate_pods"]
+  cleanup_on_fail            = local.windows_vpc_controllers_helm_app["cleanup_on_fail"]
+  max_history                = local.windows_vpc_controllers_helm_app["max_history"]
+  atomic                     = local.windows_vpc_controllers_helm_app["atomic"]
+  skip_crds                  = local.windows_vpc_controllers_helm_app["skip_crds"]
+  render_subchart_notes      = local.windows_vpc_controllers_helm_app["render_subchart_notes"]
+  disable_openapi_validation = local.windows_vpc_controllers_helm_app["disable_openapi_validation"]
+  wait                       = local.windows_vpc_controllers_helm_app["wait"]
+  wait_for_jobs              = local.windows_vpc_controllers_helm_app["wait_for_jobs"]
+  dependency_update          = local.windows_vpc_controllers_helm_app["dependency_update"]
+  replace                    = local.windows_vpc_controllers_helm_app["replace"]
+
+  postrender {
+    binary_path = local.windows_vpc_controllers_helm_app["postrender"]
+  }
+
+  dynamic "set" {
+    iterator = each_item
+    for_each = local.windows_vpc_controllers_helm_app["set"] == null ? [] : local.windows_vpc_controllers_helm_app["set"]
+
+    content {
+      name  = each_item.value.name
+      value = each_item.value.value
+    }
+  }
+
+  dynamic "set_sensitive" {
+    iterator = each_item
+    for_each = local.windows_vpc_controllers_helm_app["set_sensitive"] == null ? [] : local.windows_vpc_controllers_helm_app["set_sensitive"]
 
-  values = [templatefile("${path.module}/chart/windows-vpc-controllers-values.tpl", {
-    resource_controller_image_repo = local.resource_controller_image_repo
-    admission_webhook_image_repo   = local.admission_webhook_image_repo
-    resource_controller_image_tag  = var.resource_controller_image_tag
-    admission_webhook_image_tag    = var.admission_webhook_image_tag
-  })]
+    content {
+      name  = each_item.value.name
+      value = each_item.value.value
+    }
+  }
 }

kubernetes-addons/windows-vpc-controllers/variables.tf

@@ -16,32 +16,8 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-variable "public_docker_repo" {
-  type = bool
-}
-variable "private_container_repo_url" {
-  type = string
-}
-
-variable "public_image_repo" {
-  type    = string
-  default = "602401143452.dkr.ecr.us-west-2.amazonaws.com"
-}
-variable "resource_controller_image_repo_name" {
-  type    = string
-  default = "eks/windows-vpc-resource-controller"
-}
-variable "resource_controller_image_tag" {
-  type        = string
-  default     = "v0.2.7"
-  description = "Docker image tag for Windows VPC resource controller"
-}
-variable "admission_webhook_image_repo_name" {
-  type    = string
-  default = "eks/vpc-admission-webhook"
-}
-variable "admission_webhook_image_tag" {
-  type        = string
-  default     = "v0.2.7"
-  description = "Docker image tag for Windows VPC admission webhook controller"
+variable "windows_vpc_controllers_helm_chart" {
+  type        = any
+  description = "Windows VPC Controllers Helm chart configuration"
+  default     = {}
 }

variables.tf

@@ -168,9 +168,12 @@ variable "fargate_profiles" {
   type        = any
   default     = {}
 }
+#----------------------------------------------------------
+# EKS WINDOWS SUPPORT
+#----------------------------------------------------------
 variable "enable_windows_support" {
-  description = "Enable Windows support for Windows"
-  type        = string
+  description = "Enable Windows support"
+  type        = bool
   default     = false
 }
 #----------------------------------------------------------
@@ -380,48 +383,24 @@ variable "fargate_fluentbit_config" {
   description = "Fargate fluentbit configuration "
   default     = {}
 }
+
 #-----------CERT MANAGER-------------
 variable "cert_manager_enable" {
   type        = bool
   default     = false
   description = "Enabling Cert Manager Helm Chart installation. It is automatically enabled if Windows support is enabled."
 }
-variable "cert_manager_image_tag" {
-  type        = string
-  default     = "v1.5.3"
-  description = "Docker image tag for cert-manager controller"
-}
-variable "cert_manager_helm_chart_version" {
-  type        = string
-  default     = "v1.5.3"
-  description = "Helm chart version for cert-manager"
-}
-variable "cert_manager_install_crds" {
-  type        = bool
-  description = "Whether Cert Manager CRDs should be installed as part of the cert-manager Helm chart installation"
-  default     = true
-}
-variable "cert_manager_helm_chart_url" {
-  type    = string
-  default = "https://charts.jetstack.io"
-}
-variable "cert_manager_helm_chart_name" {
-  type    = string
-  default = "cert-manager"
-}
-variable "cert_manager_image_repo_name" {
-  type    = string
-  default = "quay.io/jetstack/cert-manager-controller"
-}
-variable "windows_vpc_resource_controller_image_tag" {
-  type        = string
-  default     = "v0.2.7"
-  description = "Docker image tag for Windows VPC resource controller"
+variable "cert_manager_helm_chart" {
+  type        = any
+  description = "Cert Manager Helm chart configuration"
+  default     = {}
 }
-variable "windows_vpc_admission_webhook_image_tag" {
-  type        = string
-  default     = "v0.2.7"
-  description = "Docker image tag for Windows VPC admission webhook controller"
+
+#-----------WINDOWS VPC CONTROLLERS-------------
+variable "windows_vpc_controllers_helm_chart" {
+  type        = any
+  description = "Windows VPC Controllers Helm chart configuration"
+  default     = {}
 }
 
 #-----------AWS OPEN TELEMETRY ADDON-------------