Skip to content

MCO-392: openshift-hack/images/os: delete #1805

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-bot merged 1 commit into from
Mar 6, 2024
Merged

MCO-392: openshift-hack/images/os: delete #1805

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
8 changes: 4 additions & 4 deletions REBASE.openshift.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,10 +228,10 @@ kubernetes.

## Update base-os and test images

To be able to use the latest kubelet from a pull request, in this repository
we build [machine-os-content image](openshift-hack/images/os/Dockerfile).
Make sure that both `FROM` and `curl` operation in `RUN` command use appropriate
OCP version which corresponds with what we have in the [hyperkube image](openshift-hack/images/hyperkube/Dockerfile.rhel).
To be able to use the latest kubelet from a pull request, the openshift/release
job layers the built RPM [on top of the `rhel-coreos` image](https://github.com/openshift/release/blob/78568fbde1ee9a15bc6ab08c7c49ae3539d3e302/ci-operator/config/openshift/kubernetes/openshift-kubernetes-master.yaml#L102-L113).
Make sure that the `FROM` uses the appropriate OCP version which corresponds
with what we have in the [hyperkube image](openshift-hack/images/hyperkube/Dockerfile.rhel).

Similarly, update `FROM` in [test image](openshift-hack/images/tests/Dockerfile.rhel)
to match the one from [hyperkube image](openshift-hack/images/hyperkube/Dockerfile.rhel).
Expand Down
27 changes: 0 additions & 27 deletions openshift-hack/images/os/Dockerfile
View file
Open in desktop

This file was deleted.

40 changes: 0 additions & 40 deletions openshift-hack/images/os/install.sh
View file
Open in desktop

This file was deleted.