Skip to content

Commit e95e7f5

Browse files
andyatmiamicsams
authored andcommitted
chore: updates to target 3.3.2 release
for reasons not worth explicitly outlining in this PR description - the version of RHOAI we are targeting for migration is now 3.3.2 (when previously it was 3.3.1). While CanApply() checks - and the majority of string references - are generally only gated on 3.3 - there were a handful of references in user-facing strings and unit tests that still explicitly listed 3.3.1. For sake of ease and consistency - this PR does a wholesale replace of the "3.3.1" string with "3.3.2" - even in cases where it was "just" a unit test and didn't strictly speaking require changes. - This was an old fashioned "global search and replace" - no AI used in construction of this change set 😄 Signed-off-by: Andy Stoneberg <astonebe@redhat.com>
1 parent 0513ed8 commit e95e7f5

File tree

3 files changed

+19
-19
lines changed

3 files changed

+19
-19
lines changed

pkg/lint/checks/components/kueue/kueue.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ const (
2121
checkTypeManagementState = "management-state"
2222

2323
// Deferred: parameterize hardcoded version references using ComponentRequest.TargetVersion.
24-
msgManagedProhibited = "The 3.3.1 upgrade currently only supports the Kueue managementState of Removed. A future 3.3.x release might allow an upgrade when you have migrated to the Red Hat build of Kueue Operator and the Kueue managementState is Unmanaged."
25-
msgUnmanagedProhibited = "The 3.3.1 upgrade currently only supports the Kueue managementState of Removed. A future 3.3.x release might allow an upgrade when the Kueue managementState is Unmanaged."
26-
msgManagedBlocking = "The 3.3.1 upgrade currently only supports the Kueue managementState of Removed. The Kueue managementState is currently Managed but no workloads on the cluster are using Kueue. Set the Kueue managementState to Removed and then re-run this script to proceed with migration."
27-
msgUnmanagedBlocking = "The 3.3.1 upgrade currently only supports the Kueue managementState of Removed. The Kueue managementState is currently Unmanaged but no workloads on the cluster are using Kueue. Set the Kueue managementState to Removed and then re-run this script to proceed with migration."
24+
msgManagedProhibited = "The 3.3.2 upgrade currently only supports the Kueue managementState of Removed. A future 3.3.x release might allow an upgrade when you have migrated to the Red Hat build of Kueue Operator and the Kueue managementState is Unmanaged."
25+
msgUnmanagedProhibited = "The 3.3.2 upgrade currently only supports the Kueue managementState of Removed. A future 3.3.x release might allow an upgrade when the Kueue managementState is Unmanaged."
26+
msgManagedBlocking = "The 3.3.2 upgrade currently only supports the Kueue managementState of Removed. The Kueue managementState is currently Managed but no workloads on the cluster are using Kueue. Set the Kueue managementState to Removed and then re-run this script to proceed with migration."
27+
msgUnmanagedBlocking = "The 3.3.2 upgrade currently only supports the Kueue managementState of Removed. The Kueue managementState is currently Unmanaged but no workloads on the cluster are using Kueue. Set the Kueue managementState to Removed and then re-run this script to proceed with migration."
2828
)
2929

3030
// ManagementStateCheck validates that Kueue managementState is Removed before upgrading to 3.x.
31-
// In RHOAI 3.3.1, only the Removed state is supported. A future 3.3.x release will support
31+
// In RHOAI 3.3.2, only the Removed state is supported. A future 3.3.x release will support
3232
// Unmanaged with the Red Hat build of Kueue Operator.
3333
//
3434
// The check distinguishes between clusters that are actively using Kueue (namespaces or workloads

pkg/lint/checks/components/kueue/kueue_test.go

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ func TestManagementStateCheck_CanApply_NoDSC(t *testing.T) {
8585
target := testutil.NewTarget(t, testutil.TargetConfig{
8686
ListKinds: listKinds,
8787
CurrentVersion: "2.25.0",
88-
TargetVersion: "3.3.1",
88+
TargetVersion: "3.3.2",
8989
})
9090

9191
chk := kueue.NewManagementStateCheck()
@@ -104,7 +104,7 @@ func TestManagementStateCheck_CanApply_NotConfigured(t *testing.T) {
104104
ListKinds: listKinds,
105105
Objects: []*unstructured.Unstructured{dsc},
106106
CurrentVersion: "2.25.0",
107-
TargetVersion: "3.3.1",
107+
TargetVersion: "3.3.2",
108108
})
109109

110110
chk := kueue.NewManagementStateCheck()
@@ -127,7 +127,7 @@ func TestManagementStateCheck_ManagedProhibited(t *testing.T) {
127127
ListKinds: listKinds,
128128
Objects: []*unstructured.Unstructured{testutil.NewDSC(map[string]string{"kueue": "Managed"}), ns, nb},
129129
CurrentVersion: "2.25.0",
130-
TargetVersion: "3.3.1",
130+
TargetVersion: "3.3.2",
131131
})
132132

