Skip to content

Commit

Permalink
openshift-hack/images/os: delete
Browse files Browse the repository at this point in the history
All the logic there is geared towards `machine-os-content` which is no
longer used at all in the cluster.

Nowadays, the container to modify is `rhel-coreos`, which is what is
already being done in CI:

https://github.com/openshift/release/blob/463a8f244ba0f807e76e6fdf974f98d24efd1ced/ci-operator/config/openshift/kubernetes/openshift-kubernetes-master.yaml#L87-L97
  • Loading branch information
jlebon committed Feb 22, 2024
1 parent 2eba5a9 commit 692780f
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 71 deletions.
8 changes: 4 additions & 4 deletions REBASE.openshift.md
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

This file was deleted.

40 changes: 0 additions & 40 deletions openshift-hack/images/os/install.sh

This file was deleted.

0 comments on commit 692780f

Please sign in to comment.