diff options
| author | Andrew Butcher <abutcher@redhat.com> | 2017-07-12 10:18:37 -0400 |
|---|---|---|
| committer | Andrew Butcher <abutcher@redhat.com> | 2017-09-29 10:57:21 -0400 |
| commit | 6b987c29daad047747c426169e3eaae866662f32 (patch) | |
| tree | 30d12b59aab83979e5010ee7e570afb1220d7c4b | |
| parent | a93d9ff45ddea4adaab9fd39947da50c50cc207d (diff) | |
| download | openshift-6b987c29daad047747c426169e3eaae866662f32.tar.gz openshift-6b987c29daad047747c426169e3eaae866662f32.tar.bz2 openshift-6b987c29daad047747c426169e3eaae866662f32.tar.xz openshift-6b987c29daad047747c426169e3eaae866662f32.zip | |
Check for router service annotations when redeploying router certificates.
| -rw-r--r-- | playbooks/common/openshift-cluster/redeploy-certificates/router.yml | 32 |
1 files changed, 29 insertions, 3 deletions
diff --git a/playbooks/common/openshift-cluster/redeploy-certificates/router.yml b/playbooks/common/openshift-cluster/redeploy-certificates/router.yml index 748bbbf91..a64d1e801 100644 --- a/playbooks/common/openshift-cluster/redeploy-certificates/router.yml +++ b/playbooks/common/openshift-cluster/redeploy-certificates/router.yml @@ -23,6 +23,15 @@ failed_when: false changed_when: false + - name: Determine if router service exists + command: > + {{ openshift.common.client_binary }} get svc/router -o json + --config={{ mktemp.stdout }}/admin.kubeconfig + -n default + register: l_router_svc + failed_when: false + changed_when: false + - set_fact: router_env_vars: "{{ ((l_router_dc.stdout | from_json)['spec']['template']['spec']['containers'][0]['env'] | oo_collect('name')) @@ -34,6 +43,10 @@ changed_when: false when: l_router_dc.rc == 0 + - set_fact: + router_service_annotations: "{{ (l_router_svc.stdout | from_json)['metadata']['annotations'] if 'annotations' in (l_router_svc.stdout | from_json)['metadata'] else [] }}" + when: l_router_svc.rc == 0 + - name: Update router environment variables shell: > {{ openshift.common.client_binary }} env dc/router @@ -42,7 +55,11 @@ OPENSHIFT_KEY_DATA="$(cat /etc/origin/master/openshift-router.key)" --config={{ mktemp.stdout }}/admin.kubeconfig -n default - when: l_router_dc.rc == 0 and 'OPENSHIFT_CA_DATA' in router_env_vars and 'OPENSHIFT_CERT_DATA' in router_env_vars and 'OPENSHIFT_KEY_DATA' in router_env_vars + when: + - l_router_dc.rc == 0 + - ('OPENSHIFT_CA_DATA' in router_env_vars) + - ('OPENSHIFT_CERT_DATA' in router_env_vars) + - ('OPENSHIFT_KEY_DATA' in router_env_vars) - block: - name: Delete existing router certificate secret @@ -67,7 +84,13 @@ service.alpha.openshift.io/serving-cert-secret-name=router-certs --config={{ mktemp.stdout }}/admin.kubeconfig -n default - when: l_router_dc.rc == 0 and 'router-certs' in router_secrets and openshift_hosted_router_certificate is undefined + when: + - l_router_dc.rc == 0 + - l_router_svc.rc == 0 + - ('router-certs' in router_secrets) + - openshift_hosted_router_certificate is undefined + - ('service.alpha.openshift.io/serving-cert-secret-name') in router_service_annotations + - ('service.alpha.openshift.io/serving-cert-signed-by') in router_service_annotations - block: - assert: @@ -127,7 +150,10 @@ with_items: - "{{ mktemp.stdout }}/openshift-hosted-router-certificate.pem" - "{{ mktemp.stdout }}/openshift-hosted-router-certificate.key" - when: l_router_dc.rc == 0 and 'router-certs' in router_secrets and openshift_hosted_router_certificate is defined + when: + - l_router_dc.rc == 0 + - ('router-certs' in router_secrets) + - openshift_hosted_router_certificate is defined - name: Redeploy router command: > |