From b378e1bb4b53218a14be0456c7b9cece055c1795 Mon Sep 17 00:00:00 2001 From: Siteshwar Vashisht Date: Fri, 22 Mar 2024 12:39:46 +0100 Subject: [PATCH] openscanhub: fix configurations for production Signed-off-by: Siteshwar Vashisht --- playbooks/openshift-apps/openscanhub.yml | 13 ++++++++----- .../openscanhub-route-fedora-osh-hub.yml | 4 ++-- 2 files changed, 10 insertions(+), 7 deletions(-) rename roles/openshift-apps/openscanhub/{files => templates}/openscanhub-route-fedora-osh-hub.yml (85%) diff --git a/playbooks/openshift-apps/openscanhub.yml b/playbooks/openshift-apps/openscanhub.yml index ebe931a6b4..3437202682 100644 --- a/playbooks/openshift-apps/openscanhub.yml +++ b/playbooks/openshift-apps/openscanhub.yml @@ -52,12 +52,15 @@ key: service.keytab secret_name: openscanhub-keytab service: HTTP - # https://pagure.io/fedora-infra/ansible/pull-request/1669#comment-195794 - # We should get separate approval for "opencanhub.fedoraproject.org" - # Fix below line if correct route is not generated. - # https://pagure.io/fedora-infra/ansible/pull-request/1669#comment-195809 host: "openscanhub.stg.fedoraproject.org" when: env == "staging" + - role: openshift/keytab + app: openscanhub + key: service.keytab + secret_name: openscanhub-keytab + service: HTTP + host: "openscanhub.fedoraproject.org" + when: env == "production" - role: openshift/object app: openscanhub file: openscanhub-deployment-fedora-osh-hub.yml @@ -65,7 +68,7 @@ when: env == "staging" - role: openshift/object app: openscanhub - file: openscanhub-route-fedora-osh-hub.yml + template: openscanhub-route-fedora-osh-hub.yml objectname: openscanhub-route-fedora-osh-hub when: env == "staging" - role: openshift/object diff --git a/roles/openshift-apps/openscanhub/files/openscanhub-route-fedora-osh-hub.yml b/roles/openshift-apps/openscanhub/templates/openscanhub-route-fedora-osh-hub.yml similarity index 85% rename from roles/openshift-apps/openscanhub/files/openscanhub-route-fedora-osh-hub.yml rename to roles/openshift-apps/openscanhub/templates/openscanhub-route-fedora-osh-hub.yml index b5a3251ade..4b30fe69ee 100644 --- a/roles/openshift-apps/openscanhub/files/openscanhub-route-fedora-osh-hub.yml +++ b/roles/openshift-apps/openscanhub/templates/openscanhub-route-fedora-osh-hub.yml @@ -8,12 +8,12 @@ metadata: app.kubernetes.io/name: fedora-osh-hub app.kubernetes.io/part-of: openscanhub # TODO: This should be a template and use production for production instance. - name: staging + name: openscanhub{{ env_suffix }}-fedoraproject-org namespace: openscanhub resourceVersion: "2899601169" uid: 1c280b7f-39a4-40fc-a850-396147e1c1af spec: - host: openscanhub.stg.fedoraproject.org + host: openscanhub{{ env_suffix }}.fedoraproject.org port: targetPort: 8080-tcp tls: