Skip to content

Commit 575e079

Browse files
jvpasinattojvpasinatto
authored
K8SPSMDB-1508 - Update PSMDB operator for 1.21.1 release (#450)
1 parent 3887072 commit 575e079

File tree

4 files changed

+163
-2
lines changed

4 files changed

+163
-2
lines changed

‎api-tests/apply_route_test.go‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func TestApplyShouldReturnJustOneVersion(t *testing.T) {
3636

3737
psmdbParams := &version_service.VersionServiceApplyParams{
3838
Apply: "latest",
39-
OperatorVersion: "1.21.0",
39+
OperatorVersion: "1.21.1",
4040
Product: "psmdb-operator",
4141
}
4242
psmdbParams.WithTimeout(2 * time.Second)
@@ -112,7 +112,7 @@ func TestApplyPsmdbShouldReturnSameMajorVersion(t *testing.T) {
112112

113113
psmdbParams := &version_service.VersionServiceApplyParams{
114114
Apply: "latest",
115-
OperatorVersion: "1.21.0",
115+
OperatorVersion: "1.21.1",
116116
Product: "psmdb-operator",
117117
}
118118
psmdbParams.WithTimeout(2 * time.Second)
@@ -431,6 +431,7 @@ func TestApplyPsmdbReturnedVersions(t *testing.T) {
431431
version string
432432
}{
433433
// test latest
434+
{"latest", "1.21.1", nil, "8.0.12-4"},
434435
{"latest", "1.21.0", nil, "8.0.12-4"},
435436
{"latest", "1.20.1", nil, "8.0.8-3"},
436437
{"latest", "1.20.0", nil, "8.0.8-3"},
@@ -452,11 +453,13 @@ func TestApplyPsmdbReturnedVersions(t *testing.T) {
452453
{"latest", "1.7.0", nil, "4.4.3-5"},
453454
{"latest", "1.6.0", nil, "4.4.2-4"},
454455
{"latest", "1.5.0", nil, "4.2.8-8"},
456+
{"latest", "1.21.1", &v80, "8.0.12-4"},
455457
{"latest", "1.21.0", &v80, "8.0.12-4"},
456458
{"latest", "1.20.1", &v80, "8.0.8-3"},
457459
{"latest", "1.20.0", &v80, "8.0.8-3"},
458460
{"latest", "1.19.1", &v80, "8.0.4-1"},
459461
{"latest", "1.19.0", &v80, "8.0.4-1"},
462+
{"latest", "1.21.1", &v70, "7.0.24-13"},
460463
{"latest", "1.21.0", &v70, "7.0.24-13"},
461464
{"latest", "1.20.1", &v70, "7.0.18-11"},
462465
{"latest", "1.20.0", &v70, "7.0.18-11"},
@@ -467,6 +470,7 @@ func TestApplyPsmdbReturnedVersions(t *testing.T) {
467470
{"latest", "1.16.2", &v70, "7.0.8-5"},
468471
{"latest", "1.16.1", &v70, "7.0.8-5"},
469472
{"latest", "1.16.0", &v70, "7.0.8-5"},
473+
{"latest", "1.21.1", &v60, "6.0.25-20"},
470474
{"latest", "1.21.0", &v60, "6.0.25-20"},
471475
{"latest", "1.20.1", &v60, "6.0.21-18"},
472476
{"latest", "1.20.0", &v60, "6.0.21-18"},
@@ -518,6 +522,7 @@ func TestApplyPsmdbReturnedVersions(t *testing.T) {
518522
{"latest", "1.5.0", &v36, "3.6.19-7.0"},
519523

520524
// test recommended
525+
{"recommended", "1.21.1", nil, "8.0.12-4"},
521526
{"recommended", "1.21.0", nil, "8.0.12-4"},
522527
{"recommended", "1.20.1", nil, "7.0.18-11"},
523528
{"recommended", "1.20.0", nil, "7.0.18-11"},
@@ -539,7 +544,9 @@ func TestApplyPsmdbReturnedVersions(t *testing.T) {
539544
{"recommended", "1.7.0", nil, "4.4.3-5"},
540545
{"recommended", "1.6.0", nil, "4.4.2-4"},
541546
{"recommended", "1.5.0", nil, "4.2.8-8"},
547+
{"recommended", "1.21.1", &v80, "8.0.12-4"},
542548
{"recommended", "1.21.0", &v80, "8.0.12-4"},
549+
{"recommended", "1.21.1", &v70, "7.0.24-13"},
543550
{"recommended", "1.21.0", &v70, "7.0.24-13"},
544551
{"recommended", "1.20.1", &v70, "7.0.18-11"},
545552
{"recommended", "1.20.0", &v70, "7.0.18-11"},
@@ -549,6 +556,7 @@ func TestApplyPsmdbReturnedVersions(t *testing.T) {
549556
{"recommended", "1.16.2", &v70, "7.0.8-5"},
550557
{"recommended", "1.16.1", &v70, "7.0.8-5"},
551558
{"recommended", "1.16.0", &v70, "7.0.8-5"},
559+
{"recommended", "1.21.1", &v60, "6.0.25-20"},
552560
{"recommended", "1.21.0", &v60, "6.0.25-20"},
553561
{"recommended", "1.20.1", &v60, "6.0.21-18"},
554562
{"recommended", "1.20.0", &v60, "6.0.21-18"},
@@ -601,11 +609,13 @@ func TestApplyPsmdbReturnedVersions(t *testing.T) {
601609
{"recommended", "1.5.0", &v36, "3.6.19-7.0"},
602610

603611
// test exact
612+
{"8.0.12-4", "1.21.1", nil, "8.0.12-4"},
604613
{"8.0.12-4", "1.21.0", nil, "8.0.12-4"},
605614
{"8.0.8-3", "1.20.1", nil, "8.0.8-3"},
606615
{"8.0.8-3", "1.20.0", nil, "8.0.8-3"},
607616
{"8.0.4-1", "1.19.1", nil, "8.0.4-1"},
608617
{"8.0.4-1", "1.19.0", nil, "8.0.4-1"},
618+
{"7.0.24-13", "1.21.1", nil, "7.0.24-13"},
609619
{"7.0.24-13", "1.21.0", nil, "7.0.24-13"},
610620
{"7.0.18-11", "1.20.1", nil, "7.0.18-11"},
611621
{"7.0.18-11", "1.20.0", nil, "7.0.18-11"},
@@ -616,6 +626,7 @@ func TestApplyPsmdbReturnedVersions(t *testing.T) {
616626
{"7.0.8-5", "1.16.2", nil, "7.0.8-5"},
617627
{"7.0.8-5", "1.16.1", nil, "7.0.8-5"},
618628
{"7.0.8-5", "1.16.0", nil, "7.0.8-5"},
629+
{"6.0.25-20", "1.21.1", nil, "6.0.25-20"},
619630
{"6.0.25-20", "1.21.0", nil, "6.0.25-20"},
620631
{"6.0.21-18", "1.20.1", nil, "6.0.21-18"},
621632
{"6.0.21-18", "1.20.0", nil, "6.0.21-18"},
@@ -671,11 +682,13 @@ func TestApplyPsmdbReturnedVersions(t *testing.T) {
671682
{"3.6.18-5.0", "1.5.0", nil, "3.6.18-5.0"},
672683

673684
//test with suffix
685+
{"8.0-latest", "1.21.1", nil, "8.0.12-4"},
674686
{"8.0-latest", "1.21.0", nil, "8.0.12-4"},
675687
{"8.0-latest", "1.20.1", nil, "8.0.8-3"},
676688
{"8.0-latest", "1.20.0", nil, "8.0.8-3"},
677689
{"8.0-latest", "1.19.1", nil, "8.0.4-1"},
678690
{"8.0-latest", "1.19.0", nil, "8.0.4-1"},
691+
{"7.0-latest", "1.21.1", nil, "7.0.24-13"},
679692
{"7.0-latest", "1.21.0", nil, "7.0.24-13"},
680693
{"7.0-latest", "1.20.1", nil, "7.0.18-11"},
681694
{"7.0-latest", "1.20.0", nil, "7.0.18-11"},
@@ -686,6 +699,7 @@ func TestApplyPsmdbReturnedVersions(t *testing.T) {
686699
{"7.0-latest", "1.16.2", nil, "7.0.8-5"},
687700
{"7.0-latest", "1.16.1", nil, "7.0.8-5"},
688701
{"7.0-latest", "1.16.0", nil, "7.0.8-5"},
702+
{"6.0-latest", "1.21.1", nil, "6.0.25-20"},
689703
{"6.0-latest", "1.21.0", nil, "6.0.25-20"},
690704
{"6.0-latest", "1.20.1", nil, "6.0.21-18"},
691705
{"6.0-latest", "1.20.0", nil, "6.0.21-18"},
@@ -740,7 +754,9 @@ func TestApplyPsmdbReturnedVersions(t *testing.T) {
740754
{"3.6-latest", "1.6.0", nil, "3.6.21-10.0"},
741755
{"3.6-latest", "1.5.0", nil, "3.6.19-7.0"},
742756

757+
{"8.0-recommended", "1.21.1", nil, "8.0.12-4"},
743758
{"8.0-recommended", "1.21.0", nil, "8.0.12-4"},
759+
{"7.0-recommended", "1.21.1", nil, "7.0.24-13"},
744760
{"7.0-recommended", "1.21.0", nil, "7.0.24-13"},
745761
{"7.0-recommended", "1.20.1", nil, "7.0.18-11"},
746762
{"7.0-recommended", "1.20.0", nil, "7.0.18-11"},
@@ -751,6 +767,7 @@ func TestApplyPsmdbReturnedVersions(t *testing.T) {
751767
{"7.0-recommended", "1.16.2", nil, "7.0.8-5"},
752768
{"7.0-recommended", "1.16.1", nil, "7.0.8-5"},
753769
{"7.0-recommended", "1.16.0", nil, "7.0.8-5"},
770+
{"6.0-recommended", "1.21.1", nil, "6.0.25-20"},
754771
{"6.0-recommended", "1.21.0", nil, "6.0.25-20"},
755772
{"6.0-recommended", "1.20.1", nil, "6.0.21-18"},
756773
{"6.0-recommended", "1.20.0", nil, "6.0.21-18"},

‎api-tests/operator_route_test.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ func TestOperatorRouteShouldReturnRightOperatorVersion(t *testing.T) {
5555
{"psmdb-operator", "1.20.0"},
5656
{"psmdb-operator", "1.20.1"},
5757
{"psmdb-operator", "1.21.0"},
58+
{"psmdb-operator", "1.21.1"},
5859
{"pg-operator", "1.1.0"},
5960
{"pg-operator", "1.2.0"},
6061
{"pg-operator", "1.3.0"},
@@ -178,6 +179,7 @@ func TestOperatorRoutePsmdbShouldReturnNotEmptyResponses(t *testing.T) {
178179
{"psmdb-operator", "1.20.0"},
179180
{"psmdb-operator", "1.20.1"},
180181
{"psmdb-operator", "1.21.0"},
182+
{"psmdb-operator", "1.21.1"},
181183
}
182184

183185
for _, c := range cases {

‎sources/operator.1.21.1.psmdb-operator.dep.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{}

‎sources/operator.1.21.1.psmdb-operator.json‎

Lines changed: 141 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,141 @@
1+
{
2+
"versions": [
3+
{
4+
"operator": "1.21.1",
5+
"product": "psmdb-operator",
6+
"matrix": {
7+
"mongod": {
8+
"8.0.12-4": {
9+
"image_path": "percona/percona-server-mongodb:8.0.12-4",
10+
"image_hash": "ab8793879409788b5a19f7e332a3700520e8eeaf4b068ec8cc7d1b680f097307",
11+
"image_hash_arm64": "d367e225b57783bc2ff8451571c7568dc3b240176cf149a01cc3a7b13fb52a78",
12+
"status": "recommended",
13+
"critical": false
14+
},
15+
"8.0.8-3": {
16+
"image_path": "percona/percona-server-mongodb:8.0.8-3",
17+
"image_hash": "e4580ca292f07fd7800e139121aea4b2c1dfa6aa34f3657d25a861883fd3de41",
18+
"image_hash_arm64": "96cfee2102499aba05e63ca7862102c2b1da1cf9f4eea0cbea3793a07c183925",
19+
"status": "available",
20+
"critical": false
21+
},
22+
"8.0.4-1": {
23+
"image_path": "percona/percona-server-mongodb:8.0.4-1-multi",
24+
"image_hash": "873b201ce3d66d97b1225c26db392c5043a73cc19ee8db6f2dc1b8efd4783bcf",
25+
"image_hash_arm64": "222ccf746ad4ffdfccf41b41edaa0d318d28f663e13c9629f8dad5a5078434e5",
26+
"status": "available",
27+
"critical": false
28+
},
29+
"7.0.24-13": {
30+
"image_path": "percona/percona-server-mongodb:7.0.24-13",
31+
"image_hash": "71d5389e91014cf6c486c4d28ee2b3f19f16eb421d9d65b36d70b9f712a43eaa",
32+
"image_hash_arm64": "22012034c3e30029b34dda235aa14642377522ba307d742f64d7f69ed6feccf9",
33+
"status": "recommended",
34+
"critical": false
35+
},
36+
"7.0.18-11": {
37+
"image_path": "percona/percona-server-mongodb:7.0.18-11",
38+
"image_hash": "0115a72f5e60d86cb4f4b7eae32118c0910e8c96831e013de12798a1771c4c91",
39+
"image_hash_arm64": "86c17067f3e233f522612389ed2500231cbb22ce93524c476b9aa8d464d06f0b",
40+
"status": "available",
41+
"critical": false
42+
},
43+
"7.0.15-9": {
44+
"image_path": "percona/percona-server-mongodb:7.0.15-9-multi",
45+
"image_hash": "7bffdf2e71c121e2ab37b4fa7e2f513237abdd65266da384bf8197cee1316917",
46+
"image_hash_arm64": "fdc4875df82572267445811445ebf517f63e509be54d1a2599fe58e1c525e1d8",
47+
"status": "available",
48+
"critical": false
49+
},
50+
"7.0.14-8": {
51+
"image_path": "percona/percona-server-mongodb:7.0.14-8-multi",
52+
"image_hash": "ed932d4e7231dcb793bf609f781226a8393aa8958b103339f4a503a8f70ed17e",
53+
"image_hash_arm64": "052f84ee926ad9b5146f08a7e887820342d65b757a284c2f0ea8e937bb51cd7b",
54+
"status": "available",
55+
"critical": false
56+
},
57+
"7.0.12-7": {
58+
"image_path": "percona/percona-server-mongodb:7.0.12-7",
59+
"image_hash": "7f00e19878bd143119772cd5468f1f0f9857dfcd2ae2f814d52ef3fa7cff6899",
60+
"status": "available",
61+
"critical": false
62+
},
63+
"6.0.25-20": {
64+
"image_path": "percona/percona-server-mongodb:6.0.25-20",
65+
"image_hash": "0254c10fb8c249c108cd0a6e5885dfe76785e8fdd6ceb23ce98854234672e5d6",
66+
"image_hash_arm64": "0fd4d1ca4da6377450964f225bd1d508730be9c1fca1c36c3bfcc107678d9a50",
67+
"status": "recommended",
68+
"critical": false
69+
},
70+
"6.0.21-18": {
71+
"image_path": "percona/percona-server-mongodb:6.0.21-18",
72+
"image_hash": "579d2fdc617ea42ab2be8c2682955b489dbf49ab19771b7a5d9c77da4dd323e7",
73+
"image_hash_arm64": "b9d2b7e8c4a97b2d20e2aaccfbd183f65f8ccd9f2ea13939515e18e02bc64871",
74+
"status": "available",
75+
"critical": false
76+
},
77+
"6.0.19-16": {
78+
"image_path": "percona/percona-server-mongodb:6.0.19-16-multi",
79+
"image_hash": "c8ff08c4b8a96679e2daf4845873fdd4d2c48646b84db19f0c5fe02e8f3808b4",
80+
"image_hash_arm64": "6908b28ced260b762cd38a642c06dd802cbef0a43ab5f22afe7b583b234ebcec",
81+
"status": "available",
82+
"critical": false
83+
},
84+
"6.0.18-15": {
85+
"image_path": "percona/percona-server-mongodb:6.0.18-15-multi",
86+
"image_hash": "d197ce16ab0eed6df25e632b92dea5ce448e549e02028f39b78f5730c2ffef36",
87+
"image_hash_arm64": "7fd1d8f74f71dea6ad423e8e202a0617bdd1e8783f2b5cb071b5281685ce0adf",
88+
"status": "available",
89+
"critical": false
90+
},
91+
"6.0.16-13": {
92+
"image_path": "percona/percona-server-mongodb:6.0.16-13",
93+
"image_hash": "1497e58e39497d8425ccd053898dc323338d6eb3f0e3c4c223f9d5a468da7931",
94+
"status": "available",
95+
"critical": false
96+
}
97+
},
98+
"pmm": {
99+
"2.44.1-1": {
100+
"image_path": "percona/pmm-client:2.44.1-1",
101+
"image_hash": "52a8fb5e8f912eef1ff8a117ea323c401e278908ce29928dafc23fac1db4f1e3",
102+
"status": "available",
103+
"critical": false
104+
},
105+
"3.4.1": {
106+
"image_hash": "1c59d7188f8404e0294f4bfb3d2c3600107f808a023668a170a6b8036c56619b",
107+
"image_path": "percona/pmm-client:3.4.1",
108+
"status": "recommended",
109+
"critical": false
110+
}
111+
},
112+
"backup": {
113+
"2.11.0": {
114+
"image_path": "percona/percona-backup-mongodb:2.11.0",
115+
"image_hash": "d09f5de92cfbc5a7a42a8cc86742a07481c98b3b42cffdc6359b3ec1f63de3a5",
116+
"image_hash_arm64": "a60d095439537b982209582d428b3b39a01e31e88b2b62d2dcbd99ea4e2d9928",
117+
"status": "recommended",
118+
"critical": false
119+
}
120+
},
121+
"log_collector": {
122+
"4.0.1": {
123+
"image_path": "percona/fluentbit:4.0.1",
124+
"image_hash": "a4ab7dd10379ccf74607f6b05225c4996eeff53b628bda94e615781a1f58b779",
125+
"status": "recommended",
126+
"critical": false
127+
}
128+
},
129+
"operator": {
130+
"1.21.1": {
131+
"image_path": "percona/percona-server-mongodb-operator:1.21.1",
132+
"image_hash": "155f6ee71dcfc52ff30ed4e2c4396fc3d3534c83b4794de4d90c79542fbb0e34",
133+
"image_hash_arm64": "88926b82a5551c36592d1c83b2e80d3c3560f0809cdb7b5d6648038123b65097",
134+
"status": "recommended",
135+
"critical": false
136+
}
137+
}
138+
}
139+
}
140+
]
141+
}

0 commit comments

Comments
 (0)