Skip to content

mco: Update to use rhel-coreos in master+4.14 #37082

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

Merged
openshift-merge-robot merged 1 commit into from
Mar 9, 2023
Merged

mco: Update to use rhel-coreos in master+4.14 #37082

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
4 changes: 2 additions & 2 deletions ...or/config/openshift/machine-config-operator/openshift-machine-config-operator-master.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ base_images:
ocp_os:
name: "4.14"
namespace: ocp
tag: rhel-coreos-8
tag: rhel-coreos
build_root:
from_repository: true
images:
Expand All @@ -50,7 +50,7 @@ images:
- registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.19-openshift-4.13
to: machine-config-operator
- dockerfile_literal: |
FROM registry.ci.openshift.org/ocp/4.13:rhel-coreos-8
FROM registry.ci.openshift.org/ocp/4.13:rhel-coreos
Copy link
Contributor

@sinnykumari sinnykumari Mar 9, 2023

Choose a reason for hiding this comment

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

Probably doesn't matter much at this moment but should the base image be registry.ci.openshift.org/ocp/4.14:rhel-coreos ?

RUN curl -L 'https://github.com/BurntSushi/ripgrep/releases/download/13.0.0/ripgrep-13.0.0-x86_64-unknown-linux-musl.tar.gz' | tar -xvz -C /usr/bin --strip-components=1 ripgrep-13.0.0-x86_64-unknown-linux-musl/rg && \
chmod +x /usr/bin/rg && \
curl -Lo /usr/bin/yq 'https://github.com/mikefarah/yq/releases/download/v4.30.8/yq_linux_amd64' && \
Expand Down
4 changes: 2 additions & 2 deletions ...fig/openshift/machine-config-operator/openshift-machine-config-operator-release-4.14.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ base_images:
ocp_os:
name: "4.14"
namespace: ocp
tag: rhel-coreos-8
tag: rhel-coreos
build_root:
from_repository: true
images:
Expand All @@ -50,7 +50,7 @@ images:
- registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.19-openshift-4.13
to: machine-config-operator
- dockerfile_literal: |
FROM registry.ci.openshift.org/ocp/4.13:rhel-coreos-8
FROM registry.ci.openshift.org/ocp/4.14:rhel-coreos
RUN curl -L 'https://github.com/BurntSushi/ripgrep/releases/download/13.0.0/ripgrep-13.0.0-x86_64-unknown-linux-musl.tar.gz' | tar -xvz -C /usr/bin --strip-components=1 ripgrep-13.0.0-x86_64-unknown-linux-musl/rg && \
chmod +x /usr/bin/rg && \
curl -Lo /usr/bin/yq 'https://github.com/mikefarah/yq/releases/download/v4.30.8/yq_linux_amd64' && \
Expand Down