Skip to content

Commit f79839f

Browse files
valmiranogueiravalmiranogueira
authored
Merge pull request #453 from Percona-Lab/release-ps-1.0.0
Update PS with 1.0.0 images
2 parents c47ab6c + 6acf5ab commit f79839f

File tree

4 files changed

+202
-2
lines changed

4 files changed

+202
-2
lines changed

‎api-tests/apply_route_test.go‎

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

7171
psParams := &version_service.VersionServiceApplyParams{
7272
Apply: "latest",
73-
OperatorVersion: "0.12.0",
73+
OperatorVersion: "1.0.0",
7474
Product: "ps-operator",
7575
}
7676
psParams.WithTimeout(2 * time.Second)
@@ -152,7 +152,7 @@ func TestApplyPsShouldReturnSameMajorVersion(t *testing.T) {
152152

153153
params := &version_service.VersionServiceApplyParams{
154154
Apply: "latest",
155-
OperatorVersion: "0.12.0",
155+
OperatorVersion: "1.0.0",
156156
Product: "ps-operator",
157157
}
158158
params.WithTimeout(2 * time.Second)
@@ -1170,6 +1170,7 @@ func TestApplyPSReturnedVersions(t *testing.T) {
11701170
version string
11711171
}{
11721172
// test latest
1173+
{"latest", "1.0.0", nil, "8.4.6-6"},
11731174
{"latest", "0.12.0", nil, "8.4.6-6"},
11741175
{"latest", "0.11.0", nil, "8.4.5-5"},
11751176
{"latest", "0.10.0", nil, "8.0.42-33"},
@@ -1178,12 +1179,15 @@ func TestApplyPSReturnedVersions(t *testing.T) {
11781179
{"latest", "0.7.0", nil, "8.0.36-28"},
11791180
{"latest", "0.6.0", nil, "8.0.33-25"},
11801181
{"latest", "0.5.0", nil, "8.0.32-24"},
1182+
{"latest", "1.0.0", &v84, "8.4.6-6"},
11811183
{"latest", "0.12.0", &v84, "8.4.6-6"},
11821184
{"latest", "0.11.0", &v84, "8.4.5-5"},
1185+
{"latest", "1.0.0", &v80, "8.0.43-34"},
11831186
{"latest", "0.12.0", &v80, "8.0.43-34"},
11841187
{"latest", "0.11.0", &v80, "8.0.42-33"},
11851188

11861189
// test recommended
1190+
{"recommended", "1.0.0", nil, "8.4.6-6"},
11871191
{"recommended", "0.12.0", nil, "8.4.6-6"},
11881192
{"recommended", "0.11.0", nil, "8.0.42-33"},
11891193
{"recommended", "0.10.0", nil, "8.0.42-33"},
@@ -1192,12 +1196,16 @@ func TestApplyPSReturnedVersions(t *testing.T) {
11921196
{"recommended", "0.7.0", nil, "8.0.36-28"},
11931197
{"recommended", "0.6.0", nil, "8.0.33-25"},
11941198
{"recommended", "0.5.0", nil, "8.0.32-24"},
1199+
{"recommended", "1.0.0", &v84, "8.4.6-6"},
11951200
{"recommended", "0.12.0", &v84, "8.4.6-6"},
1201+
{"recommended", "1.0.0", &v80, "8.0.43-34"},
11961202
{"recommended", "0.12.0", &v80, "8.0.43-34"},
11971203
{"recommended", "0.11.0", &v80, "8.0.42-33"},
11981204

11991205
// test exact
1206+
{"8.4.6", "1.0.0", nil, "8.4.6-6"},
12001207
{"8.4.6", "0.12.0", nil, "8.4.6-6"},
1208+
{"8.0.43", "1.0.0", nil, "8.0.43-34"},
12011209
{"8.0.43", "0.12.0", nil, "8.0.43-34"},
12021210
{"8.0.42", "0.11.0", nil, "8.0.42-33"},
12031211
{"8.0.42", "0.10.0", nil, "8.0.42-33"},
@@ -1208,8 +1216,10 @@ func TestApplyPSReturnedVersions(t *testing.T) {
12081216
{"8.0.30", "0.5.0", nil, "8.0.30-22"},
12091217

12101218
//test with suffix
1219+
{"8.4-latest", "1.0.0", nil, "8.4.6-6"},
12111220
{"8.4-latest", "0.12.0", nil, "8.4.6-6"},
12121221
{"8.4-latest", "0.11.0", nil, "8.4.5-5"},
1222+
{"8.0-latest", "1.0.0", nil, "8.0.43-34"},
12131223
{"8.0-latest", "0.12.0", nil, "8.0.43-34"},
12141224
{"8.0-latest", "0.11.0", nil, "8.0.42-33"},
12151225
{"8.0-latest", "0.10.0", nil, "8.0.42-33"},
@@ -1218,7 +1228,9 @@ func TestApplyPSReturnedVersions(t *testing.T) {
12181228
{"8.0-latest", "0.7.0", nil, "8.0.36-28"},
12191229
{"8.0-latest", "0.6.0", nil, "8.0.33-25"},
12201230
{"8.0-latest", "0.5.0", nil, "8.0.32-24"},
1231+
{"8.4-recommended", "1.0.0", nil, "8.4.6-6"},
12211232
{"8.4-recommended", "0.12.0", nil, "8.4.6-6"},
1233+
{"8.0-recommended", "1.0.0", nil, "8.0.43-34"},
12221234
{"8.0-recommended", "0.12.0", nil, "8.0.43-34"},
12231235
{"8.0-recommended", "0.11.0", nil, "8.0.42-33"},
12241236
{"8.0-recommended", "0.10.0", nil, "8.0.42-33"},

‎api-tests/operator_route_test.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -286,6 +286,8 @@ func TestOperatorRoutePsShouldReturnNotEmptyResponses(t *testing.T) {
286286
{"ps-operator", "0.9.0"},
287287
{"ps-operator", "0.10.0"},
288288
{"ps-operator", "0.11.0"},
289+
{"ps-operator", "0.12.0"},
290+
{"ps-operator", "1.0.0"},
289291
}
290292

291293
for _, c := range cases {

‎sources/operator.1.0.0.ps-operator.dep.json‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
{
2+
"backup": {
3+
"8.4.0-4": {
4+
">=": [
5+
{
6+
"var": "productVersion"
7+
},
8+
"8.4"
9+
]
10+
},
11+
"8.0.35-34": {
12+
"and": [
13+
{
14+
">=": [
15+
{
16+
"var": "productVersion"
17+
},
18+
"8.0"
19+
]
20+
},
21+
{
22+
"<": [
23+
{
24+
"var": "productVersion"
25+
},
26+
"8.4"
27+
]
28+
}
29+
]
30+
}
31+
},
32+
"router": {
33+
"8.4.6": {
34+
">=": [
35+
{
36+
"var": "productVersion"
37+
},
38+
"8.4"
39+
]
40+
},
41+
"8.0.43": {
42+
"and": [
43+
{
44+
">=": [
45+
{
46+
"var": "productVersion"
47+
},
48+
"8.0"
49+
]
50+
},
51+
{
52+
"<": [
53+
{
54+
"var": "productVersion"
55+
},
56+
"8.4"
57+
]
58+
}
59+
]
60+
}
61+
}
62+
}

‎sources/operator.1.0.0.ps-operator.json‎

Lines changed: 124 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,124 @@
1+
{
2+
"versions": [
3+
{
4+
"operator": "1.0.0",
5+
"product": "ps-operator",
6+
"matrix": {
7+
"mysql": {
8+
"8.4.6-6": {
9+
"image_path": "percona/percona-server:8.4.6-6.1",
10+
"image_hash": "3654cdd74646f11afe15b48de61ed3224ab72e7cd9ddea560725b77e2fa0ec93",
11+
"status": "recommended",
12+
"critical": false
13+
},
14+
"8.4.5-5": {
15+
"image_path": "percona/percona-server:8.4.5-5",
16+
"image_hash": "61a6811372d919316640990922188005f92d58639a2472865d59e56b2a6050a1",
17+
"status": "available",
18+
"critical": false
19+
},
20+
"8.0.43-34": {
21+
"image_path": "percona/percona-server:8.0.43-34.1",
22+
"image_hash": "aef5deeef0dbaddce47cb0045c6064faab9f501b3a914d42fc40240314607df9",
23+
"status": "recommended",
24+
"critical": false
25+
},
26+
"8.0.42-33": {
27+
"image_path": "percona/percona-server:8.0.42-33",
28+
"image_hash": "a7cbaa50c43483a07506f7cd5cccc4e587611f6500e1be5df0a93e339b9d3bc5",
29+
"status": "available",
30+
"critical": false
31+
},
32+
"8.0.40-31": {
33+
"image_path": "percona/percona-server:8.0.40-31",
34+
"image_hash": "09276abecbc7c38ce9c5453da1728f3e7d81722c56e2837574ace3a021ee92f2",
35+
"status": "available",
36+
"critical": false
37+
},
38+
"8.0.36-28": {
39+
"image_path": "percona/percona-server:8.0.36-28",
40+
"image_hash": "423acd206f94b34288d10ed041c3ba42543e26e44f3706621320504a010dd41f",
41+
"status": "available",
42+
"critical": false
43+
},
44+
"8.0.33-25": {
45+
"image_path": "percona/percona-server:8.0.33-25",
46+
"image_hash": "14ef81039f2dfa5e19a9bf20e39aaf367aae4370db70899bc5217118d6fd2171",
47+
"status": "available",
48+
"critical": false
49+
}
50+
},
51+
"pmm": {
52+
"3.4.1": {
53+
"image_hash": "1c59d7188f8404e0294f4bfb3d2c3600107f808a023668a170a6b8036c56619b",
54+
"image_hash_arm64": "2d23ba3e6f0ae88201be15272c5038d7c38f382ad8222cd93f094b5a20b854a5",
55+
"image_path": "percona/pmm-client:3.4.1",
56+
"status": "recommended",
57+
"critical": true
58+
}
59+
},
60+
"haproxy": {
61+
"2.8.15": {
62+
"image_path": "percona/haproxy:2.8.15",
63+
"image_hash": "e64e468ac0ed2036ee164631469cc71821dcb84a6d568883f704d0eacaf84bb4",
64+
"status": "recommended",
65+
"critical": false
66+
}
67+
},
68+
"orchestrator": {
69+
"3.2.6-18": {
70+
"image_path": "percona/percona-orchestrator:3.2.6-18",
71+
"image_hash": "6fa4c515363c2a89a13accb0a58ba66519329afc04ad31c400775ced96bc8c09",
72+
"status": "recommended",
73+
"critical": false
74+
}
75+
},
76+
"router": {
77+
"8.4.6": {
78+
"image_path": "percona/percona-mysql-router:8.4.6",
79+
"image_hash": "59df1dcbecb636a67bcbb1dfcfd8f5710f8e516a44bfc68b936f24947a0f7b6e",
80+
"status": "recommended",
81+
"critical": false
82+
},
83+
"8.0.43": {
84+
"image_path": "percona/percona-mysql-router:8.0.43",
85+
"image_hash": "1f246c634547c5efdf26cba0f037500b347709d78d8759bd6c0ccc903ffc31a4",
86+
"status": "available",
87+
"critical": false
88+
}
89+
},
90+
"toolkit": {
91+
"3.7.0": {
92+
"image_path": "percona/percona-toolkit:3.7.0-2",
93+
"image_hash": "17ef2b69a97fa546d1f925c74ca09587ac215085c392761bb4d51f188baa6c0e",
94+
"status": "recommended",
95+
"critical": false
96+
}
97+
},
98+
"backup": {
99+
"8.4.0-4": {
100+
"image_path": "percona/percona-xtrabackup:8.4.0-4.1",
101+
"image_hash": "840260525cf27e299b5edc7b48ad19caea03ad3ea7349000d0fc6de627b2fb10",
102+
"status": "recommended",
103+
"critical": false
104+
},
105+
"8.0.35-34": {
106+
"image_path": "percona/percona-xtrabackup:8.0.35-34.1",
107+
"image_hash": "967bafa0823c90aa8fa9c25a9012be36b0deef64e255294a09148d77ce6aea68",
108+
"status": "recommended",
109+
"critical": false
110+
}
111+
},
112+
"operator": {
113+
"1.0.0": {
114+
"image_path": "percona/percona-server-mysql-operator:1.0.0",
115+
"image_hash": "71850c11e72e87c09e2f423c57963c143f5e3fac9ac7d062119f5e4254f158f7",
116+
"image_hash_arm64": "5a55332a1a25ba6bbde306684d4ee77277a23e3933c17cac61b37615acb9ec85",
117+
"status": "recommended",
118+
"critical": false
119+
}
120+
}
121+
}
122+
}
123+
]
124+
}

0 commit comments

Comments
 (0)