Skip to content

smoke: install MSR in the modern and upgrade suites #704

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

Open
james-nesbitt wants to merge 1 commit into
base: main
Choose a base branch
from
Open

smoke: install MSR in the modern and upgrade suites #704

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
11 changes: 9 additions & 2 deletions test/smoke/smoke_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,13 +225,19 @@ func runSmokeTest(t *testing.T, cfg smokeConfig) {
}

// TestModernCluster exercises rhel9/ubuntu24/rocky9 managers and rhel9/sles15/ubuntu24/rocky9 workers
// with MCR stable-29.2 and MKE 3.9.2.
// with MCR stable-29.2 and MKE 3.9.2, plus an ubuntu24 MSR replica.
//
// MSR is 2.9.28, not 3.x: examples/terraform/aws-simple/launchpad.tf renders
// `kind: mke+msr` with --dtr-external-url and --ucp-insecure-tls, and this
// launchpad has no MSR 3 support at all. The 3.1.18 that stood here was never
// exercised -- with no msr-role nodegroup, launchpad.tf's has_msr was false
// and the whole msr block was skipped.
func TestModernCluster(t *testing.T) {
runSmokeTest(t, smokeConfig{
Name: "modern",
MCRChannel: "stable-29.2",
MKEVersion: "3.9.2",
MSRVersion: "3.1.18",
MSRVersion: "2.9.28",
SSHKeyAlgorithm: "ed25519",
Nodegroups: map[string]interface{}{
"MngrRhel9": test.Platforms["Rhel9"].GetManager(),
Expand All @@ -241,6 +247,7 @@ func TestModernCluster(t *testing.T) {
"WrkSles15": test.Platforms["Sles15"].GetWorker(),
"WrkUbuntu24": test.Platforms["Ubuntu24"].GetWorker(),
"WrkRocky9": test.Platforms["Rocky9"].GetWorker(),
"MsrUbuntu24": test.Platforms["Ubuntu24"].GetMSR(),
},
})
}
Expand Down
50 changes: 35 additions & 15 deletions test/smoke/upgrade_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ type upgradeConfig struct {
Base smokeConfig
UpgradeMCRChannel string
UpgradeMKEVersion string
// UpgradeMSRVersion is empty for a cluster with no MSR node.
UpgradeMSRVersion string
}

// runUpgradeTest provisions the cluster with Base versions, upgrades to the
Expand Down Expand Up @@ -131,7 +133,7 @@ func runUpgradeTest(t *testing.T, cfg upgradeConfig) {
// Unmarshal the Terraform-generated YAML into a generic map so we can
// update version fields without disturbing host addresses, SANs, LB names,
// or any other infrastructure-specific values the module injected.
upgradeYAML, err := bumpVersions(baseYAML, cfg.UpgradeMCRChannel, cfg.UpgradeMKEVersion)
upgradeYAML, err := bumpVersions(baseYAML, cfg.UpgradeMCRChannel, cfg.UpgradeMKEVersion, cfg.UpgradeMSRVersion)
require.NoError(t, err, "mutate YAML for upgrade")

// ── Step 3: upgrade ───────────────────────────────────────────────────────
Expand Down Expand Up @@ -164,12 +166,17 @@ func runUpgradeTest(t *testing.T, cfg upgradeConfig) {
}
}

// bumpVersions deserialises yamlStr, replaces spec.mcr.channel and
// spec.mke.version with the supplied values, and returns the re-serialised
// YAML. The rest of the document (hosts, SANs, LB addresses, flags, …) is
// preserved verbatim so the upgrade runs against the same infrastructure that
// was just provisioned.
func bumpVersions(yamlStr, mcrChannel, mkeVersion string) (string, error) {
// bumpVersions deserialises yamlStr, replaces spec.mcr.channel,
// spec.mke.version and spec.msr.version with the supplied values, and returns
// the re-serialised YAML. The rest of the document (hosts, SANs, LB
// addresses, flags, …) is preserved verbatim so the upgrade runs against the
// same infrastructure that was just provisioned.
//
// msrVersion is empty for a cluster with no MSR node: launchpad.tf only emits
// spec.msr when an msr-role nodegroup exists, so an absent block is the
// normal shape rather than an error, and an absent block with a version to
// apply is a configuration mistake worth reporting.
func bumpVersions(yamlStr, mcrChannel, mkeVersion, msrVersion string) (string, error) {
var doc map[interface{}]interface{}
if err := yaml.Unmarshal([]byte(yamlStr), &doc); err != nil {
return "", fmt.Errorf("unmarshal cluster YAML: %w", err)
Expand All @@ -192,17 +199,25 @@ func bumpVersions(yamlStr, mcrChannel, mkeVersion string) (string, error) {
return "", fmt.Errorf("cluster YAML missing spec.mke")
}

if msrVersion != "" {
msr, ok := spec["msr"].(map[interface{}]interface{})
if !ok {
return "", fmt.Errorf("upgrade to MSR %s requested but cluster YAML has no spec.msr", msrVersion)
}
msr["version"] = msrVersion
}

out, err := yaml.Marshal(doc)
if err != nil {
return "", fmt.Errorf("re-marshal upgraded YAML: %w", err)
}
return string(out), nil
}

// TestUpgradeLegacyToModern installs MKE 3.8.8 / MCR stable-25.0 on a
// legacy Linux matrix (rhel8, rocky8, ubuntu22) and then upgrades it to
// MKE 3.9.2 / MCR stable-29.2 in place. This is the primary real-world
// upgrade path for customers running the 3.8 stack.
// TestUpgradeLegacyToModern installs MKE 3.8.8 / MCR stable-25.0 / MSR 2.9.28
// on a legacy Linux matrix (rhel8, rocky8, ubuntu22) and then upgrades it to
// MKE 3.9.2 / MCR stable-29.2 / MSR 2.9.30 in place. This is the primary
// real-world upgrade path for customers running the 3.8 stack.
func TestUpgradeLegacyToModern(t *testing.T) {
runUpgradeTest(t, upgradeConfig{
Base: smokeConfig{
Expand All @@ -218,17 +233,20 @@ func TestUpgradeLegacyToModern(t *testing.T) {
"WrkRhel8": test.Platforms["Rhel8"].GetWorker(),
"WrkRocky8": test.Platforms["Rocky8"].GetWorker(),
"WrkUbuntu22": test.Platforms["Ubuntu22"].GetWorker(),
"MsrUbuntu22": test.Platforms["Ubuntu22"].GetMSR(),
},
},
UpgradeMCRChannel: "stable-29.2",
UpgradeMKEVersion: "3.9.2",
UpgradeMSRVersion: "2.9.30",
})
}

// TestUpgradeModernClusterFromLegacy installs MKE 3.8.8 / MCR stable-25.0 on
// the modern Linux matrix (rhel9, ubuntu24, rocky9 managers; rhel9, sles15,
// ubuntu24, rocky9 workers -- same nodegroups as TestModernCluster) and then
// upgrades in place to MKE 3.9.2 / MCR stable-29.2. Exercises the same
// TestUpgradeModernClusterFromLegacy installs MKE 3.8.8 / MCR stable-25.0 /
// MSR 2.9.28 on the modern Linux matrix (rhel9, ubuntu24, rocky9 managers;
// rhel9, sles15, ubuntu24, rocky9 workers; ubuntu24 MSR -- same nodegroups as
// TestModernCluster) and then upgrades in place to MKE 3.9.2 / MCR
// stable-29.2 / MSR 2.9.30. Exercises the same
// version transition as TestUpgradeLegacyToModern but against newer OS
// releases, covering the per-OS configurer paths (rhel9/ubuntu24/rocky9/
// sles15) that TestUpgradeLegacyToModern's rhel8/rocky8/ubuntu22 matrix does
Expand All @@ -249,9 +267,11 @@ func TestUpgradeModernClusterFromLegacy(t *testing.T) {
"WrkSles15": test.Platforms["Sles15"].GetWorker(),
"WrkUbuntu24": test.Platforms["Ubuntu24"].GetWorker(),
"WrkRocky9": test.Platforms["Rocky9"].GetWorker(),
"MsrUbuntu24": test.Platforms["Ubuntu24"].GetMSR(),
},
},
UpgradeMCRChannel: "stable-29.2",
UpgradeMKEVersion: "3.9.2",
UpgradeMSRVersion: "2.9.30",
})
}
Loading