From 32de8815c7839c093471aacf09587f814758bc08 Mon Sep 17 00:00:00 2001
From: Jakub Filipczak <79512239+jfilipcz@users.noreply.github.com>
Date: Wed, 14 Sep 2022 13:52:48 +0200
Subject: [PATCH] WIP: Add optional Hosted Zone ID parameter to ClusterIssuer
 template (#586)

* Add optional Hosted Zone ID parameter to ClusterIssuer template

* Update ClusterIssuer template in Cert-Manager operator
---
 cert-manager-configs/.openshift/cert-manager.yml  | 3 +++
 cert-manager-configs/templates/ClusterIssuer.yaml | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/cert-manager-configs/.openshift/cert-manager.yml b/cert-manager-configs/.openshift/cert-manager.yml
index 510307ce8..32baa63e4 100644
--- a/cert-manager-configs/.openshift/cert-manager.yml
+++ b/cert-manager-configs/.openshift/cert-manager.yml
@@ -33,6 +33,7 @@ objects:
               route53:
                 region: ${AWS_REGION}
                 accessKeyID: ${AWS_ACCESS_KEY_ID}
+                hostedZoneID: ${AWS_HOSTED_ZONE_ID}
                 secretAccessKeySecretRef:
                   name: "aws-secret-access-key-secret"
                   key: "aws-secret-access-key"
@@ -54,3 +55,5 @@ parameters:
     required: true
   - name: ACME_EMAIL
     required: true
+  - name: AWS_HOSTED_ZONE_ID
+    required: false
diff --git a/cert-manager-configs/templates/ClusterIssuer.yaml b/cert-manager-configs/templates/ClusterIssuer.yaml
index 24858ce49..d41174254 100644
--- a/cert-manager-configs/templates/ClusterIssuer.yaml
+++ b/cert-manager-configs/templates/ClusterIssuer.yaml
@@ -28,6 +28,9 @@ spec:
           route53:
             region: {{ .Values.aws.region }}
             accessKeyID: {{ .Values.aws.accessKeyId }}
+      {{- if .Values.aws.hostedZoneId }}
+            hostedZoneID: {{ .Values.aws.hostedZoneId }}
+      {{- end }}
             secretAccessKeySecretRef:
               name: "aws-secret-access-key-secret"
               key: "aws-secret-access-key"