diff --git a/playbooks/openshift-apps/resultsdb.yml b/playbooks/openshift-apps/resultsdb.yml index 664f74c361..d56e3c3397 100644 --- a/playbooks/openshift-apps/resultsdb.yml +++ b/playbooks/openshift-apps/resultsdb.yml @@ -87,6 +87,11 @@ template: backend/configmaps.yml objectname: backend-configmaps.yml + - role: openshift/object + app: resultsdb + template: backend/imagestream.yml + objectname: backend-imagestream.yml + - role: openshift/object app: resultsdb template: backend/deploymentconfigs.yml diff --git a/roles/openshift-apps/resultsdb/templates/backend/deploymentconfigs.yml b/roles/openshift-apps/resultsdb/templates/backend/deploymentconfigs.yml index 45910830ae..46a285aeb0 100644 --- a/roles/openshift-apps/resultsdb/templates/backend/deploymentconfigs.yml +++ b/roles/openshift-apps/resultsdb/templates/backend/deploymentconfigs.yml @@ -48,11 +48,7 @@ spec: spec: containers: - name: api -{% if env == 'staging' %} - image: "{{ stg_resultsdb_image }}" -{% else %} - image: "{{ prod_resultsdb_image }}" -{% endif %} + image: resultsdb-api imagePullPolicy: Always env: - name: RESULTSDB_WSGI_SCRIPT_PATH @@ -126,3 +122,11 @@ spec: secretName: resultsdb-fedora-messaging-key triggers: - type: ConfigChange + - type: ImageChange + imageChangeParams: + automatic: true + containerNames: + - api + from: + kind: ImageStreamTag + name: resultsdb-api:latest diff --git a/roles/openshift-apps/resultsdb/templates/backend/imagestream.yml b/roles/openshift-apps/resultsdb/templates/backend/imagestream.yml new file mode 100644 index 0000000000..4c4fe877ca --- /dev/null +++ b/roles/openshift-apps/resultsdb/templates/backend/imagestream.yml @@ -0,0 +1,17 @@ +--- +apiVersion: image.openshift.io/v1 +kind: ImageStream +metadata: + name: "resultsdb-api" +spec: + tags: + - name: latest + importPolicy: + scheduled: true + from: + kind: DockerImage +{% if env == 'staging' %} + name: "{{ stg_resultsdb_image }}" +{% else %} + name: "{{ prod_resultsdb_image }}" +{% endif %}