openshift-apps: updates for ostree-importer and ostree-pruner

- Added imagestream, switched to Fedora 31.
- Added buildconfig, to build from upstream sources.

playbooks/openshift-apps/coreos-ostree-importer.yml

@@ -17,6 +17,21 @@
     - jlebon
     - kevin
 
+  - role: openshift/object
+    app: coreos-ostree-importer
+    template: imagestream.yml
+    objectname: imagestream.yml
+
+  - role: openshift/object
+    app: coreos-ostree-importer
+    template: buildconfig.yml
+    objectname: buildconfig.yml
+
+  - role: openshift/start-build
+    app: coreos-ostree-importer
+    buildname: coreos-ostree-importer-build
+    objectname: coreos-ostree-importer-build
+
   - role: openshift/object
     app: coreos-ostree-importer
     template: deploymentconfig.yml

playbooks/openshift-apps/fedora-ostree-pruner.yml

@@ -17,6 +17,21 @@
     - jlebon
     - kevin
 
+  - role: openshift/object
+    app: fedora-ostree-pruner
+    template: imagestream.yml
+    objectname: imagestream.yml
+
+  - role: openshift/object
+    app: fedora-ostree-pruner
+    template: buildconfig.yml
+    objectname: buildconfig.yml
+
+  - role: openshift/start-build
+    app: fedora-ostree-pruner
+    buildname: fedora-ostree-pruner-build
+    objectname: fedora-ostree-pruner-build
+
   - role: openshift/object
     app: fedora-ostree-pruner
     template: deploymentconfig.yml

roles/openshift-apps/coreos-ostree-importer/templates/buildconfig.yml

@@ -0,0 +1,39 @@
+apiVersion: build.openshift.io/v1
+kind: BuildConfig
+metadata:
+  name: coreos-ostree-importer-build
+  labels:
+    build: coreos-ostree-importer
+spec:
+  source:
+    type: Git
+    contextDir: coreos-ostree-importer
+    git:
+{% if env == "staging" %}
+      ref: fedora-infra-staging
+      uri: https://github.com/coreos/fedora-coreos-releng-automation.git
+{% else %}
+      ref: master 
+      uri: https://github.com/coreos/fedora-coreos-releng-automation.git
+{% endif %}
+  strategy:
+    type: Docker
+    dockerStrategy:
+      from:
+        kind: ImageStreamTag
+        name: fedora:31
+  output:
+    to:
+      kind: ImageStreamTag
+      name: coreos-ostree-importer-img:latest
+  triggers:
+  - type: ConfigChange
+{% if env == "staging" and coreos_ostree_importer_webhook_secret_stg is defined %}
+  - type: GitHub
+    github:
+      secret: "{{ coreos_ostree_importer_webhook_secret_stg }}"
+{% elif coreos_ostree_importer_webhook_secret_prod is defined %}
+  - type: GitHub
+    github:
+      secret: "{{ coreos_ostree_importer_webhook_secret_prod }}"
+{% endif %}

roles/openshift-apps/coreos-ostree-importer/templates/deploymentconfig.yml

@@ -18,7 +18,6 @@ spec:
     spec:
       containers:
       - name: coreos-ostree-importer
-        image: registry.fedoraproject.org/fedora:30
         # sleep infinity is useful for debugging environment issues
         # comment out when not debugging
         args: ['infinity']
@@ -26,6 +25,7 @@ spec:
         volumeMounts:
         - name: fedora-ostree-content-volume
           mountPath: /mnt/koji
+        image: ""
         imagePullPolicy: IfNotPresent
         resources: {}
       volumes:

roles/openshift-apps/coreos-ostree-importer/templates/imagestream.yml

@@ -0,0 +1,29 @@
+apiVersion: v1
+kind: List
+items:
+# ImageStream for Fedora 31 image
+- apiVersion: image.openshift.io/v1
+  kind: ImageStream
+  metadata:
+    labels:
+      build: coreos-ostree-importer
+    name: fedora
+  spec:
+    lookupPolicy:
+      local: false
+    tags:
+    - name: "31"
+      from:
+        kind: DockerImage
+        name: registry.fedoraproject.org/fedora:31
+      importPolicy: 
+        scheduled: true
+      referencePolicy:
+        type: Source
+# ImageStream for resulting built coreos-ostree-importer-img
+- apiVersion: image.openshift.io/v1
+  kind: ImageStream
+  metadata:
+    labels:
+      build: coreos-ostree-importer
+    name: coreos-ostree-importer-img

roles/openshift-apps/fedora-ostree-pruner/templates/buildconfig.yml

@@ -0,0 +1,39 @@
+apiVersion: build.openshift.io/v1
+kind: BuildConfig
+metadata:
+  name: fedora-ostree-pruner-build
+  labels:
+    build: fedora-ostree-pruner
+spec:
+  source:
+    type: Git
+    contextDir: coreos-ostree-importer
+    git:
+{% if env == "staging" %}
+      ref: fedora-infra-staging
+      uri: https://github.com/coreos/fedora-coreos-releng-automation.git
+{% else %}
+      ref: master 
+      uri: https://github.com/coreos/fedora-coreos-releng-automation.git
+{% endif %}
+  strategy:
+    type: Docker
+    dockerStrategy:
+      from:
+        kind: ImageStreamTag
+        name: fedora:31
+  output:
+    to:
+      kind: ImageStreamTag
+      name: fedora-ostree-pruner-img:latest
+  triggers:
+  - type: ConfigChange
+{% if env == "staging" and fedora_ostree_pruner_webhook_secret_stg is defined %}
+  - type: GitHub
+    github:
+      secret: "{{ fedora_ostree_pruner_webhook_secret_stg }}"
+{% elif fedora_ostree_pruner_webhook_secret_prod is defined %}
+  - type: GitHub
+    github:
+      secret: "{{ fedora_ostree_pruner_webhook_secret_prod }}"
+{% endif %}

roles/openshift-apps/fedora-ostree-pruner/templates/deploymentconfig.yml

@@ -18,7 +18,6 @@ spec:
     spec:
       containers:
       - name: fedora-ostree-pruner
-        image: registry.fedoraproject.org/fedora:30
         # sleep infinity is useful for debugging environment issues
         # comment out when not debugging
         args: ['infinity']
@@ -26,6 +25,7 @@ spec:
         volumeMounts:
         - name: fedora-ostree-content-volume
           mountPath: /mnt/koji
+        image: ""
         imagePullPolicy: IfNotPresent
         resources: {}
       volumes:

roles/openshift-apps/fedora-ostree-pruner/templates/imagestream.yml

@@ -0,0 +1,29 @@
+apiVersion: v1
+kind: List
+items:
+# ImageStream for Fedora 31 image
+- apiVersion: image.openshift.io/v1
+  kind: ImageStream
+  metadata:
+    labels:
+      build: fedora-ostree-pruner
+    name: fedora
+  spec:
+    lookupPolicy:
+      local: false
+    tags:
+    - name: "31"
+      from:
+        kind: DockerImage
+        name: registry.fedoraproject.org/fedora:31
+      importPolicy: 
+        scheduled: true
+      referencePolicy:
+        type: Source
+# ImageStream for resulting built fedora-ostree-pruner-img
+- apiVersion: image.openshift.io/v1
+  kind: ImageStream
+  metadata:
+    labels:
+      build: fedora-ostree-pruner
+    name: fedora-ostree-pruner-img