OKD-152: Add layered build for OKD-SCOS #46
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| apiVersion: security.openshift.io/v1 | ||
| kind: SecurityContextConstraints | ||
| metadata: | ||
| name: scc-admin | ||
| allowHostDirVolumePlugin: false | ||
| allowHostIPC: false | ||
| allowHostNetwork: false | ||
| allowHostPID: false | ||
| allowHostPorts: false | ||
| allowPrivilegeEscalation: true | ||
| allowPrivilegedContainer: true | ||
| allowedCapabilities: null | ||
| defaultAddCapabilities: null | ||
| fsGroup: | ||
| type: RunAsAny | ||
| groups: [] | ||
| priority: null | ||
| readOnlyRootFilesystem: false | ||
| requiredDropCapabilities: | ||
| - KILL | ||
| - MKNOD | ||
| - SYS_CHROOT | ||
| runAsUser: | ||
| type: RunAsAny | ||
| seLinuxContext: | ||
| type: RunAsAny | ||
| supplementalGroups: | ||
| type: RunAsAny | ||
| users: | ||
| - system:serviceaccount:okd-coreos:pipeline | ||
| volumes: | ||
| - awsElasticBlockStore | ||
| - azureDisk | ||
| - azureFile | ||
| - cephFS | ||
| - cinder | ||
| - configMap | ||
| - csi | ||
| - downwardAPI | ||
| - emptyDir | ||
| - ephemeral | ||
| - fc | ||
| - flexVolume | ||
| - flocker | ||
| - gcePersistentDisk | ||
| - gitRepo | ||
| - glusterfs | ||
| - iscsi | ||
| - nfs | ||
| - persistentVolumeClaim | ||
| - photonPersistentDisk | ||
| - portworxVolume | ||
| - projected | ||
| - quobyte | ||
| - rbd | ||
| - scaleIO | ||
| - secret | ||
| - storageOS | ||
| - vsphere |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| apiVersion: tekton.dev/v1beta1 | ||
| kind: Task | ||
| metadata: | ||
| name: build-layer | ||
| spec: | ||
| steps: | ||
| - image: quay.io/podman/stable:latest | ||
| name: build-layer | ||
| resources: {} | ||
| securityContext: | ||
| privileged: true | ||
| script: | | ||
| #!/usr/bin/env bash | ||
|
There was a problem hiding this comment. Could this Task be separated in future and run in a separate pipeline (like the 'future' payload one, as we can do for okd/fcos) and maintain the coreos pipeline to only build the base os? There was a problem hiding this comment. yes, it's definitely the plan to buid base and layer(s) separately! |
||
| set -euxo pipefail | ||
|
|
||
|
There was a problem hiding this comment. nit: whitespaces |
||
| dnf install -y jq | ||
|
|
||
|
There was a problem hiding this comment. nit: whitespaces |
||
| cd /srv/coreos | ||
|
|
||
| OSTREE_VERSION=$(jq -r '."ostree-version"' < builds/latest/$(uname -m)/meta.json) | ||
| OSTREE_TARFILE=$(jq -r '.images.ostree.path' < builds/latest/$(uname -m)/meta.json) | ||
|
|
||
| # the c9s.repo file is meant to be consumed by a COSA container | ||
| # where the RPM GPG keys are shipped in /usr/share/distribution-gpg-keys/centos | ||
| # SCOS however ships the keys in the /etc/pki/rpm-gpg | ||
| sed -i 's;/usr/share/distribution-gpg-keys/centos;/etc/pki/rpm-gpg;g' src/config/c9s.repo | ||
| sed -i 's/RPM-GPG-KEY-CentOS-Official/RPM-GPG-KEY-centosofficial/g' src/config/c9s.repo | ||
|
|
||
| cat <<EOF >> src/config/Dockerfile | ||
| FROM quay.io/okd/centos-stream-coreos-9:4.14-x86_64 | ||
|
There was a problem hiding this comment. This might be nice as a parameter |
||
| COPY rpms/ /srv/coreos/rpms/ | ||
|
There was a problem hiding this comment. It should be |
||
| COPY src/config/c9s.repo /etc/yum.repos.d/c9s.repo | ||
| COPY src/config/packages-openshift.yaml /etc/rpm-ostree/origin.d/packages-openshift.yaml | ||
| RUN cat /etc/os-release \ | ||
| && rpm-ostree --version \ | ||
| && ostree --version \ | ||
| && rpm-ostree ex rebuild \ | ||
| && rpm-ostree cleanup -m \ | ||
| && rm -rf /var/lib/unbound /srv/coreos/rpms /etc/rpm-ostree/origin.d /etc/yum.repos.d/c9s.repo \ | ||
| && ostree container commit | ||
|
|
||
| LABEL io.openshift.release.operator=true \ | ||
| io.openshift.build.version-display-names="machine-os=CentOS Stream CoreOS" \ | ||
| io.openshift.build.versions="machine-os=${OSTREE_VERSION}" | ||
|
|
||
| EOF | ||
|
|
||
| ls /srv/coreos/builds/latest/$(uname -m)/${OSTREE_TARFILE} | ||
| podman build \ | ||
| -f src/config/Dockerfile \ | ||
| -t ostree-okd \ | ||
| . | ||
| # mkdir /srv/ostree-okd | ||
| podman save --format oci-dir ostree-okd:latest -o /srv/ostree-okd | ||
| # podman tag localhost/ostree-okd quay.io/okd/stream-coreos-okd | ||
| # podman push quay.io/okd/stream-coreos-okd | ||
| # TODO Allow for pulling previously built base image, and for pushing the layered image | ||
| printf "%s" "OK" > $(results.output.path) | ||
| results: | ||
| - name: output | ||
| workspaces: | ||
| - mountPath: /srv | ||
|
There was a problem hiding this comment. For consistency with 067ce9d we should use There was a problem hiding this comment. And, replace all the references of |
||
| name: ws | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| apiVersion: tekton.dev/v1beta1 | ||
| kind: Task | ||
| metadata: | ||
| name: cosa-push-layered-container | ||
| spec: | ||
| params: | ||
| - name: target-registry | ||
| default: quay.io/okd | ||
| type: string | ||
| - name: container-image-name | ||
| default: stream-coreos-okd | ||
| type: string | ||
| - name: image | ||
| default: localhost/ostree-okd | ||
| type: string | ||
| - name: tag | ||
| default: "4.14" | ||
| type: string | ||
| - name: tag-latest | ||
| default: "false" | ||
| type: string | ||
| steps: | ||
| - image: 'quay.io/podman/stable:latest' | ||
| name: upload-image | ||
| resources: {} | ||
| securityContext: | ||
| privileged: true | ||
| script: | | ||
| #!/usr/bin/env bash | ||
| set -euxo pipefail | ||
|
|
||
| cd /srv/coreos | ||
| podman images | ||
| podman load -i /srv/ostree-okd | ||
| podman tag ostree-okd:latest $(params.target-registry)/$(params.container-image-name):$(params.tag)-$(uname -m) | ||
| podman push $(params.target-registry)/$(params.container-image-name):$(params.tag)-$(uname -m) --authfile=$(workspaces.regcred.path)/.dockerconfigjson | ||
| # cosa push-container --authfile=$(workspaces.regcred.path)/.dockerconfigjson --image=$(params.image) $(params.target-registry)/$(params.container-image-name) | ||
| # if [[ "$(params.tag-latest)" == "true" ]]; then | ||
| # # Add stable tag for import into Prow | ||
| # cosa push-container --authfile=$(workspaces.regcred.path)/.dockerconfigjson --image=$(params.image) $(params.target-registry)/$(params.container-image-name):$(params.tag)-$(uname -m) | ||
| # fi | ||
|
|
||
| workspaces: | ||
| - name: regcred | ||
| - mountPath: /srv | ||
|
There was a problem hiding this comment. |
||
| name: ws | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe we should run the
build-layertask aftercosa-testandcosa-upload-baseosin order to pull the freshlybaseosbuilt duringcosa-build-baseostask of the current pipeline. Otherwise, we would pull thebaseosimage from the latest pipeline run