diff --git a/api-tests/apply_route_test.go b/api-tests/apply_route_test.go index 669848e9..79fb64ee 100644 --- a/api-tests/apply_route_test.go +++ b/api-tests/apply_route_test.go @@ -71,7 +71,7 @@ func TestApplyShouldReturnJustOneVersion(t *testing.T) { psParams := &version_service.VersionServiceApplyParams{ Apply: "latest", - OperatorVersion: "1.1.0", + OperatorVersion: "1.2.0", Product: "ps-operator", } psParams.WithTimeout(2 * time.Second) @@ -156,7 +156,7 @@ func TestApplyPsShouldReturnSameMajorVersion(t *testing.T) { params := &version_service.VersionServiceApplyParams{ Apply: "latest", - OperatorVersion: "1.1.0", + OperatorVersion: "1.2.0", Product: "ps-operator", } params.WithTimeout(2 * time.Second) @@ -1371,6 +1371,7 @@ func TestApplyPSReturnedVersions(t *testing.T) { version string }{ // test latest + {"latest", "1.2.0", nil, "8.4.10-10"}, {"latest", "1.1.0", nil, "8.4.8-8"}, {"latest", "1.0.0", nil, "8.4.6-6"}, {"latest", "0.12.0", nil, "8.4.6-6"}, @@ -1381,16 +1382,19 @@ func TestApplyPSReturnedVersions(t *testing.T) { {"latest", "0.7.0", nil, "8.0.36-28"}, {"latest", "0.6.0", nil, "8.0.33-25"}, {"latest", "0.5.0", nil, "8.0.32-24"}, + {"latest", "1.2.0", &v84, "8.4.10-10"}, {"latest", "1.1.0", &v84, "8.4.8-8"}, {"latest", "1.0.0", &v84, "8.4.6-6"}, {"latest", "0.12.0", &v84, "8.4.6-6"}, {"latest", "0.11.0", &v84, "8.4.5-5"}, + {"latest", "1.2.0", &v80, "8.0.46-37"}, {"latest", "1.1.0", &v80, "8.0.45-36"}, {"latest", "1.0.0", &v80, "8.0.43-34"}, {"latest", "0.12.0", &v80, "8.0.43-34"}, {"latest", "0.11.0", &v80, "8.0.42-33"}, // test recommended + {"recommended", "1.2.0", nil, "8.4.10-10"}, {"recommended", "1.1.0", nil, "8.4.8-8"}, {"recommended", "1.0.0", nil, "8.4.6-6"}, {"recommended", "0.12.0", nil, "8.4.6-6"}, @@ -1401,15 +1405,19 @@ func TestApplyPSReturnedVersions(t *testing.T) { {"recommended", "0.7.0", nil, "8.0.36-28"}, {"recommended", "0.6.0", nil, "8.0.33-25"}, {"recommended", "0.5.0", nil, "8.0.32-24"}, + {"recommended", "1.2.0", &v84, "8.4.10-10"}, {"recommended", "1.1.0", &v84, "8.4.8-8"}, {"recommended", "1.0.0", &v84, "8.4.6-6"}, {"recommended", "0.12.0", &v84, "8.4.6-6"}, + {"recommended", "1.2.0", &v80, "8.0.46-37"}, {"recommended", "1.1.0", &v80, "8.0.45-36"}, {"recommended", "1.0.0", &v80, "8.0.43-34"}, {"recommended", "0.12.0", &v80, "8.0.43-34"}, {"recommended", "0.11.0", &v80, "8.0.42-33"}, // test exact + {"8.4.10", "1.2.0", nil, "8.4.10-10"}, + {"8.0.46", "1.2.0", nil, "8.0.46-37"}, {"8.4.8", "1.1.0", nil, "8.4.8-8"}, {"8.0.45", "1.1.0", nil, "8.0.45-36"}, {"8.4.6", "1.0.0", nil, "8.4.6-6"}, @@ -1425,10 +1433,12 @@ func TestApplyPSReturnedVersions(t *testing.T) { {"8.0.30", "0.5.0", nil, "8.0.30-22"}, //test with suffix + {"8.4-latest", "1.2.0", nil, "8.4.10-10"}, {"8.4-latest", "1.1.0", nil, "8.4.8-8"}, {"8.4-latest", "1.0.0", nil, "8.4.6-6"}, {"8.4-latest", "0.12.0", nil, "8.4.6-6"}, {"8.4-latest", "0.11.0", nil, "8.4.5-5"}, + {"8.0-latest", "1.2.0", nil, "8.0.46-37"}, {"8.0-latest", "1.1.0", nil, "8.0.45-36"}, {"8.0-latest", "1.0.0", nil, "8.0.43-34"}, {"8.0-latest", "0.12.0", nil, "8.0.43-34"}, @@ -1439,9 +1449,11 @@ func TestApplyPSReturnedVersions(t *testing.T) { {"8.0-latest", "0.7.0", nil, "8.0.36-28"}, {"8.0-latest", "0.6.0", nil, "8.0.33-25"}, {"8.0-latest", "0.5.0", nil, "8.0.32-24"}, + {"8.4-recommended", "1.2.0", nil, "8.4.10-10"}, {"8.4-recommended", "1.1.0", nil, "8.4.8-8"}, {"8.4-recommended", "1.0.0", nil, "8.4.6-6"}, {"8.4-recommended", "0.12.0", nil, "8.4.6-6"}, + {"8.0-recommended", "1.2.0", nil, "8.0.46-37"}, {"8.0-recommended", "1.1.0", nil, "8.0.45-36"}, {"8.0-recommended", "1.0.0", nil, "8.0.43-34"}, {"8.0-recommended", "0.12.0", nil, "8.0.43-34"}, diff --git a/api-tests/operator_route_test.go b/api-tests/operator_route_test.go index ce4a2e8d..38880507 100644 --- a/api-tests/operator_route_test.go +++ b/api-tests/operator_route_test.go @@ -92,6 +92,7 @@ func TestOperatorRouteShouldReturnRightOperatorVersion(t *testing.T) { {"ps-operator", "0.12.0"}, {"ps-operator", "1.0.0"}, {"ps-operator", "1.1.0"}, + {"ps-operator", "1.2.0"}, } for _, c := range cases { @@ -335,6 +336,7 @@ func TestOperatorRoutePsShouldReturnNotEmptyResponses(t *testing.T) { {"ps-operator", "0.12.0"}, {"ps-operator", "1.0.0"}, {"ps-operator", "1.1.0"}, + {"ps-operator", "1.2.0"}, } for _, c := range cases { diff --git a/go.mod b/go.mod index 5c36ad9b..9010d37a 100644 --- a/go.mod +++ b/go.mod @@ -67,10 +67,10 @@ require ( go.uber.org/multierr v1.11.0 // indirect go.yaml.in/yaml/v3 v3.0.4 // indirect golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 // indirect - golang.org/x/net v0.50.0 // indirect - golang.org/x/sync v0.19.0 // indirect - golang.org/x/sys v0.41.0 // indirect - golang.org/x/text v0.34.0 // indirect + golang.org/x/net v0.56.0 // indirect + golang.org/x/sync v0.21.0 // indirect + golang.org/x/sys v0.46.0 // indirect + golang.org/x/text v0.38.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 // indirect gopkg.in/yaml.v2 v2.3.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index ba427843..edb30b7a 100644 --- a/go.sum +++ b/go.sum @@ -211,28 +211,28 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.50.0 h1:ucWh9eiCGyDR3vtzso0WMQinm2Dnt8cFMuQa9K33J60= -golang.org/x/net v0.50.0/go.mod h1:UgoSli3F/pBgdJBHCTc+tp3gmrU4XswgGRgtnwWTfyM= +golang.org/x/net v0.56.0 h1:Rw8j/hFzGvJUZwNBXnAtf5sVDVt+65SK2C7IxCxZt5o= +golang.org/x/net v0.56.0/go.mod h1:D3Ku6r+V6JROoZK144D2XfMHFcMq/0zSfLelVTCFKec= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4= -golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI= +golang.org/x/sync v0.21.0 h1:HLII4xRRTtCRkxYp4HNFF0Js/Og6q2i++KXbg0gHCwM= +golang.org/x/sync v0.21.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.41.0 h1:Ivj+2Cp/ylzLiEU89QhWblYnOE9zerudt9Ftecq2C6k= -golang.org/x/sys v0.41.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= +golang.org/x/sys v0.46.0 h1:noSf2Fq6F8DBgS+LysIkx7rIExoNHJsxOAtPp4rthXw= +golang.org/x/sys v0.46.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.34.0 h1:oL/Qq0Kdaqxa1KbNeMKwQq0reLCCaFtqu2eNuSeNHbk= -golang.org/x/text v0.34.0/go.mod h1:homfLqTYRFyVYemLBFl5GgL/DWEiH5wcsQ5gSh1yziA= +golang.org/x/text v0.38.0 h1:sXmwo9DwP3OK9EZ7PqAdaooSGozfl/3a6/xJcbzPRhE= +golang.org/x/text v0.38.0/go.mod h1:YXZt3QhHUKYT53r2lLKFIVi6Ao1jdzrTR/KQ09qyxF4= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= diff --git a/sources/operator.1.2.0.ps-operator.dep.json b/sources/operator.1.2.0.ps-operator.dep.json new file mode 100644 index 00000000..1a053c08 --- /dev/null +++ b/sources/operator.1.2.0.ps-operator.dep.json @@ -0,0 +1,62 @@ +{ + "backup": { + "8.0.35-36.1": { + "and": [ + { + ">=": [ + { + "var": "productVersion" + }, + "8.0" + ] + }, + { + "<": [ + { + "var": "productVersion" + }, + "8.4" + ] + } + ] + }, + "8.4.0-6.1": { + ">=": [ + { + "var": "productVersion" + }, + "8.4" + ] + } + }, + "router": { + "8.0.46-37.1": { + "and": [ + { + ">=": [ + { + "var": "productVersion" + }, + "8.0" + ] + }, + { + "<": [ + { + "var": "productVersion" + }, + "8.4" + ] + } + ] + }, + "8.4.10-10.1": { + ">=": [ + { + "var": "productVersion" + }, + "8.4" + ] + } + } +} \ No newline at end of file diff --git a/sources/operator.1.2.0.ps-operator.json b/sources/operator.1.2.0.ps-operator.json new file mode 100644 index 00000000..e42c2d98 --- /dev/null +++ b/sources/operator.1.2.0.ps-operator.json @@ -0,0 +1,156 @@ +{ + "versions": [ + { + "operator": "1.2.0", + "product": "ps-operator", + "matrix": { + "operator": { + "1.2.0": { + "image_path": "percona/percona-server-mysql-operator:1.2.0", + "status": "recommended", + "critical": false, + "image_hash": "a9ab659068574c247151427178dd05ea9cf11a3789acc0b84a3cb6713a7916eb", + "image_hash_arm64": "482d6757d2d7697889e2538c5b229aa4253a936cc08257860ed18357a05b82af" + } + }, + "haproxy": { + "2.8.18-1": { + "image_path": "percona/haproxy:2.8.18-1", + "status": "recommended", + "critical": false, + "image_hash": "09e4d2ce9e65dc4aec9195e818e6da2041aea1a2bdb04f868d8c42ee81090dbf", + "image_hash_arm64": "563d84d64e1668cb4f6b2202fbe15a18e0733b48fe963383bb877c9e3a8a0abd" + } + }, + "binlog_server": { + "0.3.1": { + "image_path": "percona/percona-server-mysql-operator:1.2.0-binlog-server-0.3.1", + "status": "recommended", + "critical": false, + "image_hash": "53336b6ccbe463c255f7ca9caaf9390ceba2b9c7672b91998cbe5f44d84dc4e4", + "image_hash_arm64": "361695d2b77443e67aa7f2858e9345cff08967afa3e2a8820d4c5981963fa858" + } + }, + "mysql": { + "8.4.10-10": { + "image_path": "percona/percona-server:8.4.10-10.1", + "status": "recommended", + "critical": false, + "image_hash": "d24391a363426239220c35b9707d6b26ce7522ac27abe55689baebfb48bd9fb3", + "image_hash_arm64": "70f6c4d01b5807737cdd423ab32af1feb1d00513b5420a84361773b167aeca87" + }, + "8.4.8-8": { + "image_path": "percona/percona-server:8.4.8-8.1", + "status": "available", + "critical": false, + "image_hash": "5203959150b5afe769f04f17453ae22d63ea889dfbbdef6acc013e999cc31552", + "image_hash_arm64": "831ac32171d0b794826e276745cf3e7526b63c62447fdb266b9e308e7028319e" + }, + "8.4.6-6": { + "image_path": "percona/percona-server:8.4.6-6.1", + "status": "available", + "critical": false, + "image_hash": "ea97c9df3e362728fc3819c28c841498f5a1765945b9556bc964b218b7d4dc97" + }, + "8.4.5-5": { + "image_path": "percona/percona-server:8.4.5-5", + "status": "available", + "critical": false, + "image_hash": "61a6811372d919316640990922188005f92d58639a2472865d59e56b2a6050a1" + }, + "8.0.46-37": { + "image_path": "percona/percona-server:8.0.46-37.1", + "status": "recommended", + "critical": false, + "image_hash": "1552a3b1860bb12325755295fb833890eb920c34fc212dbadb34c59baf0c378a", + "image_hash_arm64": "e41dfb981de432da1a117077e7230008422ab49d6c0e9dd8d17a03d7ffde5dc0" + }, + "8.0.45-36": { + "image_path": "percona/percona-server:8.0.45-36.1", + "status": "available", + "critical": false, + "image_hash": "27845b5451a1b707df70e832d51bcd3c384e6cb3cc02799a7bc01ec6cd578c2d", + "image_hash_arm64": "1dae69344a18d21800fd65752a1450ddaac31b50d733d3eb1507f28ec824172d" + }, + "8.0.43-34": { + "image_path": "percona/percona-server:8.0.43-34.1", + "status": "available", + "critical": false, + "image_hash": "315efeac572c48cc6f118bba7e0b2545ad396142f60328f2db9620ae0ad57e45" + }, + "8.0.42-33": { + "image_path": "percona/percona-server:8.0.42-33", + "status": "available", + "critical": false, + "image_hash": "a7cbaa50c43483a07506f7cd5cccc4e587611f6500e1be5df0a93e339b9d3bc5" + }, + "8.0.40-31": { + "image_path": "percona/percona-server:8.0.40-31", + "status": "available", + "critical": false, + "image_hash": "09276abecbc7c38ce9c5453da1728f3e7d81722c56e2837574ace3a021ee92f2" + } + }, + "toolkit": { + "3.7.1-4": { + "image_path": "percona/percona-toolkit:3.7.1-4", + "status": "recommended", + "critical": false, + "image_hash": "ed86efb798fd0995c059f19281171614b1e507e747e69b5b0101c53b22fd9c5d", + "image_hash_arm64": "05900c454b975e15424da144bcaf305fa3747d6093254732f4bfa2e637c467d6" + } + }, + "orchestrator": { + "3.2.6-22": { + "image_path": "percona/percona-orchestrator:3.2.6-22", + "status": "recommended", + "critical": false, + "image_hash": "384bcf3121f50e9536fc911532386b9b485a52701e1e99ada51a5faf91d667c3", + "image_hash_arm64": "7ed29d0cde9396687fa42e1640ac2554125fd3a1e2a9f8d70667bbd00b386703" + } + }, + "router": { + "8.4.10-10.1": { + "image_path": "percona/percona-mysql-router:8.4.10-10.1", + "status": "recommended", + "critical": false, + "image_hash": "7edd16793022a518842aa6e709582af9175ee9ab145faf11e930f8175f16c588", + "image_hash_arm64": "e3be4405858a4198ecb1265365763de33dc6991bdb811bbc10803a92d06606a0" + }, + "8.0.46-37.1": { + "image_path": "percona/percona-mysql-router:8.0.46-37.1", + "status": "recommended", + "critical": false, + "image_hash": "826cd7a26e918fc5b75cad6ba19d74b508dd1a73f93e49cfac727f6f40b74a02", + "image_hash_arm64": "d7a835fff71c6fa881d35cc54fb126c4027ccd9692575c6b95c2cd6329915b90" + } + }, + "backup": { + "8.4.0-6.1": { + "image_path": "percona/percona-xtrabackup:8.4.0-6.1", + "status": "recommended", + "critical": false, + "image_hash": "d135aadaae9e2f947cb2002f982f7b4c6e177b1c7e3d543ef7795aea999feedd", + "image_hash_arm64": "fcf2b3fc20cfbfa6d47ec60cecd881f915beacdae838f994dda984baea825293" + }, + "8.0.35-36.1": { + "image_path": "percona/percona-xtrabackup:8.0.35-36.1", + "status": "recommended", + "critical": false, + "image_hash": "5416f19ac087e4d8e06eeff63cf1e075dc3b4e45577abbb9c3d87ae1ea3816c5", + "image_hash_arm64": "b604421b30bdd7ddfbc716220a8f8f32077c12a762d1eae622dcf4e5085b115a" + } + }, + "pmm": { + "3.8.1": { + "image_path": "percona/pmm-client:3.8.1", + "status": "recommended", + "critical": false, + "image_hash": "a92cfb7f912bd85d8245575c3ee5c423664ad2baedb674d159a87b113dbd4de2", + "image_hash_arm64": "3fe427c0666337df7613824da5f3b5fb7397e849f70402ac557c1324c5d996e6" + } + } + } + } + ] +} \ No newline at end of file