-
Notifications
You must be signed in to change notification settings - Fork 111
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
extensions: drop extensions for el-only variants
The extensions container contains OCP-versioned packages, so it needs to be built alongside (or more likely as a follow-up to) the node image. So then it doesn't make sense to have extensions symlinks for the el-only variants. Nuke those. The diff here looks scarier than it is. It's mostly shuffling files around so that some things that were previously symlinks are now files. Essentially: ``` mv extensions-rhel-9.4.yaml extensions-ocp-rhel-9.4.yaml mv extensions-rhel-9.6.yaml extensions-ocp-rhel-9.6.yaml mv extensions-c9s.yaml extensions-okd-c9s.yaml ``` See also: https://issues.redhat.com/browse/COS-3017
- Loading branch information
Showing
6 changed files
with
263 additions
and
266 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains 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,87 @@ | ||
| # RPMs as operating system extensions, distinct from the base ostree commit/image | ||
| # https://github.com/openshift/enhancements/blob/master/enhancements/rhcos/extensions.md | ||
| # and https://github.com/coreos/fedora-coreos-tracker/issues/401 | ||
|
|
||
| extensions: | ||
| # https://issues.redhat.com/browse/RFE-4177 | ||
| wasm: | ||
| architectures: | ||
| - x86_64 | ||
| - aarch64 | ||
| repos: | ||
| - rhel-9.4-server-ose-4.19 | ||
| packages: | ||
| - crun-wasm | ||
| # https://github.com/coreos/fedora-coreos-tracker/issues/1504 | ||
| ipsec: | ||
| packages: | ||
| - libreswan | ||
| - NetworkManager-libreswan | ||
| # https://github.com/coreos/fedora-coreos-tracker/issues/326 | ||
| usbguard: | ||
| packages: | ||
| - usbguard | ||
| kerberos: | ||
| packages: | ||
| - krb5-workstation | ||
| - libkadm5 | ||
| # https://github.com/kmods-via-containers/kmods-via-containers/issues/3 | ||
| # https://gitlab.cee.redhat.com/coreos/redhat-coreos/merge_requests/866 | ||
| # These are currently overlaid onto the host so that they can be bind-mounted | ||
| # into build containers... in the future they should be a `development` | ||
| # extension: https://github.com/openshift/machine-config-operator/pull/2143. | ||
| kernel-devel: | ||
| packages: | ||
| - kernel-devel | ||
| - kernel-headers | ||
| match-base-evr: kernel | ||
| # These are already in the base, so they're not OS extensions, but they're | ||
| # useful to have in RPM form to install in kmod build containers. | ||
| kernel: | ||
| kind: development | ||
| packages: | ||
| - kernel | ||
| - kernel-core | ||
| - kernel-modules | ||
| - kernel-modules-extra | ||
| match-base-evr: kernel | ||
| # GRPA-2822 | ||
| # https://github.com/openshift/machine-config-operator/pull/1330 | ||
| # https://github.com/openshift/enhancements/blob/master/enhancements/support-for-realtime-kernel.md | ||
| kernel-rt: | ||
| architectures: | ||
| - x86_64 | ||
| repos: | ||
| - rhel-9.4-nfv | ||
| packages: | ||
| - kernel-rt-core | ||
| - kernel-rt-kvm | ||
| - kernel-rt-modules | ||
| - kernel-rt-modules-extra | ||
| - kernel-rt-devel | ||
| match-base-evr: kernel | ||
| # https://github.com/openshift/machine-config-operator/pull/2456 | ||
| # https://github.com/openshift/enhancements/blob/master/enhancements/sandboxed-containers/sandboxed-containers-tech-preview.md | ||
| # GRPA-3123 | ||
| # - kata-containers | ||
| sandboxed-containers: | ||
| architectures: | ||
| - x86_64 | ||
| - s390x | ||
| repos: | ||
| - rhel-9.4-server-ose-4.19 | ||
| packages: | ||
| - kata-containers | ||
| # https://issues.redhat.com/browse/COS-2402 | ||
| kernel-64k: | ||
| architectures: | ||
| - aarch64 | ||
| packages: | ||
| - kernel-64k-core | ||
| - kernel-64k-modules | ||
| - kernel-64k-modules-core | ||
| - kernel-64k-modules-extra | ||
| # https://issues.redhat.com/browse/COS-2940 | ||
| sysstat: | ||
| packages: | ||
| - sysstat |
This file was deleted.
Oops, something went wrong.
This file contains 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,87 @@ | ||
| # RPMs as operating system extensions, distinct from the base ostree commit/image | ||
| # https://github.com/openshift/enhancements/blob/master/enhancements/rhcos/extensions.md | ||
| # and https://github.com/coreos/fedora-coreos-tracker/issues/401 | ||
|
|
||
| extensions: | ||
| # https://issues.redhat.com/browse/RFE-4177 | ||
| wasm: | ||
| architectures: | ||
| - x86_64 | ||
| - aarch64 | ||
| repos: | ||
| - rhel-9.6-server-ose-4.19 | ||
| packages: | ||
| - crun-wasm | ||
| # https://github.com/coreos/fedora-coreos-tracker/issues/1504 | ||
| ipsec: | ||
| packages: | ||
| - libreswan | ||
| - NetworkManager-libreswan | ||
| # https://github.com/coreos/fedora-coreos-tracker/issues/326 | ||
| usbguard: | ||
| packages: | ||
| - usbguard | ||
| kerberos: | ||
| packages: | ||
| - krb5-workstation | ||
| - libkadm5 | ||
| # https://github.com/kmods-via-containers/kmods-via-containers/issues/3 | ||
| # https://gitlab.cee.redhat.com/coreos/redhat-coreos/merge_requests/866 | ||
| # These are currently overlaid onto the host so that they can be bind-mounted | ||
| # into build containers... in the future they should be a `development` | ||
| # extension: https://github.com/openshift/machine-config-operator/pull/2143. | ||
| kernel-devel: | ||
| packages: | ||
| - kernel-devel | ||
| - kernel-headers | ||
| match-base-evr: kernel | ||
| # These are already in the base, so they're not OS extensions, but they're | ||
| # useful to have in RPM form to install in kmod build containers. | ||
| kernel: | ||
| kind: development | ||
| packages: | ||
| - kernel | ||
| - kernel-core | ||
| - kernel-modules | ||
| - kernel-modules-extra | ||
| match-base-evr: kernel | ||
| # GRPA-2822 | ||
| # https://github.com/openshift/machine-config-operator/pull/1330 | ||
| # https://github.com/openshift/enhancements/blob/master/enhancements/support-for-realtime-kernel.md | ||
| kernel-rt: | ||
| architectures: | ||
| - x86_64 | ||
| repos: | ||
| - rhel-9.6-nfv | ||
| packages: | ||
| - kernel-rt-core | ||
| - kernel-rt-kvm | ||
| - kernel-rt-modules | ||
| - kernel-rt-modules-extra | ||
| - kernel-rt-devel | ||
| match-base-evr: kernel | ||
| # https://github.com/openshift/machine-config-operator/pull/2456 | ||
| # https://github.com/openshift/enhancements/blob/master/enhancements/sandboxed-containers/sandboxed-containers-tech-preview.md | ||
| # GRPA-3123 | ||
| # - kata-containers | ||
| sandboxed-containers: | ||
| architectures: | ||
| - x86_64 | ||
| - s390x | ||
| repos: | ||
| - rhel-9.6-server-ose-4.19 | ||
| packages: | ||
| - kata-containers | ||
| # https://issues.redhat.com/browse/COS-2402 | ||
| kernel-64k: | ||
| architectures: | ||
| - aarch64 | ||
| packages: | ||
| - kernel-64k-core | ||
| - kernel-64k-modules | ||
| - kernel-64k-modules-core | ||
| - kernel-64k-modules-extra | ||
| # https://issues.redhat.com/browse/COS-2940 | ||
| sysstat: | ||
| packages: | ||
| - sysstat |
This file was deleted.
Oops, something went wrong.
This file contains 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,89 @@ | ||
| # RPMs as operating system extensions, distinct from the base ostree commit/image | ||
| # https://github.com/openshift/enhancements/blob/master/enhancements/rhcos/extensions.md | ||
| # and https://github.com/coreos/fedora-coreos-tracker/issues/401 | ||
|
|
||
| repos: | ||
| - c9s-sig-virtualization | ||
|
|
||
| extensions: | ||
| # https://issues.redhat.com/browse/RFE-4177 | ||
| # wasm: | ||
| # architectures: | ||
| # - x86_64 | ||
| # - aarch64 | ||
| # repos: | ||
| # - appstream | ||
| # packages: | ||
| # - crun-wasm | ||
| # https://github.com/coreos/fedora-coreos-tracker/issues/1504 | ||
| ipsec: | ||
| packages: | ||
| - libreswan | ||
| - NetworkManager-libreswan | ||
| # https://github.com/coreos/fedora-coreos-tracker/issues/326 | ||
| usbguard: | ||
| packages: | ||
| - usbguard | ||
| kerberos: | ||
| packages: | ||
| - krb5-workstation | ||
| - libkadm5 | ||
| # https://github.com/kmods-via-containers/kmods-via-containers/issues/3 | ||
| # https://gitlab.cee.redhat.com/coreos/redhat-coreos/merge_requests/866 | ||
| # These are currently overlaid onto the host so that they can be bind-mounted | ||
| # into build containers... in the future they should be a `development` | ||
| # extension: https://github.com/openshift/machine-config-operator/pull/2143. | ||
| kernel-devel: | ||
| packages: | ||
| - kernel-devel | ||
| - kernel-headers | ||
| match-base-evr: kernel | ||
| # These are already in the base, so they're not OS extensions, but they're | ||
| # useful to have in RPM form to install in kmod build containers. | ||
| kernel: | ||
| kind: development | ||
| packages: | ||
| - kernel | ||
| - kernel-core | ||
| - kernel-modules | ||
| - kernel-modules-extra | ||
| match-base-evr: kernel | ||
| # GRPA-2822 | ||
| # https://github.com/openshift/machine-config-operator/pull/1330 | ||
| # https://github.com/openshift/enhancements/blob/master/enhancements/support-for-realtime-kernel.md | ||
| kernel-rt: | ||
| architectures: | ||
| - x86_64 | ||
| repos: | ||
| - c9s-nfv | ||
| packages: | ||
| - kernel-rt-core | ||
| - kernel-rt-kvm | ||
| - kernel-rt-modules | ||
| - kernel-rt-modules-extra | ||
| - kernel-rt-devel | ||
| match-base-evr: kernel | ||
| # https://github.com/openshift/machine-config-operator/pull/2456 | ||
| # https://github.com/openshift/enhancements/blob/master/enhancements/sandboxed-containers/sandboxed-containers-tech-preview.md | ||
| # GRPA-3123 | ||
| # - kata-containers | ||
| sandboxed-containers: | ||
| architectures: | ||
| - x86_64 | ||
| repos: | ||
| - c9s-sig-virtualization | ||
| packages: | ||
| - kata-containers | ||
| # https://issues.redhat.com/browse/COS-2402 | ||
| kernel-64k: | ||
| architectures: | ||
| - aarch64 | ||
| packages: | ||
| - kernel-64k-core | ||
| - kernel-64k-modules | ||
| - kernel-64k-modules-core | ||
| - kernel-64k-modules-extra | ||
| # https://issues.redhat.com/browse/COS-2940 | ||
| sysstat: | ||
| packages: | ||
| - sysstat |
Oops, something went wrong.