Merge pull request #54 from LorbusChris/release-4.15

Add release-4.15 builds

README.md

@@ -46,12 +46,12 @@ kubectl apply -f ./my-secret.yaml -n okd-coreos
 # run pipeline
 kubectl create \
 -n okd-coreos \
--f environments/kind/pipelineruns/okd-coreos-build-4.14-pipelinerun.yaml
+-f environments/kind/pipelineruns/okd-coreos-4.15-dev-pipelinerun.yaml
 
 # see the logs
 tkn pipelinerun logs -f \
 -n okd-coreos \
-okd-coreos-build-4.14-pipelinerun-fooba
+okd-coreos-4.15-dev-pipelinerun-fooba
 ```
 
 ### Sending pipeline status notifications to a Matrix channel
@@ -67,7 +67,7 @@ stringData:
   token: {OAuth token for the bot app}
 ```
 
-The pipeline run `environments/moc/pipelineruns/okd-coreos-all-4.*-pipelinerun.yaml` uses the following parameters:
+The pipeline run `environments/moc/pipelineruns/okd-coreos-4.*-prod-pipelinerun.yaml` uses the following parameters:
 * `matrix-room` : containing the matrix roomID where the notification will be sent
 * `matrix-endpoint`: URI of the matrix server hosting the room
 
@@ -87,11 +87,11 @@ kubectl get all -n okd-coreos
 # run pipeline
 kubectl create \
     -n okd-coreos \
-    -f environments/moc/pipelineruns/okd-coreos-all-4.14-pipelinerun.yaml
+    -f environments/moc/pipelineruns/okd-coreos-4.15-prod-pipelinerun.yaml
 
 # see the logs
 tkn pipelinerun logs -f \
     -n okd-coreos \
