Skip to content

Commit 6888afd

Browse files
jvpasinattojvpasinatto
authored
K8SPSMDB-1481: Update PSMDB operator with 1.21.0 images (#445)
* K8SPSMDB-1481: Update PSMDB operator with 1.21.0 images * Update operator hashes * Fix tests * Add logcollector image * Fix logcollector image * Fix logcollector image again * Update PMM image
1 parent 1a0af70 commit 6888afd

File tree

4 files changed

+167
-7
lines changed

4 files changed

+167
-7
lines changed

‎api-tests/apply_route_test.go‎

Lines changed: 23 additions & 7 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.20.1",
39+
OperatorVersion: "1.21.0",
4040
Product: "psmdb-operator",
4141
}
4242
psmdbParams.WithTimeout(2 * time.Second)
@@ -47,7 +47,7 @@ func TestApplyShouldReturnJustOneVersion(t *testing.T) {
4747
assert.Len(t, psmdbResp.Payload.Versions, 1)
4848
assert.Len(t, psmdbResp.Payload.Versions[0].Matrix.Mongod, 1)
4949
assert.Len(t, psmdbResp.Payload.Versions[0].Matrix.Backup, 1)
50-
assert.Len(t, psmdbResp.Payload.Versions[0].Matrix.Pmm, 1)
50+
assert.Len(t, psmdbResp.Payload.Versions[0].Matrix.Pmm, 2)
5151
assert.Len(t, psmdbResp.Payload.Versions[0].Matrix.Operator, 1)
5252

5353
pgParams := &version_service.VersionServiceApplyParams{
@@ -112,7 +112,7 @@ func TestApplyPsmdbShouldReturnSameMajorVersion(t *testing.T) {
112112

113113
psmdbParams := &version_service.VersionServiceApplyParams{
114114
Apply: "latest",
115-
OperatorVersion: "1.20.1",
115+
OperatorVersion: "1.21.0",
116116
Product: "psmdb-operator",
117117
}
118118
psmdbParams.WithTimeout(2 * time.Second)
@@ -139,10 +139,10 @@ func TestApplyPgShouldReturnSameMajorVersion(t *testing.T) {
139139

140140
for _, v := range []string{"13.0", "14.0", "15.0", "16.0", "17.0"} {
141141
pgParams.DatabaseVersion = &v
142-
psmdbResp, err := cli.VersionService.VersionServiceApply(pgParams)
142+
pgResp, err := cli.VersionService.VersionServiceApply(pgParams)
143143
assert.NoError(t, err)
144144

145-
k := getVersion(psmdbResp.Payload.Versions[0].Matrix.Postgresql)
145+
k := getVersion(pgResp.Payload.Versions[0].Matrix.Postgresql)
146146
assert.True(t, strings.HasPrefix(k, strings.Split(v, ".")[0]))
147147
}
148148
}
@@ -431,6 +431,7 @@ func TestApplyPsmdbReturnedVersions(t *testing.T) {
431431
version string
432432
}{
433433
// test latest
434+
{"latest", "1.21.0", nil, "8.0.12-4"},
434435
{"latest", "1.20.1", nil, "8.0.8-3"},
435436
{"latest", "1.20.0", nil, "8.0.8-3"},
436437
{"latest", "1.19.1", nil, "8.0.4-1"},
@@ -451,10 +452,12 @@ func TestApplyPsmdbReturnedVersions(t *testing.T) {
451452
{"latest", "1.7.0", nil, "4.4.3-5"},
452453
{"latest", "1.6.0", nil, "4.4.2-4"},
453454
{"latest", "1.5.0", nil, "4.2.8-8"},
455+
{"latest", "1.21.0", &v80, "8.0.12-4"},
454456
{"latest", "1.20.1", &v80, "8.0.8-3"},
455457
{"latest", "1.20.0", &v80, "8.0.8-3"},
456458
{"latest", "1.19.1", &v80, "8.0.4-1"},
457459
{"latest", "1.19.0", &v80, "8.0.4-1"},
460+
{"latest", "1.21.0", &v70, "7.0.24-13"},
458461
{"latest", "1.20.1", &v70, "7.0.18-11"},
459462
{"latest", "1.20.0", &v70, "7.0.18-11"},
460463
{"latest", "1.19.1", &v70, "7.0.15-9"},
@@ -464,6 +467,7 @@ func TestApplyPsmdbReturnedVersions(t *testing.T) {
464467
{"latest", "1.16.2", &v70, "7.0.8-5"},
465468
{"latest", "1.16.1", &v70, "7.0.8-5"},
466469
{"latest", "1.16.0", &v70, "7.0.8-5"},
470+
{"latest", "1.21.0", &v60, "6.0.25-20"},
467471
{"latest", "1.20.1", &v60, "6.0.21-18"},
468472
{"latest", "1.20.0", &v60, "6.0.21-18"},
469473
{"latest", "1.19.1", &v60, "6.0.19-16"},
@@ -514,6 +518,7 @@ func TestApplyPsmdbReturnedVersions(t *testing.T) {
514518
{"latest", "1.5.0", &v36, "3.6.19-7.0"},
515519

516520
// test recommended
521+
{"recommended", "1.21.0", nil, "8.0.12-4"},
517522
{"recommended", "1.20.1", nil, "7.0.18-11"},
518523
{"recommended", "1.20.0", nil, "7.0.18-11"},
519524
{"recommended", "1.19.1", nil, "7.0.15-9"},
@@ -534,7 +539,8 @@ func TestApplyPsmdbReturnedVersions(t *testing.T) {
534539
{"recommended", "1.7.0", nil, "4.4.3-5"},
535540
{"recommended", "1.6.0", nil, "4.4.2-4"},
536541
{"recommended", "1.5.0", nil, "4.2.8-8"},
537-
// Due to issue with PBM restore PBM-1493 we remove 8.0 from recommended
542+
{"recommended", "1.21.0", &v80, "8.0.12-4"},
543+
{"recommended", "1.21.0", &v70, "7.0.24-13"},
538544
{"recommended", "1.20.1", &v70, "7.0.18-11"},
539545
{"recommended", "1.20.0", &v70, "7.0.18-11"},
540546
{"recommended", "1.19.0", &v70, "7.0.15-9"},
@@ -543,6 +549,7 @@ func TestApplyPsmdbReturnedVersions(t *testing.T) {
543549
{"recommended", "1.16.2", &v70, "7.0.8-5"},
544550
{"recommended", "1.16.1", &v70, "7.0.8-5"},
545551
{"recommended", "1.16.0", &v70, "7.0.8-5"},
552+
{"recommended", "1.21.0", &v60, "6.0.25-20"},
546553
{"recommended", "1.20.1", &v60, "6.0.21-18"},
547554
{"recommended", "1.20.0", &v60, "6.0.21-18"},
548555
{"recommended", "1.19.1", &v60, "6.0.19-16"},
@@ -594,10 +601,12 @@ func TestApplyPsmdbReturnedVersions(t *testing.T) {
594601
{"recommended", "1.5.0", &v36, "3.6.19-7.0"},
595602

596603
// test exact
604+
{"8.0.12-4", "1.21.0", nil, "8.0.12-4"},
597605
{"8.0.8-3", "1.20.1", nil, "8.0.8-3"},
598606
{"8.0.8-3", "1.20.0", nil, "8.0.8-3"},
599607
{"8.0.4-1", "1.19.1", nil, "8.0.4-1"},
600608
{"8.0.4-1", "1.19.0", nil, "8.0.4-1"},
609+
{"7.0.24-13", "1.21.0", nil, "7.0.24-13"},
601610
{"7.0.18-11", "1.20.1", nil, "7.0.18-11"},
602611
{"7.0.18-11", "1.20.0", nil, "7.0.18-11"},
603612
{"7.0.15-9", "1.19.1", nil, "7.0.15-9"},
@@ -607,6 +616,7 @@ func TestApplyPsmdbReturnedVersions(t *testing.T) {
607616
{"7.0.8-5", "1.16.2", nil, "7.0.8-5"},
608617
{"7.0.8-5", "1.16.1", nil, "7.0.8-5"},
609618
{"7.0.8-5", "1.16.0", nil, "7.0.8-5"},
619+
{"6.0.25-20", "1.21.0", nil, "6.0.25-20"},
610620
{"6.0.21-18", "1.20.1", nil, "6.0.21-18"},
611621
{"6.0.21-18", "1.20.0", nil, "6.0.21-18"},
612622
{"6.0.19-16", "1.19.1", nil, "6.0.19-16"},
@@ -661,10 +671,12 @@ func TestApplyPsmdbReturnedVersions(t *testing.T) {
661671
{"3.6.18-5.0", "1.5.0", nil, "3.6.18-5.0"},
662672

663673
//test with suffix
674+
{"8.0-latest", "1.21.0", nil, "8.0.12-4"},
664675
{"8.0-latest", "1.20.1", nil, "8.0.8-3"},
665676
{"8.0-latest", "1.20.0", nil, "8.0.8-3"},
666677
{"8.0-latest", "1.19.1", nil, "8.0.4-1"},
667678
{"8.0-latest", "1.19.0", nil, "8.0.4-1"},
679+
{"7.0-latest", "1.21.0", nil, "7.0.24-13"},
668680
{"7.0-latest", "1.20.1", nil, "7.0.18-11"},
669681
{"7.0-latest", "1.20.0", nil, "7.0.18-11"},
670682
{"7.0-latest", "1.19.1", nil, "7.0.15-9"},
@@ -674,6 +686,7 @@ func TestApplyPsmdbReturnedVersions(t *testing.T) {
674686
{"7.0-latest", "1.16.2", nil, "7.0.8-5"},
675687
{"7.0-latest", "1.16.1", nil, "7.0.8-5"},
676688
{"7.0-latest", "1.16.0", nil, "7.0.8-5"},
689+
{"6.0-latest", "1.21.0", nil, "6.0.25-20"},
677690
{"6.0-latest", "1.20.1", nil, "6.0.21-18"},
678691
{"6.0-latest", "1.20.0", nil, "6.0.21-18"},
679692
{"6.0-latest", "1.19.1", nil, "6.0.19-16"},
@@ -726,7 +739,9 @@ func TestApplyPsmdbReturnedVersions(t *testing.T) {
726739
{"3.6-latest", "1.7.0", nil, "3.6.21-10.0"},
727740
{"3.6-latest", "1.6.0", nil, "3.6.21-10.0"},
728741
{"3.6-latest", "1.5.0", nil, "3.6.19-7.0"},
729-
// Due to issue with PBM restore PBM-1493 we remove 8.0 from recommended
742+
743+
{"8.0-recommended", "1.21.0", nil, "8.0.12-4"},
744+
{"7.0-recommended", "1.21.0", nil, "7.0.24-13"},
730745
{"7.0-recommended", "1.20.1", nil, "7.0.18-11"},
731746
{"7.0-recommended", "1.20.0", nil, "7.0.18-11"},
732747
{"7.0-recommended", "1.19.1", nil, "7.0.15-9"},
@@ -736,6 +751,7 @@ func TestApplyPsmdbReturnedVersions(t *testing.T) {
736751
{"7.0-recommended", "1.16.2", nil, "7.0.8-5"},
737752
{"7.0-recommended", "1.16.1", nil, "7.0.8-5"},
738753
{"7.0-recommended", "1.16.0", nil, "7.0.8-5"},
754+
{"6.0-recommended", "1.21.0", nil, "6.0.25-20"},
739755
{"6.0-recommended", "1.20.1", nil, "6.0.21-18"},
740756
{"6.0-recommended", "1.20.0", nil, "6.0.21-18"},
741757
{"6.0-recommended", "1.19.1", nil, "6.0.19-16"},

‎api-tests/operator_route_test.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ func TestOperatorRouteShouldReturnRightOperatorVersion(t *testing.T) {
5454
{"psmdb-operator", "1.19.1"},
5555
{"psmdb-operator", "1.20.0"},
5656
{"psmdb-operator", "1.20.1"},
57+
{"psmdb-operator", "1.21.0"},
5758
{"pg-operator", "1.1.0"},
5859
{"pg-operator", "1.2.0"},
5960
{"pg-operator", "1.3.0"},
@@ -176,6 +177,7 @@ func TestOperatorRoutePsmdbShouldReturnNotEmptyResponses(t *testing.T) {
176177
{"psmdb-operator", "1.19.1"},
177178
{"psmdb-operator", "1.20.0"},
178179
{"psmdb-operator", "1.20.1"},
180+
{"psmdb-operator", "1.21.0"},
179181
}
180182

181183
for _, c := range cases {

‎sources/operator.1.21.0.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.0.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.0",
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.0": {
131+
"image_path": "percona/percona-server-mongodb-operator:1.21.0",
132+
"image_hash": "af7606b2901039e1593ec6dec8b13a48cf50fcc321ab8d6eb2eb6433f49340ca",
133+
"image_hash_arm64": "09a2ef90be5427c14ac37d71ba99750b5790646e2882d27f9066f720f1a3c3cd",
134+
"status": "recommended",
135+
"critical": false
136+
}
137+
}
138+
}
139+
}
140+
]
141+
}

0 commit comments

Comments
 (0)