Replace Bitnami Usage

README.yaml

@@ -3,8 +3,8 @@ name: "aws-eks-external-dns"
 github_repo: "cloudposse-terraform-components/aws-eks-external-dns"
 # Short description of this project
 description: |-
-  This component creates a Helm deployment for [external-dns](https://github.com/bitnami/bitnami-docker-external-dns) on a
-  Kubernetes cluster. [external-dns](https://github.com/bitnami/bitnami-docker-external-dns) is a Kubernetes addon that
+  This component creates a Helm deployment for [external-dns](https://github.com/kubernetes-sigs/external-dns) on a
+  Kubernetes cluster. [external-dns](https://github.com/kubernetes-sigs/external-dns) is a Kubernetes addon that
   configures public DNS servers with information about exposed Kubernetes services to make them discoverable.
 
 usage: |-
@@ -28,8 +28,8 @@ usage: |-
           enabled: true
           name: external-dns
           chart: external-dns
-          chart_repository: https://charts.bitnami.com/bitnami
-          chart_version: "6.33.0"
+          chart_repository: https://kubernetes-sigs.github.io/external-dns/
+          chart_version: "1.18.0"
           create_namespace: true
           kubernetes_namespace: external-dns
           resources:
@@ -43,13 +43,15 @@ usage: |-
           # For example, when using blue-green deployment pattern to update EKS cluster.
           txt_prefix: ""
           # You can use `chart_values` to set any other chart options. Treat `chart_values` as the root of the doc.
-          # See documentation for latest chart version and list of chart_values: https://artifacthub.io/packages/helm/bitnami/external-dns
+          # See documentation for latest chart version and list of chart_values: https://artifacthub.io/packages/helm/external-dns/external-dns
           #
           # # For example
           # ---
           # chart_values:
-          #   aws:
-          #     batchChangeSize: 1000
+          #   provider:
+          #     name: aws
+          #   extraArgs:
+          #     - --aws-batch-change-size=1000
           chart_values: {}
           # Extra hosted zones to lookup and support by component name
           dns_components:
@@ -65,11 +67,11 @@ usage: |-
 
 references:
   - name: external-dns (Artifact Hub)
-    url: https://artifacthub.io/packages/helm/bitnami/external-dns
-    description: Helm chart for ExternalDNS by Bitnami
-  - name: ExternalDNS (Bitnami Docker)
-    url: https://github.com/bitnami/bitnami-docker-external-dns
-    description: ExternalDNS addon container image and docs by Bitnami
+    url: https://artifacthub.io/packages/helm/external-dns/external-dns
+    description: Helm chart for ExternalDNS by Kubernetes SIGs
+  - name: ExternalDNS (GitHub)
+    url: https://github.com/kubernetes-sigs/external-dns
+    description: ExternalDNS addon source code and documentation
 tags:
   - component/eks/external-dns
   - layer/eks

src/main.tf

@@ -57,7 +57,7 @@ module "external_dns" {
       ]
 
       effect    = "Allow"
-      resources = formatlist("arn:${join("", data.aws_partition.current.*.partition)}:route53:::hostedzone/%s", local.zone_ids)
+      resources = formatlist("arn:${data.aws_partition.current[0].partition}:route53:::hostedzone/%s", local.zone_ids)
     },
     {
       sid = "GrantListHostedZonesListResourceRecordSets"
@@ -96,15 +96,14 @@ module "external_dns" {
     }) : "",
     # external-dns-specific values
     yamlencode({
-      aws = {
-        region = var.region
+      provider = {
+        name = "aws"
       }
-      policy                  = var.policy
-      publishInternalServices = var.publish_internal_services
-      txtOwnerId              = local.txt_owner
-      txtPrefix               = local.txt_prefix
-      sources                 = local.sources
-      domainFilters           = local.zone_names
+      policy        = var.policy
+      txtOwnerId    = local.txt_owner
+      txtPrefix     = local.txt_prefix
+      sources       = local.sources
+      domainFilters = local.zone_names
     }),
     # hardcoded values
     file("${path.module}/resources/values.yaml"),

src/resources/values.yaml

@@ -1,10 +1,5 @@
-aws:
-  evaluateTargetHealth: false
-rbac:
-  ## Service Account for pods
-  ## https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/
-  ## RBAC API version
-  apiVersion: v1
-  ## Podsecuritypolicy
-  pspEnabled: false
-provider: aws
+# AWS provider configuration for external-dns
+# The official external-dns chart uses provider.name instead of the provider field
+# AWS-specific settings are configured via extraArgs
+extraArgs:
+  - --aws-evaluate-target-health=false

src/variables.tf

@@ -142,11 +142,7 @@ variable "dns_components" {
   default     = []
 }
 
-variable "publish_internal_services" {
-  type        = bool
-  description = "Allow external-dns to publish DNS records for ClusterIP services"
-  default     = true
-}
+
 
 variable "policy" {
   type        = string

test/fixtures/stacks/catalog/usecase/basic.yaml

@@ -10,8 +10,8 @@ components:
         dns_gbl_primary_environment_name: ue2
         name: external-dns
         chart: external-dns
-        chart_repository: https://charts.bitnami.com/bitnami
-        chart_version: "6.33.0"
+        chart_repository: https://kubernetes-sigs.github.io/external-dns/
+        chart_version: "1.18.0"
         create_namespace: true
         kubernetes_namespace: external-dns
         resources:
@@ -25,16 +25,18 @@ components:
         # For example, when using blue-green deployment pattern to update EKS cluster.
         txt_prefix: ""
         # You can use `chart_values` to set any other chart options. Treat `chart_values` as the root of the doc.
-        # See documentation for latest chart version and list of chart_values: https://artifacthub.io/packages/helm/bitnami/external-dns
+        # See documentation for latest chart version and list of chart_values: https://artifacthub.io/packages/helm/external-dns/external-dns
         #
         # # For example
         # ---
         # chart_values:
-        #   aws:
-        #     batchChangeSize: 1000
+        #   provider:
+        #     name: aws
+        #   extraArgs:
+        #     - --aws-batch-change-size=1000
         chart_values:
-          crd:
-            create: true
+          provider:
+            name: aws
           sources:
             - crd
             - service

test/fixtures/stacks/catalog/usecase/disabled.yaml

@@ -10,8 +10,8 @@ components:
         dns_gbl_primary_environment_name: ue2
         name: external-dns
         chart: external-dns
-        chart_repository: https://charts.bitnami.com/bitnami
-        chart_version: "6.33.0"
+        chart_repository: https://kubernetes-sigs.github.io/external-dns/
+        chart_version: "1.18.0"
         create_namespace: true
         kubernetes_namespace: external-dns
         resources:
@@ -25,13 +25,15 @@ components:
         # For example, when using blue-green deployment pattern to update EKS cluster.
         txt_prefix: ""
         # You can use `chart_values` to set any other chart options. Treat `chart_values` as the root of the doc.
-        # See documentation for latest chart version and list of chart_values: https://artifacthub.io/packages/helm/bitnami/external-dns
+        # See documentation for latest chart version and list of chart_values: https://artifacthub.io/packages/helm/external-dns/external-dns
         #
         # # For example
         # ---
         # chart_values:
-        #   aws:
-        #     batchChangeSize: 1000
+        #   provider:
+        #     name: aws
+        #   extraArgs:
+        #     - --aws-batch-change-size=1000
         chart_values: {}
         # Extra hosted zones to lookup and support by component name
-        dns_components: []
+        dns_components: []