diff --git a/roles/keycloak/tasks/main.yml b/roles/keycloak/tasks/main.yml index e596d845f..f1b8bba6b 100644 --- a/roles/keycloak/tasks/main.yml +++ b/roles/keycloak/tasks/main.yml @@ -99,8 +99,7 @@ ingress_service_name: "{{ keycloak_helm_release_name }}" ingress_service_port: 80 ingress_secret_name: "{{ keycloak_host_tls_secret_name }}" - ingress_annotations: - cert-manager.io/cluster-issuer: "{{ keycloak_ingress_cluster_issuer }}" + ingress_annotations: "{{ _keycloak_ingress_annotations | combine(keycloak_ingress_annotations, recursive=True) }}" - name: Enable pxc strict mode run_once: true diff --git a/roles/keycloak/vars/main.yml b/roles/keycloak/vars/main.yml index a03de3618..41ee1ee99 100644 --- a/roles/keycloak/vars/main.yml +++ b/roles/keycloak/vars/main.yml @@ -12,6 +12,9 @@ # License for the specific language governing permissions and limitations # under the License. +_keycloak_ingress_annotations: + cert-manager.io/cluster-issuer: "{{ keycloak_ingress_cluster_issuer }}" + _keycloak_helm_values: # NOTE(mnaser): These workarounds below are needed to allow the Bitnami Helm chart to work with # the upstream image.