From f2a4f21969ee87ca52af8122bfaf944ddbeb6eb7 Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Thu, 5 Dec 2024 16:40:19 -0500 Subject: [PATCH] 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 --- extensions-c9s.yaml | 89 ----------------------------------- extensions-ocp-rhel-9.4.yaml | 88 ++++++++++++++++++++++++++++++++++- extensions-ocp-rhel-9.6.yaml | 88 ++++++++++++++++++++++++++++++++++- extensions-okd-c9s.yaml | 90 +++++++++++++++++++++++++++++++++++- extensions-rhel-9.4.yaml | 87 ---------------------------------- extensions-rhel-9.6.yaml | 87 ---------------------------------- 6 files changed, 263 insertions(+), 266 deletions(-) delete mode 100644 extensions-c9s.yaml mode change 120000 => 100644 extensions-ocp-rhel-9.4.yaml mode change 120000 => 100644 extensions-ocp-rhel-9.6.yaml mode change 120000 => 100644 extensions-okd-c9s.yaml delete mode 100644 extensions-rhel-9.4.yaml delete mode 100644 extensions-rhel-9.6.yaml diff --git a/extensions-c9s.yaml b/extensions-c9s.yaml deleted file mode 100644 index d13e15fe..00000000 --- a/extensions-c9s.yaml +++ /dev/null @@ -1,89 +0,0 @@ -# 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 diff --git a/extensions-ocp-rhel-9.4.yaml b/extensions-ocp-rhel-9.4.yaml deleted file mode 120000 index 94e08ff2..00000000 --- a/extensions-ocp-rhel-9.4.yaml +++ /dev/null @@ -1 +0,0 @@ -extensions-rhel-9.4.yaml \ No newline at end of file diff --git a/extensions-ocp-rhel-9.4.yaml b/extensions-ocp-rhel-9.4.yaml new file mode 100644 index 00000000..81ad4cc9 --- /dev/null +++ b/extensions-ocp-rhel-9.4.yaml @@ -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 diff --git a/extensions-ocp-rhel-9.6.yaml b/extensions-ocp-rhel-9.6.yaml deleted file mode 120000 index 62e20bee..00000000 --- a/extensions-ocp-rhel-9.6.yaml +++ /dev/null @@ -1 +0,0 @@ -extensions-rhel-9.6.yaml \ No newline at end of file diff --git a/extensions-ocp-rhel-9.6.yaml b/extensions-ocp-rhel-9.6.yaml new file mode 100644 index 00000000..39a7604f --- /dev/null +++ b/extensions-ocp-rhel-9.6.yaml @@ -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 diff --git a/extensions-okd-c9s.yaml b/extensions-okd-c9s.yaml deleted file mode 120000 index dedefe81..00000000 --- a/extensions-okd-c9s.yaml +++ /dev/null @@ -1 +0,0 @@ -extensions-c9s.yaml \ No newline at end of file diff --git a/extensions-okd-c9s.yaml b/extensions-okd-c9s.yaml new file mode 100644 index 00000000..d13e15fe --- /dev/null +++ b/extensions-okd-c9s.yaml @@ -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 diff --git a/extensions-rhel-9.4.yaml b/extensions-rhel-9.4.yaml deleted file mode 100644 index 81ad4cc9..00000000 --- a/extensions-rhel-9.4.yaml +++ /dev/null @@ -1,87 +0,0 @@ -# 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 diff --git a/extensions-rhel-9.6.yaml b/extensions-rhel-9.6.yaml deleted file mode 100644 index 39a7604f..00000000 --- a/extensions-rhel-9.6.yaml +++ /dev/null @@ -1,87 +0,0 @@ -# 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