133133
chk := kueue.NewManagementStateCheck()
@@ -144,7 +144,7 @@ func TestManagementStateCheck_ManagedProhibited(t *testing.T) {
144144
g.Expect(result.Status.Conditions[0].Impact).To(Equal(resultpkg.ImpactProhibited))
145145
g.Expect(result.Annotations).To(And(
146146
HaveKeyWithValue("component.opendatahub.io/management-state", "Managed"),
147-
HaveKeyWithValue("check.opendatahub.io/target-version", "3.3.1"),
147+
HaveKeyWithValue("check.opendatahub.io/target-version", "3.3.2"),
148148
))
149149
}
150150

@@ -157,7 +157,7 @@ func TestManagementStateCheck_ManagedBlocking(t *testing.T) {
157157
ListKinds: listKinds,
158158
Objects: []*unstructured.Unstructured{testutil.NewDSC(map[string]string{"kueue": "Managed"})},
159159
CurrentVersion: "2.25.0",
160-
TargetVersion: "3.3.1",
160+
TargetVersion: "3.3.2",
161161
})
162162

163163
chk := kueue.NewManagementStateCheck()
@@ -188,7 +188,7 @@ func TestManagementStateCheck_UnmanagedProhibited(t *testing.T) {
188188
ListKinds: listKinds,
189189
Objects: []*unstructured.Unstructured{testutil.NewDSC(map[string]string{"kueue": "Unmanaged"}), nb},
190190
CurrentVersion: "2.25.0",
191-
TargetVersion: "3.3.1",
191+
TargetVersion: "3.3.2",
192192
})
193193

194194
chk := kueue.NewManagementStateCheck()
@@ -214,7 +214,7 @@ func TestManagementStateCheck_UnmanagedBlocking(t *testing.T) {
214214
ListKinds: listKinds,
215215
Objects: []*unstructured.Unstructured{testutil.NewDSC(map[string]string{"kueue": "Unmanaged"})},
216216
CurrentVersion: "2.25.0",
217-
TargetVersion: "3.3.1",
217+
TargetVersion: "3.3.2",
218218
})
219219

220220
chk := kueue.NewManagementStateCheck()
@@ -252,7 +252,7 @@ func TestManagementStateCheck_CanApply_ManagementState(t *testing.T) {
252252
ListKinds: listKinds,
253253
Objects: []*unstructured.Unstructured{dsc},
254254
CurrentVersion: "2.25.0",
255-
TargetVersion: "3.3.1",
255+
TargetVersion: "3.3.2",
256256
})
257257

258258
canApply, err := chk.CanApply(t.Context(), target)
@@ -285,7 +285,7 @@ func TestManagementStateCheck_KueueUsageViaNamespaceLabel(t *testing.T) {
285285
ListKinds: listKinds,
286286
Objects: []*unstructured.Unstructured{testutil.NewDSC(map[string]string{"kueue": "Managed"}), ns},
287287
CurrentVersion: "2.25.0",
288-
TargetVersion: "3.3.1",
288+
TargetVersion: "3.3.2",
289289
})
290290

291291
chk := kueue.NewManagementStateCheck()
@@ -306,7 +306,7 @@ func TestManagementStateCheck_KueueUsageViaNamespaceLabel(t *testing.T) {
306306
ListKinds: listKinds,
307307
Objects: []*unstructured.Unstructured{testutil.NewDSC(map[string]string{"kueue": "Managed"}), ns},
308308
CurrentVersion: "2.25.0",
309-
TargetVersion: "3.3.1",
309+
TargetVersion: "3.3.2",
310310
})
311311

312312
chk := kueue.NewManagementStateCheck()
@@ -329,7 +329,7 @@ func TestManagementStateCheck_KueueUsageViaWorkloadLabel(t *testing.T) {
329329
ListKinds: listKinds,
330330
Objects: []*unstructured.Unstructured{testutil.NewDSC(map[string]string{"kueue": "Managed"}), nb},
331331
CurrentVersion: "2.25.0",
332-
TargetVersion: "3.3.1",
332+
TargetVersion: "3.3.2",
333333
})
334334

335335
chk := kueue.NewManagementStateCheck()

pkg/util/version/helpers_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ func TestSameMajorMinor(t *testing.T) {
251251
{
252252
name: "3.x to 3.x same minor returns true",
253253
a: toVersionPtr("3.3.0"),
254-
b: toVersionPtr("3.3.1"),
254+
b: toVersionPtr("3.3.2"),
255255
expected: true,
256256
},
257257
{
@@ -290,8 +290,8 @@ func TestMajorMinorLabel(t *testing.T) {
290290
expected: "3.0",
291291
},
292292
{
293-
name: "3.3.1 returns 3.3",
294-
version: toVersionPtr("3.3.1"),
293+
name: "3.3.2 returns 3.3",
294+
version: toVersionPtr("3.3.2"),
295295
expected: "3.3",
296296
},
297297
{

0 commit comments

Comments
 (0)