From 495811a352b74bf161de93dc854d6a76a1c20b44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= Date: Tue, 26 Jan 2021 19:21:48 +0100 Subject: [PATCH] oraculum: Try frontend --- playbooks/openshift-apps/oraculum.yml | 7 ++++ .../openshift-apps/oraculum/files/service.yml | 18 +++++++++- .../oraculum/templates/buildconfig.yml | 25 +++++++++++++ .../oraculum/templates/deploymentconfig.yml | 35 ++++++++++++++++++- .../oraculum/templates/imagestream.yml | 12 ++++++- 5 files changed, 94 insertions(+), 3 deletions(-) diff --git a/playbooks/openshift-apps/oraculum.yml b/playbooks/openshift-apps/oraculum.yml index ad885c644b..eb13f48bee 100644 --- a/playbooks/openshift-apps/oraculum.yml +++ b/playbooks/openshift-apps/oraculum.yml @@ -88,6 +88,13 @@ serviceport: 8080-tcp servicename: oraculum-api-endpoint + - role: openshift/route + app: oraculum + routename: oraculum-frontend + host: "packager-dashboard{{ env_suffix }}.fedoraproject.org" + serviceport: 8080-tcp + servicename: oraculum-frontend + - role: openshift/start-build app: oraculum buildname: packager-dashboard-build diff --git a/roles/openshift-apps/oraculum/files/service.yml b/roles/openshift-apps/oraculum/files/service.yml index 8e56f4a9dd..2a3d5a9a3a 100644 --- a/roles/openshift-apps/oraculum/files/service.yml +++ b/roles/openshift-apps/oraculum/files/service.yml @@ -29,4 +29,20 @@ spec: targetPort: 6379 selector: app: oraculum - deploymentconfig: oraculum-redis \ No newline at end of file + deploymentconfig: oraculum-redis +--- +apiVersion: v1 +kind: Service +metadata: + labels: + app: oraculum + name: oraculum-frontend +spec: + ports: + - name: 8080-tcp + port: 8080 + protocol: TCP + targetPort: 8000 + selector: + app: oraculum + deploymentconfig: oraculum-frontend \ No newline at end of file diff --git a/roles/openshift-apps/oraculum/templates/buildconfig.yml b/roles/openshift-apps/oraculum/templates/buildconfig.yml index c3a1bc35e3..178d78b828 100644 --- a/roles/openshift-apps/oraculum/templates/buildconfig.yml +++ b/roles/openshift-apps/oraculum/templates/buildconfig.yml @@ -1,3 +1,4 @@ +--- apiVersion: v1 kind: BuildConfig metadata: @@ -24,3 +25,27 @@ spec: triggers: - type: ConfigChange - type: ImageChange +--- +apiVersion: v1 +kind: BuildConfig +metadata: + name: packager-dashboard-frontend-build + labels: + environment: "packager-dashboard" +spec: + output: + to: + kind: ImageStreamTag + name: packager-dashboard-frontend:latest + source: + type: Git + git: + uri: 'https://pagure.io/fedora-qa/packager_dashboard.git' + ref: 'docker_stuff' + strategy: + type: Docker + dockerStrategy: + dockerfilePath: Dockerfile + triggers: + - type: ConfigChange + - type: ImageChange \ No newline at end of file diff --git a/roles/openshift-apps/oraculum/templates/deploymentconfig.yml b/roles/openshift-apps/oraculum/templates/deploymentconfig.yml index a89915eb0f..d29ec7bddb 100644 --- a/roles/openshift-apps/oraculum/templates/deploymentconfig.yml +++ b/roles/openshift-apps/oraculum/templates/deploymentconfig.yml @@ -273,4 +273,37 @@ spec: - oraculum-redis from: kind: ImageStreamTag - name: packager-dashboard-redis:latest \ No newline at end of file + name: packager-dashboard-redis:latest +--- +apiVersion: v1 +kind: DeploymentConfig +metadata: + labels: + app: oraculum + service: oraculum-frontend + name: oraculum-frontend +spec: + replicas: 1 # Never change this to more or less than ONE! + selector: + app: oraculum + deploymentconfig: oraculum-frontend + template: + metadata: + labels: + app: oraculum + deploymentconfig: oraculum-frontend + spec: + containers: + - name: oraculum-frontend + image: packager-dashboard-frontend:latest + resources: {} + triggers: + - type: ConfigChange + - type: ImageChange + imageChangeParams: + automatic: true + containerNames: + - oraculum-frontend + from: + kind: ImageStreamTag + name: packager-dashboard-frontend:latest \ No newline at end of file diff --git a/roles/openshift-apps/oraculum/templates/imagestream.yml b/roles/openshift-apps/oraculum/templates/imagestream.yml index b502b8c90a..b249ed468d 100644 --- a/roles/openshift-apps/oraculum/templates/imagestream.yml +++ b/roles/openshift-apps/oraculum/templates/imagestream.yml @@ -18,4 +18,14 @@ spec: - name: latest from: kind: DockerImage - name: quay.io/bitnami/redis:latest \ No newline at end of file + name: quay.io/bitnami/redis:latest +--- +apiVersion: v1 +kind: ImageStream +metadata: + name: oraculum-frontend +spec: + lookupPolicy: + local: false +status: + dockerImageRepository: "" \ No newline at end of file