Skip to content

Commit 33ed444

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #5598 from pablintino/mco-2088
MCO-2088: Remove wasm extension
2 parents 62b3e75 + 28f9c72 commit 33ed444

5 files changed

Lines changed: 32 additions & 33 deletions

File tree

‎pkg/controller/common/helpers.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -529,7 +529,6 @@ func SupportedExtensions() map[string][]string {
529529
// Each extension keeps a list of packages required to get enabled on host.
530530
return map[string][]string{
531531
"two-node-ha": {"pacemaker", "pcs", "fence-agents-all"},
532-
"wasm": {"crun-wasm"},
533532
"ipsec": {"NetworkManager-libreswan", "libreswan"},
534533
"usbguard": {"usbguard"},
535534
"kerberos": {"krb5-workstation", "libkadm5"},

‎pkg/controller/common/helpers_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -967,8 +967,8 @@ func TestGetPackagesForSupportedExtensions(t *testing.T) {
967967
},
968968
{
969969
name: "Supported single package extension",
970-
extensions: []string{"wasm"},
971-
expectedPackages: []string{"crun-wasm"},
970+
extensions: []string{"sysstat"},
971+
expectedPackages: []string{"sysstat"},
972972
},
973973
{
974974
name: "Supported single multi-package extension",

‎pkg/daemon/update_test.go‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -871,58 +871,58 @@ func TestGenerateExtensionsArgs(t *testing.T) {
871871
expected: []string{},
872872
},
873873
{
874-
name: "no extensions installed, install wasm",
874+
name: "no extensions installed, install sysstat",
875875
installedSet: sets.New[string](),
876-
extensions: []string{"wasm"},
877-
expected: []string{constants.RPMOSTreeInstallArg, "crun-wasm"},
876+
extensions: []string{"sysstat"},
877+
expected: []string{constants.RPMOSTreeInstallArg, "sysstat"},
878878
},
879879
{
880880
name: "no extensions installed, install multiple extensions",
881881
installedSet: sets.New[string](),
882-
extensions: []string{"wasm", "ipsec"},
883-
expected: []string{constants.RPMOSTreeInstallArg, "NetworkManager-libreswan", constants.RPMOSTreeInstallArg, "crun-wasm", constants.RPMOSTreeInstallArg, "libreswan"},
882+
extensions: []string{"sysstat", "ipsec"},
883+
expected: []string{constants.RPMOSTreeInstallArg, "NetworkManager-libreswan", constants.RPMOSTreeInstallArg, "sysstat", constants.RPMOSTreeInstallArg, "libreswan"},
884884
},
885885
{
886-
name: "wasm already installed, require wasm",
887-
installedSet: sets.New("crun-wasm"),
888-
extensions: []string{"wasm"},
886+
name: "sysstat already installed, require sysstat",
887+
installedSet: sets.New("sysstat"),
888+
extensions: []string{"sysstat"},
889889
expected: []string{},
890890
},
891891
{
892-
name: "wasm installed, no extensions required",
893-
installedSet: sets.New("crun-wasm"),
892+
name: "sysstat installed, no extensions required",
893+
installedSet: sets.New("sysstat"),
894894
extensions: []string{},
895-
expected: []string{constants.RPMOSTreeUninstallArg, "crun-wasm"},
895+
expected: []string{constants.RPMOSTreeUninstallArg, "sysstat"},
896896
},
897897
{
898-
name: "wasm and ipsec installed, only wasm required",
899-
installedSet: sets.New("crun-wasm", "NetworkManager-libreswan", "libreswan"),
900-
extensions: []string{"wasm"},
898+
name: "sysstat and ipsec installed, only sysstat required",
899+
installedSet: sets.New("sysstat", "NetworkManager-libreswan", "libreswan"),
900+
extensions: []string{"sysstat"},
901901
expected: []string{constants.RPMOSTreeUninstallArg, "NetworkManager-libreswan", constants.RPMOSTreeUninstallArg, "libreswan"},
902902
},
903903
{
904904
name: "some packages installed, switch to different extension",
905-
installedSet: sets.New("crun-wasm"),
905+
installedSet: sets.New("sysstat"),
906906
extensions: []string{"ipsec"},
907-
expected: []string{constants.RPMOSTreeInstallArg, "NetworkManager-libreswan", constants.RPMOSTreeInstallArg, "libreswan", constants.RPMOSTreeUninstallArg, "crun-wasm"},
907+
expected: []string{constants.RPMOSTreeInstallArg, "NetworkManager-libreswan", constants.RPMOSTreeInstallArg, "libreswan", constants.RPMOSTreeUninstallArg, "sysstat"},
908908
},
909909
{
910910
name: "complex scenario with two-node-ha",
911-
installedSet: sets.New("pacemaker", "crun-wasm"),
911+
installedSet: sets.New("pacemaker", "sysstat"),
912912
extensions: []string{"two-node-ha", "usbguard"},
913-
expected: []string{constants.RPMOSTreeInstallArg, "fence-agents-all", constants.RPMOSTreeInstallArg, "pcs", constants.RPMOSTreeInstallArg, "usbguard", constants.RPMOSTreeUninstallArg, "crun-wasm"},
913+
expected: []string{constants.RPMOSTreeInstallArg, "fence-agents-all", constants.RPMOSTreeInstallArg, "pcs", constants.RPMOSTreeInstallArg, "usbguard", constants.RPMOSTreeUninstallArg, "sysstat"},
914914
},
915915
{
916916
name: "non-extension packages installed should not be uninstalled",
917917
installedSet: sets.New("random-package", "another-package"),
918-
extensions: []string{"wasm"},
919-
expected: []string{constants.RPMOSTreeInstallArg, "crun-wasm"},
918+
extensions: []string{"sysstat"},
919+
expected: []string{constants.RPMOSTreeInstallArg, "sysstat"},
920920
},
921921
{
922922
name: "all supported extensions",
923923
installedSet: sets.New[string](),
924-
extensions: []string{"two-node-ha", "wasm", "ipsec", "usbguard", "kerberos", "kernel-devel", "sandboxed-containers", "sysstat"},
925-
expected: []string{constants.RPMOSTreeInstallArg, "NetworkManager-libreswan", constants.RPMOSTreeInstallArg, "crun-wasm", constants.RPMOSTreeInstallArg, "fence-agents-all", constants.RPMOSTreeInstallArg, "kata-containers", constants.RPMOSTreeInstallArg, "kernel-devel", constants.RPMOSTreeInstallArg, "kernel-headers", constants.RPMOSTreeInstallArg, "krb5-workstation", constants.RPMOSTreeInstallArg, "libkadm5", constants.RPMOSTreeInstallArg, "libreswan", constants.RPMOSTreeInstallArg, "pacemaker", constants.RPMOSTreeInstallArg, "pcs", constants.RPMOSTreeInstallArg, "sysstat", constants.RPMOSTreeInstallArg, "usbguard"},
924+
extensions: []string{"two-node-ha", "ipsec", "usbguard", "kerberos", "kernel-devel", "sandboxed-containers", "sysstat"},
925+
expected: []string{constants.RPMOSTreeInstallArg, "NetworkManager-libreswan", constants.RPMOSTreeInstallArg, "fence-agents-all", constants.RPMOSTreeInstallArg, "kata-containers", constants.RPMOSTreeInstallArg, "kernel-devel", constants.RPMOSTreeInstallArg, "kernel-headers", constants.RPMOSTreeInstallArg, "krb5-workstation", constants.RPMOSTreeInstallArg, "libkadm5", constants.RPMOSTreeInstallArg, "libreswan", constants.RPMOSTreeInstallArg, "pacemaker", constants.RPMOSTreeInstallArg, "pcs", constants.RPMOSTreeInstallArg, "sysstat", constants.RPMOSTreeInstallArg, "usbguard"},
926926
},
927927
}
928928

‎test/e2e-2of2/extension_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ func TestExtensions(t *testing.T) {
5555
Config: runtime.RawExtension{
5656
Raw: helpers.MarshalOrDie(ctrlcommon.NewIgnConfig()),
5757
},
58-
Extensions: []string{"two-node-ha", "wasm", "ipsec", "usbguard", "kerberos", "kernel-devel", "sandboxed-containers", "sysstat"},
58+
Extensions: []string{"two-node-ha", "ipsec", "usbguard", "kerberos", "kernel-devel", "sandboxed-containers", "sysstat"},
5959
},
6060
}
6161

@@ -80,12 +80,12 @@ func TestExtensions(t *testing.T) {
8080
if isOKD {
8181
// OKD does not support grouped extensions yet, so installing kernel-devel will not also pull in kernel-headers
8282
// "sandboxed-containers" extension is not available on OKD
83-
installedPackages = helpers.ExecCmdOnNode(t, cs, infraNode, "chroot", "/rootfs", "rpm", "-q", "pacemaker", "pcs", "fence-agents-all", "crun-wasm", "libreswan", "usbguard", "kernel-devel", "sysstat")
83+
installedPackages = helpers.ExecCmdOnNode(t, cs, infraNode, "chroot", "/rootfs", "rpm", "-q", "pacemaker", "pcs", "fence-agents-all", "libreswan", "usbguard", "kernel-devel", "sysstat")
8484
// "kerberos" extension is not available on OKD
8585
expectedPackages = []string{"libreswan", "usbguard", "kernel-devel"}
8686
} else {
87-
installedPackages = helpers.ExecCmdOnNode(t, cs, infraNode, "chroot", "/rootfs", "rpm", "-q", "pacemaker", "pcs", "fence-agents-all", "crun-wasm", "libreswan", "usbguard", "kernel-devel", "kernel-headers", "kata-containers", "krb5-workstation", "libkadm5", "sysstat")
88-
expectedPackages = []string{"pacemaker", "pcs", "fence-agents-all", "crun-wasm", "libreswan", "usbguard", "kernel-devel", "kernel-headers", "kata-containers", "krb5-workstation", "libkadm5", "sysstat"}
87+
installedPackages = helpers.ExecCmdOnNode(t, cs, infraNode, "chroot", "/rootfs", "rpm", "-q", "pacemaker", "pcs", "fence-agents-all", "libreswan", "usbguard", "kernel-devel", "kernel-headers", "kata-containers", "krb5-workstation", "libkadm5", "sysstat")
88+
expectedPackages = []string{"pacemaker", "pcs", "fence-agents-all", "libreswan", "usbguard", "kernel-devel", "kernel-headers", "kata-containers", "krb5-workstation", "libkadm5", "sysstat"}
8989

9090
}
9191
for _, v := range expectedPackages {

‎test/e2e-single-node/sno_mcd_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ func TestExtensions(t *testing.T) {
196196
Config: runtime.RawExtension{
197197
Raw: helpers.MarshalOrDie(ctrlcommon.NewIgnConfig()),
198198
},
199-
Extensions: []string{"two-node-ha", "wasm", "ipsec", "usbguard", "kernel-devel", "kerberos", "sysstat"},
199+
Extensions: []string{"two-node-ha", "ipsec", "usbguard", "kernel-devel", "kerberos", "sysstat"},
200200
},
201201
}
202202

@@ -212,8 +212,8 @@ func TestExtensions(t *testing.T) {
212212
assert.Equal(t, node.Annotations[constants.CurrentMachineConfigAnnotationKey], renderedConfig)
213213
assert.Equal(t, node.Annotations[constants.MachineConfigDaemonStateAnnotationKey], constants.MachineConfigDaemonStateDone)
214214

215-
installedPackages := helpers.ExecCmdOnNode(t, cs, node, "chroot", "/rootfs", "rpm", "-q", "pacemaker", "pcs", "fence-agents-all", "crun-wasm", "libreswan", "usbguard", "kernel-devel", "kernel-headers", "krb5-workstation", "libkadm5", "sysstat")
216-
expectedPackages := []string{"pacemaker", "pcs", "fence-agents-all", "crun-wasm", "libreswan", "usbguard", "kernel-devel", "kernel-headers", "krb5-workstation", "libkadm5", "sysstat"}
215+
installedPackages := helpers.ExecCmdOnNode(t, cs, node, "chroot", "/rootfs", "rpm", "-q", "pacemaker", "pcs", "fence-agents-all", "libreswan", "usbguard", "kernel-devel", "kernel-headers", "krb5-workstation", "libkadm5", "sysstat")
216+
expectedPackages := []string{"pacemaker", "pcs", "fence-agents-all", "libreswan", "usbguard", "kernel-devel", "kernel-headers", "krb5-workstation", "libkadm5", "sysstat"}
217217
for _, v := range expectedPackages {
218218
if !strings.Contains(installedPackages, v) {
219219
t.Fatalf("Node %s doesn't have expected extensions", node.Name)
@@ -237,7 +237,7 @@ func TestExtensions(t *testing.T) {
237237
assert.Equal(t, node.Annotations[constants.CurrentMachineConfigAnnotationKey], oldMasterRenderedConfig)
238238
assert.Equal(t, node.Annotations[constants.MachineConfigDaemonStateAnnotationKey], constants.MachineConfigDaemonStateDone)
239239

240-
installedPackages = helpers.ExecCmdOnNode(t, cs, node, "chroot", "/rootfs", "rpm", "-qa", "pacemaker", "pcs", "fence-agents-all", "crun-wasm", "libreswan", "usbguard", "kernel-devel", "kernel-headers", "krb5-workstation", "libkadm5", "sysstat")
240+
installedPackages = helpers.ExecCmdOnNode(t, cs, node, "chroot", "/rootfs", "rpm", "-qa", "pacemaker", "pcs", "fence-agents-all", "libreswan", "usbguard", "kernel-devel", "kernel-headers", "krb5-workstation", "libkadm5", "sysstat")
241241
for _, v := range expectedPackages {
242242
if strings.Contains(installedPackages, v) {
243243
t.Fatalf("Node %s did not rollback successfully", node.Name)

0 commit comments

Comments
 (0)