Merge pull request #214 from sassoftware/staging

Monthly Release - 4.12.0
sassoftware · Apr 21, 2022 · 8e3482b · 8e3482b
2 parents 15dbb25 + 0cfea38
commit 8e3482b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/roles/vdm/tasks/tls.yaml b/roles/vdm/tasks/tls.yaml
@@ -192,22 +192,35 @@
     - uninstall
     - update
 
-- name: tls - Certificate Generation
+- name: tls - Certificate Generation - cert-manager
   overlay_facts:
     cadence_name: "{{ V4_CFG_CADENCE_NAME }}"
     cadence_number: "{{ V4_CFG_CADENCE_VERSION }}"
     existing: "{{ vdm_overlays }}"
     add:
       - { transformers: "cert-manager-provided-ingress-certificate.yaml", vdm: true, priority: 70 }
-      - { generators: "customer-provided-merge-sas-certframe-configmap.yaml", vdm: true }
   when:
     - V4_CFG_TLS_MODE != "disabled"
-    - (V4_CFG_TLS_CERT is none and V4_CFG_TLS_KEY is none and V4_CFG_TLS_GENERATOR == "cert-manager") or V4_CFG_TLS_GENERATOR == "openssl"
+    - (V4_CFG_TLS_CERT is none and V4_CFG_TLS_KEY is none and V4_CFG_TLS_GENERATOR == "cert-manager")
   tags:
     - install
     - uninstall
     - update
 
+- name: tls - Configuring Certificate Attributes
+  overlay_facts:
+    cadence_name: "{{ V4_CFG_CADENCE_NAME }}"
+    cadence_number: "{{ V4_CFG_CADENCE_VERSION }}"
+    existing: "{{ vdm_overlays }}"
+    add:
+      - { generators: "customer-provided-merge-sas-certframe-configmap.yaml", vdm: true }
+  when:
+    - V4_CFG_TLS_MODE != "disabled"
+    - (V4_CFG_TLS_GENERATOR == "cert-manager" or V4_CFG_TLS_GENERATOR == "openssl")
+  tags:
+    - install
+    - uninstall
+    - update
 
 - name: tls - Consul UI
   overlay_facts:

diff --git a/roles/vdm/templates/generators/customer-provided-merge-sas-certframe-configmap.yaml b/roles/vdm/templates/generators/customer-provided-merge-sas-certframe-configmap.yaml
@@ -14,4 +14,6 @@ literals:
 - SAS_CERTIFICATE_ADDITIONAL_SAN_IP={{ V4_CFG_TLS_ADDITIONAL_SAN_IP }}
 {% if V4_CFG_TLS_GENERATOR == "openssl" %}
 - SAS_CERTIFICATE_GENERATOR=openssl
+{% elif V4_CFG_TLS_GENERATOR == "cert-manager" %}
+- SAS_CERTIFICATE_GENERATOR=cert-manager
 {% endif -%}