Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

openshift-os: promote openshift-os-src image #31973

Closed
wants to merge 1 commit into from
Closed

openshift-os: promote openshift-os-src image #31973

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions ci-operator/config/openshift/os/openshift-os-master.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ base_images:
name: coreos-assembler
namespace: coreos
tag: latest
ubi_minimal:
name: ubi-minimal
namespace: ocp
tag: "8"
build_root:
image_stream_tag:
name: fcos-buildroot
Expand Down Expand Up @@ -34,6 +38,17 @@ images:
as:
- registry.ci.openshift.org/coreos/coreos-assembler:latest
to: build-image
- dockerfile_literal: |
# just the source code
FROM registry.access.redhat.com/ubi9/ubi-minimal
WORKDIR /src
# Copy the source code
COPY . .
inputs:
ubi_minimal:
as:
- registry.access.redhat.com/ubi9/ubi-minimal
to: openshift-os-src
promotion:
excluded_images:
- build-image
Expand Down
15 changes: 15 additions & 0 deletions ci-operator/config/openshift/os/openshift-os-release-4.12.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ base_images:
name: coreos-assembler
namespace: coreos
tag: latest
ubi_minimal:
name: ubi-minimal
namespace: ocp
tag: "8"
build_root:
image_stream_tag:
name: fcos-buildroot
Expand Down Expand Up @@ -34,6 +38,17 @@ images:
as:
- registry.ci.openshift.org/coreos/coreos-assembler:latest
to: build-image
- dockerfile_literal: |
# just the source code
FROM registry.access.redhat.com/ubi9/ubi-minimal
WORKDIR /src
# Copy the source code
COPY . .
Copy link
Member

@LorbusChris LorbusChris Sep 4, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hm I'm not sure I like the complexity of introducing another image for this, on the other hand having the the os git submodule in okd-machine-os isn't great either. If we go this way, local rebuilds of okd-machine-os will be trickier, as it might not be obvious how the openshift-os-src image is created.

Currently, all of this would be for just the 06gcp-routes overlay. Alternatively we could carry a copy of the gcp-routes overlay that would have to be updated manually (it's 3 files). Maybe there's even a github action to keep dirs/files in sync across repos and create a PR automatically.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Alternatively we could carry a copy of the gcp-routes overlay that would have to be updated manually (it's 3 files)

Right, that's an option, however more overlays may need to be carried (i.e. dhcp-chrony) and we won't get fixes for those automatically, so I'd prefer to get a copy of these overlays automatically. Submodules is a solution, but a fairly ugly one

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This discussion overlaps some with bits of https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/OPSZ7I4JLFTDC65FPEOUN4CZJNEGKGDS/ - basically, perhaps we should be factoring these systems units into RPMs.

Something like openshift-node-common.rpm or something? Actually if we did this, it would also be a good place to take a stab at some of openshift/machine-config-operator#3137 too.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(That'd be a nontrivial change, I have no strong opinion on a shorter-term/easier solution of promoting the src container versus submodules etc.)

inputs:
ubi_minimal:
as:
- registry.access.redhat.com/ubi9/ubi-minimal
to: openshift-os-src
promotion:
disabled: true
excluded_images:
Expand Down
15 changes: 15 additions & 0 deletions ci-operator/config/openshift/os/openshift-os-release-4.13.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ base_images:
name: coreos-assembler
namespace: coreos
tag: latest
ubi_minimal:
name: ubi-minimal
namespace: ocp
tag: "8"
build_root:
image_stream_tag:
name: fcos-buildroot
Expand Down Expand Up @@ -34,6 +38,17 @@ images:
as:
- registry.ci.openshift.org/coreos/coreos-assembler:latest
to: build-image
- dockerfile_literal: |
# just the source code
FROM registry.access.redhat.com/ubi9/ubi-minimal
WORKDIR /src
# Copy the source code
COPY . .
inputs:
ubi_minimal:
as:
- registry.access.redhat.com/ubi9/ubi-minimal
to: openshift-os-src
promotion:
excluded_images:
- build-image
Expand Down
1 change: 1 addition & 0 deletions core-services/image-mirroring/openshift/mapping_origin_4_12
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,7 @@ registry.ci.openshift.org/origin/4.12:okd-rpms quay.io/openshift/origin-okd-rpms
registry.ci.openshift.org/origin/4.12:olm-rukpak quay.io/openshift/origin-olm-rukpak:4.12 quay.io/openshift/origin-olm-rukpak:4.12.0 quay.io/openshift/origin-olm-rukpak:latest
registry.ci.openshift.org/origin/4.12:openshift-apiserver quay.io/openshift/origin-openshift-apiserver:4.12 quay.io/openshift/origin-openshift-apiserver:4.12.0 quay.io/openshift/origin-openshift-apiserver:latest
registry.ci.openshift.org/origin/4.12:openshift-controller-manager quay.io/openshift/origin-openshift-controller-manager:4.12 quay.io/openshift/origin-openshift-controller-manager:4.12.0 quay.io/openshift/origin-openshift-controller-manager:latest
registry.ci.openshift.org/origin/4.12:openshift-os-src quay.io/openshift/origin-openshift-os-src:4.12 quay.io/openshift/origin-openshift-os-src:4.12.0 quay.io/openshift/origin-openshift-os-src:latest
registry.ci.openshift.org/origin/4.12:openshift-state-metrics quay.io/openshift/origin-openshift-state-metrics:4.12 quay.io/openshift/origin-openshift-state-metrics:4.12.0 quay.io/openshift/origin-openshift-state-metrics:latest
registry.ci.openshift.org/origin/4.12:openstack-cinder-csi-driver quay.io/openshift/origin-openstack-cinder-csi-driver:4.12 quay.io/openshift/origin-openstack-cinder-csi-driver:4.12.0 quay.io/openshift/origin-openstack-cinder-csi-driver:latest
registry.ci.openshift.org/origin/4.12:openstack-cinder-csi-driver-operator quay.io/openshift/origin-openstack-cinder-csi-driver-operator:4.12 quay.io/openshift/origin-openstack-cinder-csi-driver-operator:4.12.0 quay.io/openshift/origin-openstack-cinder-csi-driver-operator:latest
Expand Down