-    okd-coreos-all-4.14-pipelinerun-fooba
+    okd-coreos-4.15-prod-pipelinerun-fooba
 
 ```

base/batch/cronjobs/kustomization.yaml

@@ -1,6 +1,7 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - okd-coreos-all-4.13-create-daily.yaml
-  - okd-coreos-all-4.14-create-daily.yaml
+  - okd-coreos-4.13-prod-create-daily.yaml
+  - okd-coreos-4.14-prod-create-daily.yaml
+  - okd-coreos-4.15-prod-create-daily.yaml
   - tekton-cleanup-daily.yaml

base/batch/cronjobs/okd-coreos-all-4.13-create-daily.yaml → base/batch/cronjobs/okd-coreos-4.13-prod-create-daily.yaml

@@ -1,7 +1,7 @@
 apiVersion: batch/v1
 kind: CronJob
 metadata:
-  name: okd-coreos-all-4.13-create-daily
+  name: okd-coreos-4.13-prod-create-daily
 spec:
   schedule: "0 6 * * *"
   jobTemplate:
@@ -37,9 +37,9 @@ spec:
               name: workspace
             env:
               - name: SINK_URL
-                value: "http://el-okd-coreos-all.okd-coreos.svc.cluster.local:8080"
+                value: "http://el-okd-coreos-prod.okd-coreos.svc.cluster.local:8080"
               - name: BRANCH
-                value: "release-4.13"
+                value: "release-4.14"
               - name: OKD_VERSION
                 value: "4.13"
               - name: RELEASE_STREAM
@@ -49,7 +49,7 @@ spec:
               - name: TAG_LATEST
                 value: "true"
               - name: CLAIMNAME
-                value: "pipeline-scos-stable-pvc"
+                value: "pipeline-scos-4.13-pvc"
             resources:
               limits:
                 cpu: 100m

base/batch/cronjobs/okd-coreos-all-4.14-create-daily.yaml → base/batch/cronjobs/okd-coreos-4.14-prod-create-daily.yaml

@@ -1,7 +1,7 @@
 apiVersion: batch/v1
 kind: CronJob
 metadata:
-  name: okd-coreos-all-4.14-create-daily
+  name: okd-coreos-4.14-prod-create-daily
 spec:
   schedule: "30 7 * * *"
   jobTemplate:
@@ -37,9 +37,9 @@ spec:
               name: workspace
             env:
               - name: SINK_URL
-                value: "http://el-okd-coreos-all.okd-coreos.svc.cluster.local:8080"
+                value: "http://el-okd-coreos-prod.okd-coreos.svc.cluster.local:8080"
               - name: BRANCH
-                value: "master"
+                value: "release-4.14"
               - name: OKD_VERSION
                 value: "4.14"
               - name: RELEASE_STREAM
@@ -49,7 +49,7 @@ spec:
               - name: TAG_LATEST
                 value: "true"
               - name: CLAIMNAME
-                value: "pipeline-scos-next-pvc"
+                value: "pipeline-scos-4.14-pvc"
             resources:
               limits:
                 cpu: 100m

base/batch/cronjobs/okd-coreos-4.15-prod-create-daily.yaml

@@ -0,0 +1,58 @@
+apiVersion: batch/v1
+kind: CronJob
+metadata:
+  name: okd-coreos-4.15-prod-create-daily
+spec:
+  schedule: "0 9 * * *"
+  jobTemplate:
+    spec:
+      template:
+        spec:
+          volumes:
+          - name: workspace
+            emptyDir: {}
+          containers:
+          - name: send-trigger
+            image: curlimages/curl
+            command:
+              - /bin/sh
+            args:
+              - -ce
+              - |
+                cat <<EOF > /workspace/post-body.json
+                {
+                  "params": {
+                    "branch": "${BRANCH}",
+                    "version": "${OKD_VERSION}",
+                    "release-stream": "${RELEASE_STREAM}",
+                    "rpm-artifacts-image": "${ARTIFACTS_IMAGE}",
+                    "tag-latest": "${TAG_LATEST}",
+                    "claimname": "${CLAIMNAME}"
+                  }
+                }
+                EOF
+                curl -d @/workspace/post-body.json $SINK_URL
+            volumeMounts:
+            - mountPath: /workspace
+              name: workspace
+            env:
+              - name: SINK_URL
+                value: "http://el-okd-coreos-prod.okd-coreos.svc.cluster.local:8080"
+              - name: BRANCH
+                value: "release-4.15"
+              - name: OKD_VERSION
+                value: "4.15"
+              - name: RELEASE_STREAM
+                value: "next"
+              - name: ARTIFACTS_IMAGE
+                value: "registry.ci.openshift.org/origin/4.15:artifacts"
+              - name: TAG_LATEST
+                value: "true"
+              - name: CLAIMNAME
+                value: "pipeline-scos-4.15-pvc"
+            resources:
+              limits:
+                cpu: 100m
+                memory: 128Mi
+          restartPolicy: Never
+          dnsPolicy: ClusterFirst

base/core/persistentvolumeclaims/kustomization.yaml

@@ -1,5 +1,6 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - pvc-next.yaml
-  - pvc-stable.yaml
+  - pvc-4.13.yaml
+  - pvc-4.14.yaml
+  - pvc-4.15.yaml

base/core/persistentvolumeclaims/pvc-next.yaml → base/core/persistentvolumeclaims/pvc-4.13.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: pipeline-scos-next-pvc
+  name: pipeline-scos-4.13-pvc
 spec:
   accessModes:
     - ReadWriteOnce

base/core/persistentvolumeclaims/pvc-stable.yaml → base/core/persistentvolumeclaims/pvc-4.14.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: pipeline-scos-stable-pvc
+  name: pipeline-scos-4.14-pvc
 spec:
   accessModes:
     - ReadWriteOnce

base/core/persistentvolumeclaims/pvc-4.15.yaml

@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: pipeline-scos-4.15-pvc
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 40Gi
+  storageClassName: local

base/core/persistentvolumes/kustomization.yaml

@@ -1,5 +1,6 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - pv-next.yaml
-  - pv-stable.yaml
+  - pv-4.13.yaml
+  - pv-4.14.yaml
+  - pv-4.15.yaml

base/core/persistentvolumes/pv-next.yaml → base/core/persistentvolumes/pv-4.13.yaml

@@ -1,17 +1,20 @@
 apiVersion: v1
 kind: PersistentVolume
 metadata:
-  name: pipeline-scos-next-pv
+  name: pipeline-scos-4.13-pv
 spec:
   capacity:
     storage: 40Gi
   volumeMode: Filesystem
   accessModes:
   - ReadWriteOnce
   persistentVolumeReclaimPolicy: Delete
+  claimRef:
+    name: pipeline-scos-4.13-pvc
+    namespace: okd-coreos
   storageClassName: local
   local:
-    path: /tmp
+    path: /dev/sdb
   nodeAffinity:
     required:
       nodeSelectorTerms:

base/core/persistentvolumes/pv-stable.yaml → base/core/persistentvolumes/pv-4.14.yaml

@@ -1,17 +1,20 @@
 apiVersion: v1
 kind: PersistentVolume
 metadata:
-  name: pipeline-scos-stable-pv
+  name: pipeline-scos-4.14-pv
 spec:
   capacity:
     storage: 40Gi
   volumeMode: Filesystem
   accessModes:
   - ReadWriteOnce
   persistentVolumeReclaimPolicy: Delete
+  claimRef:
+    name: pipeline-scos-4.14-pvc
+    namespace: okd-coreos
   storageClassName: local
   local:
-    path: /tmp
+    path: /dev/sdb
   nodeAffinity:
     required:
       nodeSelectorTerms:

base/core/persistentvolumes/pv-4.15.yaml

@@ -0,0 +1,25 @@
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: pipeline-scos-4.15-pv
+spec:
+  capacity:
+    storage: 40Gi
+  volumeMode: Filesystem
+  accessModes:
+  - ReadWriteOnce
+  persistentVolumeReclaimPolicy: Delete
+  claimRef:
+    name: pipeline-scos-4.15-pvc
+    namespace: okd-coreos
+  storageClassName: local
+  local:
+    path: /dev/sdb
+  nodeAffinity:
+    required:
+      nodeSelectorTerms:
+      - matchExpressions:
+        - key: kubernetes.io/hostname
+          operator: In
+          values:
+          - host-192-168-111-72

base/image.openshift.io/imagestreams/coreos-assembler/imagestream.yaml

@@ -0,0 +1,14 @@
+kind: ImageStream
+apiVersion: image.openshift.io/v1
+metadata:
+  name: coreos-assembler
+spec:
+  lookupPolicy:
+    local: true
+  tags:
+    - name: "latest"
+      from:
+        kind: DockerImage
+        name: quay.io/coreos-assembler/coreos-assembler:latest
+      importPolicy:
+        scheduled: true

base/image.openshift.io/imagestreams/coreos-assembler/kustomization.yaml

@@ -0,0 +1,4 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - imagestream.yaml

base/tekton.dev/pipelines/kustomization.yaml

@@ -1,5 +1,4 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - okd-coreos-all.yaml
-  - okd-coreos-build.yaml
+  - okd-coreos.yaml