Skip to content

Commit

Permalink
Merge branch 'main' into EVEREST-1190-ui-show-user-detail-on-the-ui
Browse files Browse the repository at this point in the history
  • Loading branch information
@percona-robot
percona-robot authored Jan 31, 2025
2 parents 32652ed + 14e9ddf commit 22e5159
Show file tree
Hide file tree
Showing 5 changed files with 71 additions and 50 deletions.
6 changes: 3 additions & 3 deletions api-tests/tests/database-engines.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ test('get/edit database engine versions', async ({ request }) => {
const engineData: GetDatabaseEngineResponse = await engineResponse.json();
const availableVersions = engineData.status.availableVersions;

expect(availableVersions.engine['7.0.14-8'].imageHash).toBe('ed932d4e7231dcb793bf609f781226a8393aa8958b103339f4a503a8f70ed17e');
expect(availableVersions.backup['2.7.0'].status).toBe('recommended');
expect(availableVersions.engine['8.0.4-1'].imageHash).toBe('873b201ce3d66d97b1225c26db392c5043a73cc19ee8db6f2dc1b8efd4783bcf');
expect(availableVersions.backup['2.8.0'].status).toBe('recommended');

const allowedVersions = ['6.0.5-4', '6.0.4-3', '7.0.8-5', '7.0.12-7', '7.0.14-8'];
const allowedVersions = ['6.0.19-16', '7.0.8-5', '7.0.12-7', '7.0.14-8', '7.0.15-9', '8.0.4-1'];

delete engineData.status;
engineData.spec.allowedVersions = allowedVersions;
Expand Down
2 changes: 1 addition & 1 deletion api-tests/tests/psmdb-clusters.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ test('sharded psmdb cluster', async ({ request, page }) => {
},
},
engine: {
version: '7.0.14-8',
version: '8.0.4-1',
type: 'psmdb',
replicas: 1,
storage: {
Expand Down
4 changes: 2 additions & 2 deletions dev/Tiltfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ config_yaml=read_yaml('config.yaml')
# Vars
everest_namespace = 'everest-system'
everest_monitoring_namespace = 'everest-monitoring'
pxc_operator_version = os.getenv('PXC_OPERATOR_VERSION', '1.15.0')
pxc_operator_version = os.getenv('PXC_OPERATOR_VERSION', '1.16.1')
print('Using PXC operator version: %s' % pxc_operator_version)
psmdb_operator_version = os.getenv('PSMDB_OPERATOR_VERSION', '1.18.0')
psmdb_operator_version = os.getenv('PSMDB_OPERATOR_VERSION', '1.19.0')
print('Using PSMDB operator version: %s' % psmdb_operator_version)
pg_operator_version = os.getenv('PG_OPERATOR_VERSION', '2.5.0')
print('Using PG operator version: %s' % pg_operator_version)
Expand Down
36 changes: 21 additions & 15 deletions go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/percona/everest

go 1.23.2
go 1.23.4

replace (
github.com/containerd/containerd v1.7.12 => github.com/containerd/containerd v1.7.13
Expand Down Expand Up @@ -37,8 +37,8 @@ require (
github.com/oapi-codegen/runtime v1.1.1
github.com/operator-framework/api v0.27.0
github.com/operator-framework/operator-lifecycle-manager v0.27.0
github.com/percona/everest-operator v0.6.0-dev1.0.20250128095649-91ac803840ec
github.com/percona/percona-helm-charts/charts/everest v0.0.0-20250128100227-85c800fac705
github.com/percona/everest-operator v0.6.0-dev1.0.20250131090446-40b6d1d65b10
github.com/percona/percona-helm-charts/charts/everest v0.0.0-20250130165745-fd11e0611fa8
github.com/rodaine/table v1.3.0
github.com/spf13/cobra v1.8.1
github.com/stretchr/testify v1.10.0
Expand Down Expand Up @@ -134,7 +134,7 @@ require (
github.com/gorilla/websocket v1.5.1 // indirect
github.com/gosuri/uitable v0.0.4 // indirect
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.24.0 // indirect
github.com/h2non/filetype v1.1.3 // indirect
github.com/h2non/go-is-svg v0.0.0-20160927212452-35e8c4b0612c // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
Expand All @@ -147,7 +147,7 @@ require (
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
github.com/klauspost/compress v1.17.10 // indirect
github.com/klauspost/compress v1.17.11 // indirect
github.com/klauspost/pgzip v1.2.6 // indirect
github.com/labstack/gommon v0.4.2 // indirect
github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
Expand All @@ -174,16 +174,17 @@ require (
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
github.com/montanaflynn/stats v0.7.1 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
github.com/onsi/gomega v1.36.2 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.1.0 // indirect
github.com/operator-framework/operator-registry v1.35.0 // indirect
github.com/percona/percona-backup-mongodb v1.8.1-0.20241002124601-957ac501f939 // indirect
github.com/percona/percona-backup-mongodb v1.8.1-0.20241212160532-0157f87a7eee // indirect
github.com/percona/percona-postgresql-operator v0.0.0-20241007204305-35d61aa5aebd // indirect
github.com/percona/percona-server-mongodb-operator v1.18.0 // indirect
github.com/percona/percona-xtradb-cluster-operator v1.15.0 // indirect
github.com/percona/percona-server-mongodb-operator v1.19.0 // indirect
github.com/percona/percona-xtradb-cluster-operator v1.16.1 // indirect
github.com/perimeterx/marshmallow v1.1.5 // indirect
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
github.com/pierrec/lz4 v2.6.1+incompatible // indirect
Expand All @@ -207,25 +208,30 @@ require (
github.com/valyala/bytebufferpool v1.0.0 // indirect
github.com/valyala/fasttemplate v1.2.2 // indirect
github.com/x448/float16 v0.8.4 // indirect
github.com/xdg-go/pbkdf2 v1.0.0 // indirect
github.com/xdg-go/scram v1.1.2 // indirect
github.com/xdg-go/stringprep v1.0.4 // indirect
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
github.com/xlab/treeprint v1.2.0 // indirect
github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect
go.mongodb.org/mongo-driver v1.17.1 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.55.0 // indirect
go.opentelemetry.io/otel v1.30.0 // indirect
go.opentelemetry.io/otel/metric v1.30.0 // indirect
go.opentelemetry.io/otel/trace v1.30.0 // indirect
go.opentelemetry.io/otel v1.31.0 // indirect
go.opentelemetry.io/otel/metric v1.31.0 // indirect
go.opentelemetry.io/otel/trace v1.31.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
golang.org/x/net v0.33.0 // indirect
golang.org/x/oauth2 v0.23.0 // indirect
golang.org/x/oauth2 v0.24.0 // indirect
golang.org/x/sync v0.10.0 // indirect
golang.org/x/sys v0.28.0 // indirect
golang.org/x/term v0.27.0 // indirect
golang.org/x/text v0.21.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
google.golang.org/grpc v1.67.1 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20241118233622-e639e219e697 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20241118233622-e639e219e697 // indirect
google.golang.org/grpc v1.69.2 // indirect
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
Expand Down
Loading

0 comments on commit 22e5159

Please sign in to comment.