fix ordering goofiness on cert manager/externaldns

Author: michaeljguarino

helm/certmanager.yaml.liquid

@@ -5,20 +5,10 @@ global:
 installCRDs: true
 serviceAccount:
   name: cert-manager
-  {% if cluster.distro == 'EKS' %}
   annotations:
     eks.amazonaws.com/role-arn: {{ cluster.metadata.iam.cert_manager }}
-  {% endif %}
-
-  {% if cluster.distro == 'AKS' %}
-  annotations:
     azure.workload.identity/client-id: {{ cluster.metadata.iam.cert_manager }}
-  {% endif %}
-
-  {% if cluster.distro == 'GKE' %}
-  annotations:
     iam.gke.io/gcp-service-account: {{ cluster.metadata.iam.cert_manager }}
-  {% endif %}
 
 securityContext:
   fsGroup: 1000

helm/external-dns.yaml.liquid

@@ -20,29 +20,19 @@ aws:
 domainFilters:
 - {{ cluster.metadata.dns_zone }} # check terraform/modules/clusters/aws/plural.tf for where this is set
 
-{% if cluster.distro == "EKS" %}
-serviceAccount:
-  annotations:
-    eks.amazonaws.com/role-arn: {{ cluster.metadata.iam.external_dns }} 
-{% endif %}
-
 {% if cluster.distro == "AKS" %}
 azure:
   useWorkloadIdentityExtension: true
   resourceGroup: {{ cluster.metadata.resource_group_name }}
   tenantId: {{ cluster.metadata.tenant_id }}
   subscriptionId: {{ cluster.metadata.subscription_id }}
 
-serviceAccount:
-  annotations:
-    azure.workload.identity/client-id: {{ cluster.metadata.iam.external_dns }}
-
 podLabels:
   azure.workload.identity/use: "true"
 {% endif %}
 
-{% if cluster.distro == "GKE" %}
 serviceAccount:
   annotations:
+    eks.amazonaws.com/role-arn: {{ cluster.metadata.iam.external_dns }}
     iam.gke.io/gcp-service-account: {{ cluster.metadata.iam.external_dns }}
-{% endif %}
+    azure.workload.identity/client-id: {{ cluster.metadata.iam.external_dns }}