Skip to content

fix: Version mismatch code fix #5448

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
brucebarrera wants to merge 1 commit into
base: main
Choose a base branch
from
+35 −10
Open

fix: Version mismatch code fix #5448

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
45 changes: 35 additions & 10 deletions test/util/framework/deployment_params.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import (
"sync"
"time"

"github.com/blang/semver/v4"
. "github.com/onsi/ginkgo/v2"

"k8s.io/apimachinery/pkg/util/rand"
Expand Down Expand Up @@ -164,20 +165,44 @@ func DefaultOpenshiftNodePoolVersionId() string {
version := os.Getenv("ARO_HCP_OPENSHIFT_NODEPOOL_VERSION")
if len(version) == 0 {
channelGroup := DefaultOpenshiftNodePoolChannelGroup()
if channelGroup == DefaultOpenshiftChannelGroup() {
cpChannelGroup := DefaultOpenshiftChannelGroup()

// CRITICAL: When channel groups match, ALWAYS use the control plane version
// to prevent version mismatches due to Cincinnati timing differences.
// This ensures node pool version never exceeds control plane version.
if channelGroup == cpChannelGroup {
return DefaultOpenshiftControlPlaneVersionId()
}
if channelGroup != "stable" {
var err error
version, err = GetLatestInstallVersion(context.Background(), channelGroup, DefaultOCPVersionId)
if err != nil {
if errors.Is(err, ErrNightlyReleaseStreamNotFound) || errors.Is(err, ErrNoAcceptedNightlyTags) || errors.Is(err, ErrVersionNotFound) {
Skip(fmt.Sprintf("No install version found for %s in %s channel (%s)", version, channelGroup, err.Error()))
} else {
Fail(fmt.Sprintf("failed to get latest install version for %s channel: %s", channelGroup, err.Error()))
}

// Different channel groups: resolve node pool version from its own channel,
// then validate it doesn't exceed control plane version
var err error
version, err = GetLatestInstallVersion(context.Background(), channelGroup, DefaultOCPVersionId)
if err != nil {
if errors.Is(err, ErrNightlyReleaseStreamNotFound) || errors.Is(err, ErrNoAcceptedNightlyTags) || errors.Is(err, ErrVersionNotFound) {
Skip(fmt.Sprintf("No install version found for %s in %s channel (%s)", DefaultOCPVersionId, channelGroup, err.Error()))
} else {
Fail(fmt.Sprintf("failed to get latest install version for %s channel: %s", channelGroup, err.Error()))
}
}

// Validate: node pool version must not exceed control plane version
cpVersion := DefaultOpenshiftControlPlaneVersionId()
npSemver, npErr := semver.Parse(version)
cpSemver, cpErr := semver.Parse(cpVersion)

if npErr == nil && cpErr == nil {
if npSemver.GT(cpSemver) {
// Node pool version exceeds control plane version - clamp it
fmt.Fprintf(os.Stderr, "WARNING: Node pool version %s (from %s channel) exceeds control plane version %s (from %s channel). Clamping to control plane version.\n",
version, channelGroup, cpVersion, cpChannelGroup)
version = cpVersion
}
} else {
// Couldn't parse versions for comparison - log warning but continue
fmt.Fprintf(os.Stderr, "WARNING: Could not compare versions (np=%s, cp=%s). Proceeding with node pool version from %s channel.\n",
version, cpVersion, channelGroup)
}
}
return version
}
Expand Down