Skip to content

Commit

Permalink
Merge pull request openshift#5146 from Patryk-Stefanski/HOSTEDCP-2181
Browse files Browse the repository at this point in the history
HOSTEDCP-2181: update latest supported version for 4.19 branching
  • Loading branch information
openshift-merge-bot[bot] authored Nov 26, 2024
2 parents 6185030 + 3c16a2a commit 2569f33
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 6 deletions.
11 changes: 7 additions & 4 deletions hypershift-operator/controllers/nodepool/secret_janitor_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import (
"github.com/openshift/hypershift/support/api"
"github.com/openshift/hypershift/support/releaseinfo"
fakereleaseprovider "github.com/openshift/hypershift/support/releaseinfo/fake"
"github.com/openshift/hypershift/support/supportedversion"
"github.com/openshift/hypershift/support/thirdparty/library-go/pkg/image/dockerv1client"
"github.com/openshift/hypershift/support/util/fakeimagemetadataprovider"
"go.uber.org/zap/zaptest"
Expand Down Expand Up @@ -65,7 +64,9 @@ func TestSecretJanitor_Reconcile(t *testing.T) {
{Name: "machineconfig-1"},
},
},
Status: hyperv1.NodePoolStatus{Version: supportedversion.LatestSupportedVersion.String()},
//We need the np.Status.Version to stay at 4.18 so that the token doesnt get updated when bumping releases,
// this protects us from possibly hiding other factors that might be causing the token to be updated
Status: hyperv1.NodePoolStatus{Version: semver.MustParse("4.18.0").String()},
}

coreMachineConfig := `
Expand Down Expand Up @@ -151,8 +152,10 @@ spec:
).Build()
r := secretJanitor{
NodePoolReconciler: &NodePoolReconciler{
Client: c,
ReleaseProvider: &fakereleaseprovider.FakeReleaseProvider{Version: supportedversion.LatestSupportedVersion.String()},
Client: c,
//We need the ReleaseProvider to stay at 4.18 so that the token doesnt get updated when bumping releases,
// this protects us from possibly hiding other factors that might be causing the token to be updated
ReleaseProvider: &fakereleaseprovider.FakeReleaseProvider{Version: semver.MustParse("4.18.0").String()},
ImageMetadataProvider: &fakeimagemetadataprovider.FakeImageMetadataProvider{Result: &dockerv1client.DockerImageConfig{Config: &docker10.DockerConfig{
Labels: map[string]string{},
}}},
Expand Down
2 changes: 1 addition & 1 deletion support/supportedversion/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
// HyperShift operator.
// NOTE: The .0 (z release) should be ignored. It's only here to support
// semver parsing.
var LatestSupportedVersion = semver.MustParse("4.18.0")
var LatestSupportedVersion = semver.MustParse("4.19.0")
var MinSupportedVersion = semver.MustParse("4.14.0")

func GetMinSupportedVersion(hc *hyperv1.HostedCluster) semver.Version {
Expand Down
2 changes: 1 addition & 1 deletion support/supportedversion/version_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (

func TestSupportedVersions(t *testing.T) {
g := NewGomegaWithT(t)
g.Expect(Supported()).To(Equal([]string{"4.18", "4.17", "4.16", "4.15", "4.14"}))
g.Expect(Supported()).To(Equal([]string{"4.19", "4.18", "4.17", "4.16", "4.15", "4.14"}))
}

func TestIsValidReleaseVersion(t *testing.T) {
Expand Down
2 changes: 2 additions & 0 deletions test/e2e/util/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import (

var (
// y-stream versions supported by e2e in main
Version419 = semver.MustParse("4.19.0")
Version418 = semver.MustParse("4.18.0")
Version417 = semver.MustParse("4.17.0")
Version416 = semver.MustParse("4.16.0")
Expand All @@ -26,6 +27,7 @@ func init() {
// Ensure that the version constants are valid semver versions
// This is a compile-time check to ensure that the versions are valid
// semver versions.
_ = Version419
_ = Version418
_ = Version417
_ = Version416
Expand Down

0 comments on commit 2569f33

Please sign in to comment.