diff --git a/playbooks/openshift-apps/testdays.yml b/playbooks/openshift-apps/testdays.yml index cf7a30deb9..20bff1692c 100644 --- a/playbooks/openshift-apps/testdays.yml +++ b/playbooks/openshift-apps/testdays.yml @@ -89,6 +89,11 @@ object_template: imagestream.yml.j2 object_objectname: imagestream.yml + - role: openshift/object + object_app: testdays + object_template: secret.yml.j2 + object_objectname: secret.yml + - role: openshift/object object_app: testdays object_file: service.yml diff --git a/roles/openshift-apps/testdays/templates/client_secrets.json b/roles/openshift-apps/testdays/templates/client_secrets.json new file mode 100644 index 0000000000..60e7531919 --- /dev/null +++ b/roles/openshift-apps/testdays/templates/client_secrets.json @@ -0,0 +1,14 @@ +{ + "web": { + "client_id": "75775323078-ohc0tlk93skeun0kcm7uqc2mrffm2god.apps.googleusercontent.com", + "project_id": "wmpair-dev", + "auth_uri": "https://accounts.google.com/o/oauth2/auth", + "token_uri": "https://oauth2.googleapis.com/token", + "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs", + "client_secret": "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", + "redirect_uris": [ + "http://localhost:5050/flask_oidc/authorize", + "https://testdays.stg.fedoraproject.org/flask_oidc/authorize" + ] + } +} diff --git a/roles/openshift-apps/testdays/templates/deployment.yml.j2 b/roles/openshift-apps/testdays/templates/deployment.yml.j2 index a35a717afa..599305fb42 100644 --- a/roles/openshift-apps/testdays/templates/deployment.yml.j2 +++ b/roles/openshift-apps/testdays/templates/deployment.yml.j2 @@ -44,6 +44,8 @@ spec: value: "http://resultsdb.testdays.svc.cluster.local:8080/api/v2.0" - name: OPENSHIFT_PROD value: "1" + - name: IS_OPENSHIFT + value: "1" readinessProbe: timeoutSeconds: 1 initialDelaySeconds: 5 diff --git a/roles/openshift-apps/testdays/templates/secret.yml.j2 b/roles/openshift-apps/testdays/templates/secret.yml.j2 new file mode 100644 index 0000000000..614680b4fa --- /dev/null +++ b/roles/openshift-apps/testdays/templates/secret.yml.j2 @@ -0,0 +1,11 @@ +{% macro load_file(filename) %}{% include filename %}{%- endmacro -%} +--- +apiVersion: v1 +kind: Secret +metadata: + name: testdays-secret + labels: + app: testdays +stringData: + client_secrets.json: |- + {{ load_file('client_secrets.json') | indent }}