Skip to content

Commit 5e5af73

Browse files
fabriziopandinifabriziopandini
committed
Fix TestComputeControlPlaneVersion
1 parent b286a8d commit 5e5af73

File tree

1 file changed

+32
-80
lines changed

1 file changed

+32
-80
lines changed

‎exp/topology/desiredstate/desired_state_test.go‎

Lines changed: 32 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -1230,11 +1230,8 @@ func TestComputeControlPlaneVersion(t *testing.T) {
12301230
"spec.replicas": int64(2),
12311231
}).
12321232
WithStatusFields(map[string]interface{}{
1233-
"status.version": "v1.2.2",
1234-
"status.replicas": int64(2),
1235-
"status.upToDateReplicas": int64(2),
1236-
"status.readyReplicas": int64(2),
1237-
"status.availableReplicas": int64(2),
1233+
"status.version": "v1.2.2",
1234+
"status.replicas": int64(2),
12381235
}).
12391236
Build(),
12401237
controlPlaneUpgradePlan: []string{"v1.2.3"},
@@ -1257,11 +1254,8 @@ func TestComputeControlPlaneVersion(t *testing.T) {
12571254
"spec.replicas": int64(2),
12581255
}).
12591256
WithStatusFields(map[string]interface{}{
1260-
"status.version": "v1.2.2",
1261-
"status.replicas": int64(2),
1262-
"status.upToDateReplicas": int64(2),
1263-
"status.readyReplicas": int64(2),
1264-
"status.availableReplicas": int64(2),
1257+
"status.version": "v1.2.2",
1258+
"status.replicas": int64(2),
12651259
}).
12661260
Build(),
12671261
clusterModifier: func(c *clusterv1.Cluster) {
@@ -1287,11 +1281,8 @@ func TestComputeControlPlaneVersion(t *testing.T) {
12871281
"spec.replicas": int64(2),
12881282
}).
12891283
WithStatusFields(map[string]interface{}{
1290-
"status.version": "v1.2.2",
1291-
"status.replicas": int64(1),
1292-
"status.upToDateReplicas": int64(1),
1293-
"status.readyReplicas": int64(1),
1294-
"status.availableReplicas": int64(2),
1284+
"status.version": "v1.2.2",
1285+
"status.replicas": int64(1),
12951286
}).
12961287
Build(),
12971288
controlPlaneUpgradePlan: []string{"v1.2.3"},
@@ -1310,11 +1301,8 @@ func TestComputeControlPlaneVersion(t *testing.T) {
13101301
"spec.replicas": int64(2),
13111302
}).
13121303
WithStatusFields(map[string]interface{}{
1313-
"status.version": "v1.2.2",
1314-
"status.replicas": int64(2),
1315-
"status.upToDateReplicas": int64(2),
1316-
"status.readyReplicas": int64(2),
1317-
"status.availableReplicas": int64(2),
1304+
"status.version": "v1.2.2",
1305+
"status.replicas": int64(2),
13181306
}).
13191307
Build(),
13201308
controlPlaneUpgradePlan: []string{"v1.3.2", "v1.4.2", "v1.5.3"},
@@ -1335,11 +1323,8 @@ func TestComputeControlPlaneVersion(t *testing.T) {
13351323
"spec.replicas": int64(2),
13361324
}).
13371325
WithStatusFields(map[string]interface{}{
1338-
"status.version": "v1.4.2",
1339-
"status.replicas": int64(2),
1340-
"status.upToDateReplicas": int64(2),
1341-
"status.readyReplicas": int64(2),
1342-
"status.availableReplicas": int64(2),
1326+
"status.version": "v1.4.2",
1327+
"status.replicas": int64(2),
13431328
}).
13441329
Build(),
13451330
controlPlaneUpgradePlan: []string{"v1.5.3"},
@@ -1359,11 +1344,8 @@ func TestComputeControlPlaneVersion(t *testing.T) {
13591344
"spec.replicas": int64(2),
13601345
}).
13611346
WithStatusFields(map[string]interface{}{
1362-
"status.version": "v1.2.2",
1363-
"status.replicas": int64(2),
1364-
"status.upToDateReplicas": int64(2),
1365-
"status.readyReplicas": int64(2),
1366-
"status.availableReplicas": int64(2),
1347+
"status.version": "v1.2.2",
1348+
"status.replicas": int64(2),
13671349
}).
13681350
Build(),
13691351
controlPlaneUpgradePlan: []string{"v1.3.2", "v1.4.2", "v1.5.3"},
@@ -1385,11 +1367,8 @@ func TestComputeControlPlaneVersion(t *testing.T) {
13851367
"spec.replicas": int64(2),
13861368
}).
13871369
WithStatusFields(map[string]interface{}{
1388-
"status.version": "v1.2.2",
1389-
"status.replicas": int64(2),
1390-
"status.upToDateReplicas": int64(2),
1391-
"status.readyReplicas": int64(2),
1392-
"status.availableReplicas": int64(2),
1370+
"status.version": "v1.2.2",
1371+
"status.replicas": int64(2),
13931372
}).
13941373
Build(),
13951374
controlPlaneUpgradePlan: []string{"v1.3.2", "v1.4.2", "v1.5.3"},
@@ -1411,11 +1390,8 @@ func TestComputeControlPlaneVersion(t *testing.T) {
14111390
"spec.replicas": int64(2),
14121391
}).
14131392
WithStatusFields(map[string]interface{}{
1414-
"status.version": "v1.2.2",
1415-
"status.replicas": int64(2),
1416-
"status.upToDateReplicas": int64(2),
1417-
"status.readyReplicas": int64(2),
1418-
"status.availableReplicas": int64(2),
1393+
"status.version": "v1.2.2",
1394+
"status.replicas": int64(2),
14191395
}).
14201396
Build(),
14211397
controlPlaneUpgradePlan: []string{"v1.2.3"},
@@ -1433,11 +1409,8 @@ func TestComputeControlPlaneVersion(t *testing.T) {
14331409
"spec.replicas": int64(2),
14341410
}).
14351411
WithStatusFields(map[string]interface{}{
1436-
"status.version": "v1.2.2",
1437-
"status.replicas": int64(2),
1438-
"status.upToDateReplicas": int64(2),
1439-
"status.readyReplicas": int64(2),
1440-
"status.availableReplicas": int64(2),
1412+
"status.version": "v1.2.2",
1413+
"status.replicas": int64(2),
14411414
}).
14421415
Build(),
14431416
controlPlaneUpgradePlan: []string{"v1.2.3"},
@@ -1453,11 +1426,8 @@ func TestComputeControlPlaneVersion(t *testing.T) {
14531426
"spec.replicas": int64(2),
14541427
}).
14551428
WithStatusFields(map[string]interface{}{
1456-
"status.version": "v1.2.2",
1457-
"status.replicas": int64(2),
1458-
"status.upToDateReplicas": int64(2),
1459-
"status.readyReplicas": int64(2),
1460-
"status.availableReplicas": int64(2),
1429+
"status.version": "v1.2.2",
1430+
"status.replicas": int64(2),
14611431
}).
14621432
Build(),
14631433
clusterModifier: func(c *clusterv1.Cluster) {
@@ -1482,11 +1452,8 @@ func TestComputeControlPlaneVersion(t *testing.T) {
14821452
"spec.replicas": int64(2),
14831453
}).
14841454
WithStatusFields(map[string]interface{}{
1485-
"status.version": "v1.2.2",
1486-
"status.replicas": int64(2),
1487-
"status.upToDateReplicas": int64(2),
1488-
"status.readyReplicas": int64(2),
1489-
"status.availableReplicas": int64(2),
1455+
"status.version": "v1.2.2",
1456+
"status.replicas": int64(2),
14901457
}).
14911458
Build(),
14921459
controlPlaneUpgradePlan: []string{"v1.2.3"},
@@ -1505,11 +1472,8 @@ func TestComputeControlPlaneVersion(t *testing.T) {
15051472
"spec.replicas": int64(2),
15061473
}).
15071474
WithStatusFields(map[string]interface{}{
1508-
"status.version": "v1.2.2",
1509-
"status.replicas": int64(2),
1510-
"status.upToDateReplicas": int64(2),
1511-
"status.readyReplicas": int64(2),
1512-
"status.availableReplicas": int64(2),
1475+
"status.version": "v1.2.2",
1476+
"status.replicas": int64(2),
15131477
}).
15141478
Build(),
15151479
controlPlaneUpgradePlan: []string{"v1.2.3"},
@@ -1527,11 +1491,8 @@ func TestComputeControlPlaneVersion(t *testing.T) {
15271491
"spec.replicas": int64(2),
15281492
}).
15291493
WithStatusFields(map[string]interface{}{
1530-
"status.version": "v1.2.2",
1531-
"status.replicas": int64(2),
1532-
"status.upToDateReplicas": int64(2),
1533-
"status.readyReplicas": int64(2),
1534-
"status.availableReplicas": int64(2),
1494+
"status.version": "v1.2.2",
1495+
"status.replicas": int64(2),
15351496
}).
15361497
Build(),
15371498
clusterModifier: func(c *clusterv1.Cluster) {
@@ -1556,11 +1517,8 @@ func TestComputeControlPlaneVersion(t *testing.T) {
15561517
"spec.replicas": int64(2),
15571518
}).
15581519
WithStatusFields(map[string]interface{}{
1559-
"status.version": "v1.2.2",
1560-
"status.replicas": int64(2),
1561-
"status.upToDateReplicas": int64(2),
1562-
"status.readyReplicas": int64(2),
1563-
"status.availableReplicas": int64(2),
1520+
"status.version": "v1.2.2",
1521+
"status.replicas": int64(2),
15641522
}).
15651523
Build(),
15661524
clusterModifier: func(c *clusterv1.Cluster) {
@@ -1583,11 +1541,8 @@ func TestComputeControlPlaneVersion(t *testing.T) {
15831541
"spec.replicas": int64(2),
15841542
}).
15851543
WithStatusFields(map[string]interface{}{
1586-
"status.version": "v1.2.2",
1587-
"status.replicas": int64(2),
1588-
"status.upToDateReplicas": int64(2),
1589-
"status.readyReplicas": int64(2),
1590-
"status.availableReplicas": int64(2),
1544+
"status.version": "v1.2.2",
1545+
"status.replicas": int64(2),
15911546
}).
15921547
Build(),
15931548
clusterModifier: func(c *clusterv1.Cluster) {
@@ -1612,11 +1567,8 @@ func TestComputeControlPlaneVersion(t *testing.T) {
16121567
"spec.replicas": int64(2),
16131568
}).
16141569
WithStatusFields(map[string]interface{}{
1615-
"status.version": "v1.2.2",
1616-
"status.replicas": int64(2),
1617-
"status.upToDateReplicas": int64(2),
1618-
"status.readyReplicas": int64(2),
1619-
"status.availableReplicas": int64(2),
1570+
"status.version": "v1.2.2",
1571+
"status.replicas": int64(2),
16201572
}).
16211573
Build(),
16221574
clusterModifier: func(c *clusterv1.Cluster) {

0 commit comments

Comments
 (0)