PR#108: Update OpenShift test template to allow deploying with other apps - taskotron/resultsdb

taskotron / resultsdb

#108 Update OpenShift test template to allow deploying with other apps

Closed 6 years ago by jskladan. Opened 6 years ago by csomh.

taskotron/ csomh/resultsdb openshift-app-label into develop

Allow anyone to POST a result

Hunor Csomortáni • 6 years ago

8fcf251

Use 'app' label in the OpenShift test template

Hunor Csomortáni • 6 years ago

8cf42ed

Build image used in OpenShift from Fedora

Hunor Csomortáni • 6 years ago

fd4e804

openshift/Dockerfile

file modified

+1 -3

		`@@ -2,7 +2,7 @@`
		`# Build should be triggered from repo root like:`
		`# docker build -f openshift/Dockerfile --tag 172.30.1.1:5000/myproject/resultsdb:latest --build-arg resultsdb_rpm=resultsdb-2.0.2-1.fc25.noarch.rpm .`

		`- FROM centos/httpd:latest`
		`+ FROM registry.fedoraproject.org/f27/httpd:latest`
		`LABEL \`
		`name="ResultsDB application" \`
		`vendor="ResultsDB developers" \`
		`@@ -11,8 +11,6 @@`

		`USER 0`

		`- RUN yum -y install epel-release && yum -y clean all`
		`-`
		`# The caller should build a resultsdb RPM package using and then pass it in this arg.`
		`ARG resultsdb_rpm`
		`COPY $resultsdb_rpm /tmp`

openshift/resultsdb-test-template.yaml

file modified

+24 -4

		`@@ -38,6 +38,7 @@`
		`name: "resultsdb-test-${TEST_ID}-secret"`
		`labels:`
		`environment: "test-${TEST_ID}"`
		`+ app: resultsdb`
		`stringData:`
		`database-password: "${DATABASE_PASSWORD}"`
		`- apiVersion: v1`
		`@@ -46,6 +47,7 @@`
		`name: "resultsdb-test-${TEST_ID}-config"`
		`labels:`
		`environment: "test-${TEST_ID}"`
		`+ app: resultsdb`
		`stringData:`
		`settings.py: \|-`
		`SECRET_KEY = '${RESULTSDB_SECRET_KEY}'`
		`@@ -65,13 +67,14 @@`
		`name: "resultsdb-test-${TEST_ID}-public-httpd-config"`
		`labels:`
		`environment: "test-${TEST_ID}"`
		`+ app: resultsdb`
		`data:`
		`resultsdb.conf: \|-`
		`<Location "/">`
		`- <RequireAny>`
		`- # allow only GET`
		`- Require method GET`
		`- </RequireAny>`
		`+ # <RequireAny>`
		`+ # # allow only GET`
		`+ # Require method GET`
		`+ # </RequireAny>`
		`</Location>`
		`- apiVersion: v1`
		`kind: ConfigMap`
		`@@ -79,6 +82,7 @@`
		`name: "resultsdb-test-${TEST_ID}-internal-httpd-config"`
		`labels:`
		`environment: "test-${TEST_ID}"`
		`+ app: resultsdb`
		`data:`
		`resultsdb.conf: \|-`
		`<Location "/">`
		`@@ -90,8 +94,10 @@`
		`name: "resultsdb-test-${TEST_ID}-database"`
		`labels:`
		`environment: "test-${TEST_ID}"`
		`+ app: resultsdb`
		`spec:`
		`selector:`
		`+ app: resultsdb`
		`environment: "test-${TEST_ID}"`
		`service: database`
		`ports:`
		`@@ -105,11 +111,13 @@`
		`labels:`
		`environment: "test-${TEST_ID}"`
		`service: database`
		`+ app: resultsdb`
		`spec:`
		`replicas: 1`
		`strategy:`
		`type: Recreate`
		`selector:`
		`+ app: resultsdb`
		`environment: "test-${TEST_ID}"`
		`service: database`
		`template:`
		`@@ -117,6 +125,7 @@`
		`labels:`
		`environment: "test-${TEST_ID}"`
		`service: database`
		`+ app: resultsdb`
		`spec:`
		`containers:`
		`- name: postgresql`
		`@@ -152,11 +161,13 @@`
		`name: "resultsdb-test-${TEST_ID}-api"`
		`labels:`
		`environment: "test-${TEST_ID}"`
		`+ app: resultsdb`
		`annotations:`
		`service.alpha.openshift.io/dependencies: \|-`
		`[{"name": "resultsdb-test-${TEST_ID}-database", "kind": "Service"}]`
		`spec:`
		`selector:`
		`+ app: resultsdb`
		`environment: "test-${TEST_ID}"`
		`service: api`
		`ports:`
		`@@ -169,6 +180,7 @@`
		`name: "resultsdb-test-${TEST_ID}-api"`
		`labels:`
		`environment: "test-${TEST_ID}"`
		`+ app: resultsdb`
		`spec:`
		`port:`
		`targetPort: api`
		`@@ -184,11 +196,13 @@`
		`name: "resultsdb-test-${TEST_ID}-internal-api"`
		`labels:`
		`environment: "test-${TEST_ID}"`
		`+ app: resultsdb`
		`annotations:`
		`service.alpha.openshift.io/dependencies: \|-`
		`[{"name": "resultsdb-test-${TEST_ID}-database", "kind": "Service"}]`
		`spec:`
		`selector:`
		`+ app: resultsdb`
		`environment: "test-${TEST_ID}"`
		`service: internal-api`
		`ports:`
		`@@ -202,9 +216,11 @@`
		`labels:`
		`environment: "test-${TEST_ID}"`
		`service: api`
		`+ app: resultsdb`
		`spec:`
		`replicas: 1`
		`selector:`
		`+ app: resultsdb`
		`environment: "test-${TEST_ID}"`
		`service: api`
		`template:`
		`@@ -212,6 +228,7 @@`
		`labels:`
		`environment: "test-${TEST_ID}"`
		`service: api`
		`+ app: resultsdb`
		`spec:`
		`containers:`
		`- name: api`
		`@@ -260,9 +277,11 @@`
		`labels:`
		`environment: "test-${TEST_ID}"`
		`service: internal-api`
		`+ app: resultsdb`
		`spec:`
		`replicas: 1`
		`selector:`
		`+ app: resultsdb`
		`environment: "test-${TEST_ID}"`
		`service: internal-api`
		`template:`
		`@@ -270,6 +289,7 @@`
		`labels:`
		`environment: "test-${TEST_ID}"`
		`service: internal-api`
		`+ app: resultsdb`
		`spec:`
		`containers:`
		`- name: api`