Skip to content

Commit de33c61

Browse files
Fix new tests after rebase
1 parent 4d95a0f commit de33c61

File tree

1 file changed

+17
-17
lines changed

1 file changed

+17
-17
lines changed

cmd/clusterctl/client/cluster/upgrader_test.go

+17-17
Original file line numberDiff line numberDiff line change
@@ -1253,11 +1253,11 @@ func Test_providerUpgrader_ApplyCustomPlan(t *testing.T) {
12531253
WithVersions("v1.10.0", "v1.11.0", "v1.12.0", "v1.13.0", "v1.14.0").
12541254
WithMetadata("v1.14.0", &clusterctlv1.Metadata{
12551255
ReleaseSeries: []clusterctlv1.ReleaseSeries{
1256-
{Major: 1, Minor: 10, Contract: test.PreviousCAPIContractNotSupported},
1257-
{Major: 1, Minor: 11, Contract: test.CurrentCAPIContract},
1258-
{Major: 1, Minor: 12, Contract: test.CurrentCAPIContract},
1259-
{Major: 1, Minor: 13, Contract: test.CurrentCAPIContract},
1260-
{Major: 1, Minor: 14, Contract: test.CurrentCAPIContract},
1256+
{Major: 1, Minor: 10, Contract: oldContractVersionNotSupportedAnymore},
1257+
{Major: 1, Minor: 11, Contract: currentContractVersion},
1258+
{Major: 1, Minor: 12, Contract: currentContractVersion},
1259+
{Major: 1, Minor: 13, Contract: currentContractVersion},
1260+
{Major: 1, Minor: 14, Contract: currentContractVersion},
12611261
},
12621262
}),
12631263
},
@@ -1285,18 +1285,18 @@ func Test_providerUpgrader_ApplyCustomPlan(t *testing.T) {
12851285
WithVersions("v1.0.0").
12861286
WithMetadata("v1.0.0", &clusterctlv1.Metadata{
12871287
ReleaseSeries: []clusterctlv1.ReleaseSeries{
1288-
{Major: 1, Minor: 0, Contract: test.CurrentCAPIContract},
1288+
{Major: 1, Minor: 0, Contract: currentContractVersion},
12891289
},
12901290
}),
12911291
"bootstrap-kubeadm": repository.NewMemoryRepository().
12921292
WithVersions("v1.10.0", "v1.11.0", "v1.12.0", "v1.13.0", "v1.14.0").
12931293
WithMetadata("v1.14.0", &clusterctlv1.Metadata{
12941294
ReleaseSeries: []clusterctlv1.ReleaseSeries{
1295-
{Major: 1, Minor: 10, Contract: test.PreviousCAPIContractNotSupported},
1296-
{Major: 1, Minor: 11, Contract: test.CurrentCAPIContract},
1297-
{Major: 1, Minor: 12, Contract: test.CurrentCAPIContract},
1298-
{Major: 1, Minor: 13, Contract: test.CurrentCAPIContract},
1299-
{Major: 1, Minor: 14, Contract: test.CurrentCAPIContract},
1295+
{Major: 1, Minor: 10, Contract: oldContractVersionNotSupportedAnymore},
1296+
{Major: 1, Minor: 11, Contract: currentContractVersion},
1297+
{Major: 1, Minor: 12, Contract: currentContractVersion},
1298+
{Major: 1, Minor: 13, Contract: currentContractVersion},
1299+
{Major: 1, Minor: 14, Contract: currentContractVersion},
13001300
},
13011301
}),
13021302
},
@@ -1325,18 +1325,18 @@ func Test_providerUpgrader_ApplyCustomPlan(t *testing.T) {
13251325
WithVersions("v1.0.0").
13261326
WithMetadata("v1.0.0", &clusterctlv1.Metadata{
13271327
ReleaseSeries: []clusterctlv1.ReleaseSeries{
1328-
{Major: 1, Minor: 0, Contract: test.CurrentCAPIContract},
1328+
{Major: 1, Minor: 0, Contract: currentContractVersion},
13291329
},
13301330
}),
13311331
"control-plane-kubeadm": repository.NewMemoryRepository().
13321332
WithVersions("v1.10.0", "v1.11.0", "v1.12.0", "v1.13.0", "v1.14.0").
13331333
WithMetadata("v1.14.0", &clusterctlv1.Metadata{
13341334
ReleaseSeries: []clusterctlv1.ReleaseSeries{
1335-
{Major: 1, Minor: 10, Contract: test.PreviousCAPIContractNotSupported},
1336-
{Major: 1, Minor: 11, Contract: test.CurrentCAPIContract},
1337-
{Major: 1, Minor: 12, Contract: test.CurrentCAPIContract},
1338-
{Major: 1, Minor: 13, Contract: test.CurrentCAPIContract},
1339-
{Major: 1, Minor: 14, Contract: test.CurrentCAPIContract},
1335+
{Major: 1, Minor: 10, Contract: oldContractVersionNotSupportedAnymore},
1336+
{Major: 1, Minor: 11, Contract: currentContractVersion},
1337+
{Major: 1, Minor: 12, Contract: currentContractVersion},
1338+
{Major: 1, Minor: 13, Contract: currentContractVersion},
1339+
{Major: 1, Minor: 14, Contract: currentContractVersion},
13401340
},
13411341
}),
13421342
},

0 commit comments

Comments
 (0)