From d4412a5fdca35df676dce7d5612f3a1e38fabbca Mon Sep 17 00:00:00 2001 From: Inel Pandzic Date: Tue, 5 Nov 2024 14:32:44 +0100 Subject: [PATCH 1/6] K8SPSMDB-1124: Fix role update (#1702) * Fix role update. * Lint fix. --------- Co-authored-by: Viacheslav Sarzhan --- .../perconaservermongodb/custom_users.go | 23 +++++++++---------- pkg/psmdb/mongo/mongo.go | 12 +++++++++- 2 files changed, 22 insertions(+), 13 deletions(-) diff --git a/pkg/controller/perconaservermongodb/custom_users.go b/pkg/controller/perconaservermongodb/custom_users.go index bd51a1ca12..d13b2afcea 100644 --- a/pkg/controller/perconaservermongodb/custom_users.go +++ b/pkg/controller/perconaservermongodb/custom_users.go @@ -47,10 +47,7 @@ func (r *ReconcilePerconaServerMongoDB) reconcileCustomUsers(ctx context.Context } }() - err = handleRoles(ctx, cr, cli) - if err != nil { - return errors.Wrap(err, "handle roles") - } + handleRoles(ctx, cr, cli) if len(cr.Spec.Users) == 0 { return nil @@ -127,28 +124,31 @@ func (r *ReconcilePerconaServerMongoDB) reconcileCustomUsers(ctx context.Context return nil } -func handleRoles(ctx context.Context, cr *api.PerconaServerMongoDB, cli mongo.Client) error { +func handleRoles(ctx context.Context, cr *api.PerconaServerMongoDB, cli mongo.Client) { log := logf.FromContext(ctx) if len(cr.Spec.Roles) == 0 { - return nil + return } for _, role := range cr.Spec.Roles { roleInfo, err := cli.GetRole(ctx, role.DB, role.Role) if err != nil { - return errors.Wrap(err, "mongo get role") + log.Error(err, "get role info", "role", role.Role) + continue } mr, err := toMongoRoleModel(role) if err != nil { - return err + log.Error(err, "to mongo role model", "role", role.Role) + continue } if roleInfo == nil { log.Info("Creating role", "role", role.Role) err := cli.CreateRole(ctx, role.DB, *mr) if err != nil { - return errors.Wrapf(err, "create role %s", role.Role) + log.Error(err, "create role", "role", role.Role) + continue } log.Info("Role created", "role", role.Role) continue @@ -158,13 +158,12 @@ func handleRoles(ctx context.Context, cr *api.PerconaServerMongoDB, cli mongo.Cl log.Info("Updating role", "role", role.Role) err := cli.UpdateRole(ctx, role.DB, *mr) if err != nil { - return errors.Wrapf(err, "update role %s", role.Role) + log.Error(err, "update role %s", role.Role) + continue } log.Info("Role updated", "role", role.Role) } } - - return nil } func rolesChanged(r1, r2 *mongo.Role) bool { diff --git a/pkg/psmdb/mongo/mongo.go b/pkg/psmdb/mongo/mongo.go index 90f4eb8d56..206dbb2483 100644 --- a/pkg/psmdb/mongo/mongo.go +++ b/pkg/psmdb/mongo/mongo.go @@ -225,7 +225,17 @@ func (client *mongoClient) UpdateRole(ctx context.Context, db string, role Role) authRestrictionsArr := bson.A{} for _, r := range role.AuthenticationRestrictions { - authRestrictionsArr = append(authRestrictionsArr, r) + m := bson.M{} + + if len(r.ServerAddress) > 0 { + m["serverAddress"] = r.ServerAddress + } + + if len(r.ClientSource) > 0 { + m["clientSource"] = r.ClientSource + } + + authRestrictionsArr = append(authRestrictionsArr, m) } m := bson.D{ From 9314eae9fec1dde25f69af9f31c19425e6bfc3ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ege=20G=C3=BCne=C5=9F?= Date: Tue, 5 Nov 2024 22:08:52 +0300 Subject: [PATCH 2/6] K8SPSMDB-967: Initialize envtest (#1704) * K8SPSMDB-967: Init envtest * Apply suggestions from code review Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Viacheslav Sarzhan --- .github/workflows/test.yml | 4 +- Makefile | 9 ++ go.mod | 17 ++- go.sum | 20 ++++ .../perconaservermongodb/controller_test.go | 54 +++++++++ .../perconaservermongodb/finalizers_test.go | 6 +- .../perconaservermongodb/helpers_test.go | 25 ---- .../perconaservermongodb/statefulset_test.go | 15 ++- .../perconaservermongodb/suite_test.go | 111 ++++++++++++++++++ .../reconcile-statefulset/cfg-arbiter.yaml | 1 + .../reconcile-statefulset/cfg-mongod.yaml | 1 + .../reconcile-statefulset/cfg-nv.yaml | 1 + .../reconcile-statefulset/rs0-arbiter.yaml | 1 + .../reconcile-statefulset/rs0-mongod.yaml | 1 + .../reconcile-statefulset/rs0-nv.yaml | 1 + 15 files changed, 228 insertions(+), 39 deletions(-) create mode 100644 pkg/controller/perconaservermongodb/controller_test.go create mode 100644 pkg/controller/perconaservermongodb/suite_test.go diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6ae89a4351..c6da54e9d4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -9,5 +9,5 @@ jobs: with: go-version: '^1.22' - uses: actions/checkout@v4.1.1 - - name: go test - run: go test -v ./... + - name: run tests + run: make test diff --git a/Makefile b/Makefile index e2f78c36ae..56b8fcdb43 100644 --- a/Makefile +++ b/Makefile @@ -6,6 +6,8 @@ VERSION ?= $(shell git rev-parse --abbrev-ref HEAD | $(SED) -e 's^/^-^g; s^[.]^- IMAGE ?= $(IMAGE_TAG_BASE):$(VERSION) DEPLOYDIR = ./deploy +ENVTEST_K8S_VERSION = 1.31 + all: build help: ## Display this help. @@ -60,6 +62,9 @@ deploy: ## Deploy operator undeploy: ## Undeploy operator kubectl delete -f $(DEPLOYDIR)/operator.yaml +test: envtest ## Run tests. + DISABLE_TELEMETRY=true KUBEBUILDER_ASSETS="$(shell $(ENVTEST) --arch=amd64 use $(ENVTEST_K8S_VERSION) -p path)" go test ./... -coverprofile cover.out + # go-get-tool will 'go get' any package $2 and install it to $1. PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST)))) define go-get-tool @@ -82,6 +87,10 @@ KUSTOMIZE = $(shell pwd)/bin/kustomize kustomize: ## Download kustomize locally if necessary. $(call go-get-tool,$(KUSTOMIZE),sigs.k8s.io/kustomize/kustomize/v4@v4.5.3) +ENVTEST = $(shell pwd)/bin/setup-envtest +envtest: ## Download envtest-setup locally if necessary. + $(call go-get-tool,$(ENVTEST),sigs.k8s.io/controller-runtime/tools/setup-envtest@latest) + # Prepare release CERT_MANAGER_VER := $(shell grep -Eo "cert-manager v.*" go.mod|grep -Eo "[0-9]+\.[0-9]+\.[0-9]+") release: manifests diff --git a/go.mod b/go.mod index c5a1ff49ff..7dd0a595ee 100644 --- a/go.mod +++ b/go.mod @@ -37,9 +37,14 @@ require ( github.com/fxamacker/cbor/v2 v2.7.0 // indirect github.com/go-asn1-ber/asn1-ber v1.5.6 // indirect github.com/go-ldap/ldap/v3 v3.4.8 // indirect + github.com/go-task/slim-sprig/v3 v3.0.0 // indirect + github.com/google/pprof v0.0.0-20241101162523-b92577c0c142 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect + github.com/onsi/ginkgo/v2 v2.21.0 // indirect + github.com/onsi/gomega v1.35.1 // indirect github.com/spf13/cobra v1.8.1 // indirect github.com/x448/float16 v0.8.4 // indirect + golang.org/x/tools v0.26.0 // indirect gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect k8s.io/component-base v0.31.1 // indirect ) @@ -107,19 +112,19 @@ require ( go.opentelemetry.io/otel/metric v1.29.0 // indirect go.opentelemetry.io/otel/trace v1.29.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/crypto v0.27.0 // indirect + golang.org/x/crypto v0.28.0 // indirect golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect golang.org/x/mod v0.21.0 // indirect - golang.org/x/net v0.29.0 // indirect + golang.org/x/net v0.30.0 // indirect golang.org/x/oauth2 v0.23.0 // indirect - golang.org/x/sys v0.25.0 // indirect - golang.org/x/term v0.24.0 // indirect - golang.org/x/text v0.18.0 // indirect + golang.org/x/sys v0.26.0 // indirect + golang.org/x/term v0.25.0 // indirect + golang.org/x/text v0.19.0 // indirect golang.org/x/time v0.6.0 // indirect gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240827150818-7e3bb234dfed // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect - google.golang.org/protobuf v1.34.2 // indirect + google.golang.org/protobuf v1.35.1 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/natefinch/lumberjack.v2 v2.2.1 gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index 44eacc580e..da3df71630 100644 --- a/go.sum +++ b/go.sum @@ -257,6 +257,8 @@ github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXi github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 h1:FKHo8hFI3A+7w0aUQuYXQ+6EN5stWmeY/AZqtM8xk9k= github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8/go.mod h1:K1liHPHnj73Fdn/EKuT8nrFqBihUSKXoLYU0BuatOYo= +github.com/google/pprof v0.0.0-20241101162523-b92577c0c142 h1:sAGdeJj0bnMgUNVeUpp6AYlVdCt3/GdI3pGRqsNSQLs= +github.com/google/pprof v0.0.0-20241101162523-b92577c0c142/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= @@ -402,6 +404,8 @@ github.com/onsi/ginkgo v1.14.0 h1:2mOpI4JVVPBN+WQRa0WKH2eXR+Ey+uK4n7Zj0aYpIQA= github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= github.com/onsi/ginkgo/v2 v2.19.0 h1:9Cnnf7UHo57Hy3k6/m5k3dRfGTMXGvxhHFvkDTCTpvA= github.com/onsi/ginkgo/v2 v2.19.0/go.mod h1:rlwLi9PilAFJ8jCg9UE1QP6VBpd6/xj3SRC0d6TU0To= +github.com/onsi/ginkgo/v2 v2.21.0 h1:7rg/4f3rB88pb5obDgNZrNHrQ4e6WpjonchcpuBRnZM= +github.com/onsi/ginkgo/v2 v2.21.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo= github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= @@ -409,6 +413,8 @@ github.com/onsi/gomega v1.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoT github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk= github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0= +github.com/onsi/gomega v1.35.1 h1:Cwbd75ZBPxFSuZ6T+rN/WCb/gOc6YgFBXLlZLhC7Ds4= +github.com/onsi/gomega v1.35.1/go.mod h1:PvZbdDc8J6XJEpDK4HCuRBm8a6Fzp9/DmhC9C7yFlog= github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs= github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc= github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= @@ -564,6 +570,8 @@ golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDf golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A= golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70= +golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw= +golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 h1:e66Fs6Z+fZTbFBAxKfP3PALWBtpfqks2bwGcexMxgtk= golang.org/x/exp v0.0.0-20240909161429-701f63a606c0/go.mod h1:2TbTHSBQa924w8M6Xs1QcRcFwyucIwBGpK1p2f1YFFY= @@ -608,6 +616,8 @@ golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo= golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0= +golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4= +golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -659,6 +669,8 @@ golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34= golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo= +golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= @@ -667,6 +679,8 @@ golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= golang.org/x/term v0.24.0 h1:Mh5cbb+Zk2hqqXNO7S1iTjEphVL+jb8ZWaqh/g+JWkM= golang.org/x/term v0.24.0/go.mod h1:lOBK/LVxemqiMij05LGJ0tzNr8xlmwBRJ81PX6wVLH8= +golang.org/x/term v0.25.0 h1:WtHI/ltw4NvSUig5KARz9h521QvRC8RmF/cuYqifU24= +golang.org/x/term v0.25.0/go.mod h1:RPyXicDX+6vLxogjjRxjgD2TKtmAO6NZBsBRfrOLu7M= golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -679,6 +693,8 @@ golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224= golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= +golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM= +golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -704,6 +720,8 @@ golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/tools v0.25.0 h1:oFU9pkj/iJgs+0DT+VMHrx+oBKs/LJMV+Uvg78sl+fE= golang.org/x/tools v0.25.0/go.mod h1:/vtpO8WL1N9cQC3FN5zPqb//fRXskFHbLKk4OW1Q7rg= +golang.org/x/tools v0.26.0 h1:v/60pFQmzmT9ExmjDv2gGIfi3OqfKoEP6I5+umXlbnQ= +golang.org/x/tools v0.26.0/go.mod h1:TPVVj70c7JJ3WCazhD8OdXcZg/og+b9+tH/KxylGwH0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -738,6 +756,8 @@ google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzi google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= +google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA= +google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/pkg/controller/perconaservermongodb/controller_test.go b/pkg/controller/perconaservermongodb/controller_test.go new file mode 100644 index 0000000000..bf0bc5e810 --- /dev/null +++ b/pkg/controller/perconaservermongodb/controller_test.go @@ -0,0 +1,54 @@ +package perconaservermongodb + +import ( + "context" + + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" + corev1 "k8s.io/api/core/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/types" + "sigs.k8s.io/controller-runtime/pkg/reconcile" +) + +var _ = Describe("PerconaServerMongoDB", Ordered, func() { + ctx := context.Background() + const ns = "psmdb" + namespace := &corev1.Namespace{ + ObjectMeta: metav1.ObjectMeta{ + Name: ns, + Namespace: ns, + }, + } + crName := ns + "-reconciler" + crNamespacedName := types.NamespacedName{Name: crName, Namespace: ns} + + BeforeAll(func() { + By("Creating the Namespace to perform the tests") + err := k8sClient.Create(ctx, namespace) + Expect(err).To(Not(HaveOccurred())) + }) + + AfterAll(func() { + By("Deleting the Namespace to perform the tests") + _ = k8sClient.Delete(ctx, namespace) + }) + + Context("Create PerconaServerMongoDB", func() { + cr, err := readDefaultCR(crName, ns) + It("should read defautl cr.yaml", func() { + Expect(err).NotTo(HaveOccurred()) + }) + + It("Should create PerconaServerMongoDB", func() { + Expect(k8sClient.Create(ctx, cr)).Should(Succeed()) + }) + }) + + It("Should reconcile PerconaServerMongoDB", func() { + _, err := reconciler().Reconcile(ctx, reconcile.Request{ + NamespacedName: crNamespacedName, + }) + Expect(err).To(Succeed()) + }) +}) diff --git a/pkg/controller/perconaservermongodb/finalizers_test.go b/pkg/controller/perconaservermongodb/finalizers_test.go index d3442e948e..31f384a739 100644 --- a/pkg/controller/perconaservermongodb/finalizers_test.go +++ b/pkg/controller/perconaservermongodb/finalizers_test.go @@ -18,7 +18,11 @@ func TestCheckFinalizers(t *testing.T) { crName := "check-finalizers" ns := crName + "-ns" - defaultCR := readDefaultCR(t, crName, ns) + defaultCR, err := readDefaultCR(crName, ns) + if err != nil { + t.Fatal(err) + } + obj := append( fakePodsForRS(defaultCR, defaultCR.Spec.Replsets[0]), fakeStatefulset(defaultCR, defaultCR.Spec.Replsets[0], defaultCR.Spec.Replsets[0].Size, ""), diff --git a/pkg/controller/perconaservermongodb/helpers_test.go b/pkg/controller/perconaservermongodb/helpers_test.go index 1d7b246931..ad5a50360b 100644 --- a/pkg/controller/perconaservermongodb/helpers_test.go +++ b/pkg/controller/perconaservermongodb/helpers_test.go @@ -1,36 +1,11 @@ package perconaservermongodb import ( - "os" - "path/filepath" "testing" - "k8s.io/apimachinery/pkg/util/yaml" "sigs.k8s.io/controller-runtime/pkg/client" - - api "github.com/percona/percona-server-mongodb-operator/pkg/apis/psmdb/v1" ) -func readDefaultCR(t *testing.T, name, namespace string) *api.PerconaServerMongoDB { - t.Helper() - - data, err := os.ReadFile(filepath.Join("..", "..", "..", "deploy", "cr.yaml")) - if err != nil { - t.Fatal(err) - } - - cr := new(api.PerconaServerMongoDB) - - if err := yaml.Unmarshal(data, cr); err != nil { - t.Fatal(err) - } - - cr.Name = name - cr.Namespace = namespace - - return cr -} - func updateObj[T client.Object](t *testing.T, obj T, f func(obj T)) T { t.Helper() diff --git a/pkg/controller/perconaservermongodb/statefulset_test.go b/pkg/controller/perconaservermongodb/statefulset_test.go index ec58701463..ef954d49f0 100644 --- a/pkg/controller/perconaservermongodb/statefulset_test.go +++ b/pkg/controller/perconaservermongodb/statefulset_test.go @@ -6,6 +6,7 @@ import ( "reflect" "testing" + "github.com/google/go-cmp/cmp" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -25,7 +26,11 @@ func TestReconcileStatefulSet(t *testing.T) { crName = ns + "-cr" ) - defaultCR := readDefaultCR(t, crName, ns) + defaultCR, err := readDefaultCR(crName, ns) + if err != nil { + t.Fatal(err) + } + defaultCR.Spec.Replsets[0].NonVoting.Enabled = true if err := defaultCR.CheckNSetDefaults(version.PlatformKubernetes, logf.FromContext(ctx)); err != nil { t.Fatal(err) @@ -142,7 +147,7 @@ func compareSts(t *testing.T, got, want *appsv1.StatefulSet) { t.Helper() if !reflect.DeepEqual(got.TypeMeta, want.TypeMeta) { - t.Fatalf("expected sts typemeta: %v, got: %v", want.TypeMeta, got.TypeMeta) + t.Fatal(cmp.Diff(want.TypeMeta, got.TypeMeta)) } compareObjectMeta := func(got, want metav1.ObjectMeta) { delete(got.Annotations, "percona.com/last-config-hash") @@ -155,7 +160,7 @@ func compareSts(t *testing.T, got, want *appsv1.StatefulSet) { t.Fatalf("error marshaling want: %v", err) } if string(gotBytes) != string(wantBytes) { - t.Fatalf("expected sts object meta:\n%s\ngot:\n%s", string(wantBytes), string(gotBytes)) + t.Fatal(cmp.Diff(string(wantBytes), string(gotBytes))) } } compareObjectMeta(got.ObjectMeta, want.ObjectMeta) @@ -172,12 +177,12 @@ func compareSts(t *testing.T, got, want *appsv1.StatefulSet) { t.Fatalf("error marshaling want: %v", err) } if string(gotBytes) != string(wantBytes) { - t.Fatalf("expected sts spec:\n%s\ngot:\n%s", string(wantBytes), string(gotBytes)) + t.Fatal(cmp.Diff(string(wantBytes), string(gotBytes))) } } compareSpec(got.Spec, want.Spec) if !reflect.DeepEqual(got.Status, want.Status) { - t.Fatalf("expected sts status: %v, got: %v", want.Status, got.Status) + t.Fatal(cmp.Diff(want.Status, got.Status)) } } diff --git a/pkg/controller/perconaservermongodb/suite_test.go b/pkg/controller/perconaservermongodb/suite_test.go new file mode 100644 index 0000000000..9aa5391f9b --- /dev/null +++ b/pkg/controller/perconaservermongodb/suite_test.go @@ -0,0 +1,111 @@ +package perconaservermongodb + +import ( + "os" + "path/filepath" + "testing" + + cmscheme "github.com/cert-manager/cert-manager/pkg/client/clientset/versioned/scheme" + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" + "k8s.io/apimachinery/pkg/util/yaml" + "k8s.io/client-go/kubernetes/scheme" + "k8s.io/client-go/rest" + "sigs.k8s.io/controller-runtime/pkg/client" + "sigs.k8s.io/controller-runtime/pkg/envtest" + logf "sigs.k8s.io/controller-runtime/pkg/log" + "sigs.k8s.io/controller-runtime/pkg/log/zap" + + "github.com/percona/percona-server-mongodb-operator/clientcmd" + "github.com/percona/percona-server-mongodb-operator/pkg/apis" + psmdbv1 "github.com/percona/percona-server-mongodb-operator/pkg/apis/psmdb/v1" + "github.com/percona/percona-server-mongodb-operator/pkg/psmdb/backup" + "github.com/percona/percona-server-mongodb-operator/pkg/psmdb/tls" + "github.com/percona/percona-server-mongodb-operator/version" +) + +// These tests use Ginkgo (BDD-style Go testing framework). Refer to +// http://onsi.github.io/ginkgo/ to learn more about Ginkgo. + +var ( + cfg *rest.Config + k8sClient client.Client + testEnv *envtest.Environment +) + +func TestAPIs(t *testing.T) { + RegisterFailHandler(Fail) + + RunSpecs(t, "K8SPSMDB Suite") +} + +var _ = BeforeSuite(func() { + logf.SetLogger(zap.New(zap.WriteTo(GinkgoWriter), zap.UseDevMode(true))) + + By("bootstrapping test environment") + testEnv = &envtest.Environment{ + CRDDirectoryPaths: []string{filepath.Join("..", "..", "..", "config", "crd", "bases")}, + ErrorIfCRDPathMissing: true, + } + + var err error + cfg, err = testEnv.Start() + Expect(err).NotTo(HaveOccurred()) + Expect(cfg).NotTo(BeNil()) + + err = apis.AddToScheme(scheme.Scheme) + Expect(err).NotTo(HaveOccurred()) + + k8sClient, err = client.New(cfg, client.Options{Scheme: scheme.Scheme}) + Expect(err).NotTo(HaveOccurred()) + Expect(k8sClient).NotTo(BeNil()) + + err = cmscheme.AddToScheme(k8sClient.Scheme()) + Expect(err).ToNot(HaveOccurred()) +}) + +var _ = AfterSuite(func() { + By("tearing down the test environment") + err := testEnv.Stop() + Expect(err).NotTo(HaveOccurred()) +}) + +// nolint:all +func reconciler() *ReconcilePerconaServerMongoDB { + cli, err := clientcmd.NewClient(cfg) + if err != nil { + Expect(err).ToNot(HaveOccurred()) + } + + return (&ReconcilePerconaServerMongoDB{ + client: k8sClient, + scheme: k8sClient.Scheme(), + crons: NewCronRegistry(), + lockers: newLockStore(), + clientcmd: cli, + restConfig: cfg, + newPBM: backup.NewPBM, + newCertManagerCtrlFunc: tls.NewCertManagerController, + serverVersion: &version.ServerVersion{ + Platform: version.PlatformKubernetes, + }, + }) +} + +func readDefaultCR(name, namespace string) (*psmdbv1.PerconaServerMongoDB, error) { + data, err := os.ReadFile(filepath.Join("..", "..", "..", "deploy", "cr.yaml")) + if err != nil { + return nil, err + } + + cr := &psmdbv1.PerconaServerMongoDB{} + + if err := yaml.Unmarshal(data, cr); err != nil { + return nil, err + } + + cr.Name = name + cr.Namespace = namespace + cr.Spec.InitImage = "perconalab/percona-server-mongodb-operator:main" + return cr, nil +} diff --git a/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/cfg-arbiter.yaml b/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/cfg-arbiter.yaml index a9d9da30d0..87d5e275a1 100644 --- a/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/cfg-arbiter.yaml +++ b/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/cfg-arbiter.yaml @@ -204,6 +204,7 @@ spec: initContainers: - command: - /init-entrypoint.sh + image: perconalab/percona-server-mongodb-operator:main imagePullPolicy: Always name: mongo-init resources: diff --git a/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/cfg-mongod.yaml b/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/cfg-mongod.yaml index a9d9da30d0..87d5e275a1 100644 --- a/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/cfg-mongod.yaml +++ b/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/cfg-mongod.yaml @@ -204,6 +204,7 @@ spec: initContainers: - command: - /init-entrypoint.sh + image: perconalab/percona-server-mongodb-operator:main imagePullPolicy: Always name: mongo-init resources: diff --git a/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/cfg-nv.yaml b/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/cfg-nv.yaml index a9d9da30d0..87d5e275a1 100644 --- a/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/cfg-nv.yaml +++ b/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/cfg-nv.yaml @@ -204,6 +204,7 @@ spec: initContainers: - command: - /init-entrypoint.sh + image: perconalab/percona-server-mongodb-operator:main imagePullPolicy: Always name: mongo-init resources: diff --git a/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/rs0-arbiter.yaml b/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/rs0-arbiter.yaml index def9845aaf..e51bb7f1aa 100644 --- a/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/rs0-arbiter.yaml +++ b/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/rs0-arbiter.yaml @@ -154,6 +154,7 @@ spec: initContainers: - command: - /init-entrypoint.sh + image: perconalab/percona-server-mongodb-operator:main imagePullPolicy: Always name: mongo-init resources: diff --git a/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/rs0-mongod.yaml b/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/rs0-mongod.yaml index 3827372650..5822610e51 100644 --- a/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/rs0-mongod.yaml +++ b/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/rs0-mongod.yaml @@ -204,6 +204,7 @@ spec: initContainers: - command: - /init-entrypoint.sh + image: perconalab/percona-server-mongodb-operator:main imagePullPolicy: Always name: mongo-init resources: diff --git a/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/rs0-nv.yaml b/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/rs0-nv.yaml index 00e3260dd9..9c884dfb84 100644 --- a/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/rs0-nv.yaml +++ b/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/rs0-nv.yaml @@ -203,6 +203,7 @@ spec: initContainers: - command: - /init-entrypoint.sh + image: perconalab/percona-server-mongodb-operator:main imagePullPolicy: Always name: mongo-init resources: From 806f0491bfd46c8b6922ed9c119d0224c856015d Mon Sep 17 00:00:00 2001 From: Eleonora Zinchenko Date: Tue, 5 Nov 2024 21:10:06 +0200 Subject: [PATCH 3/6] CLOUD-868: Remove monitoring-2.0 from psmdb distro tests (#1703) Co-authored-by: Viacheslav Sarzhan --- e2e-tests/run-distro.csv | 1 - 1 file changed, 1 deletion(-) diff --git a/e2e-tests/run-distro.csv b/e2e-tests/run-distro.csv index c94b70fb59..da88155fec 100644 --- a/e2e-tests/run-distro.csv +++ b/e2e-tests/run-distro.csv @@ -16,7 +16,6 @@ ldap ldap-tls mongod-major-upgrade mongod-major-upgrade-sharded -monitoring-2-0 non-voting one-pod pitr From 2631b91bd0ef1ac527840ff23c33b968e8955a46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ege=20G=C3=BCne=C5=9F?= Date: Tue, 5 Nov 2024 22:11:00 +0300 Subject: [PATCH 4/6] K8SPSMDB-1133: Allow overriding member priorities (#1689) * K8SPSMDB-1133: Allow overriding member priorities * fix max voter check --------- Co-authored-by: Viacheslav Sarzhan --- ...mdb.percona.com_perconaservermongodbs.yaml | 4 + deploy/bundle.yaml | 4 + deploy/cr.yaml | 1 + deploy/crd.yaml | 4 + deploy/cw-bundle.yaml | 4 + .../replset-overrides/compare/priorities.json | 2 + .../conf/some-name-override-priority.yml | 88 ++++ e2e-tests/replset-overrides/run | 65 ++- e2e-tests/version-service/conf/crd.yaml | 4 + pkg/apis/psmdb/v1/psmdb_types.go | 1 + pkg/apis/psmdb/v1/zz_generated.deepcopy.go | 5 + pkg/controller/perconaservermongodb/mgo.go | 4 + pkg/psmdb/mongo/mongo.go | 49 ++- pkg/psmdb/mongo/mongo_test.go | 384 +++++++++++++----- 14 files changed, 474 insertions(+), 145 deletions(-) create mode 100644 e2e-tests/replset-overrides/compare/priorities.json create mode 100644 e2e-tests/replset-overrides/conf/some-name-override-priority.yml diff --git a/config/crd/bases/psmdb.percona.com_perconaservermongodbs.yaml b/config/crd/bases/psmdb.percona.com_perconaservermongodbs.yaml index 165e86ff80..d25f623393 100644 --- a/config/crd/bases/psmdb.percona.com_perconaservermongodbs.yaml +++ b/config/crd/bases/psmdb.percona.com_perconaservermongodbs.yaml @@ -6380,6 +6380,8 @@ spec: type: object host: type: string + priority: + type: integer tags: additionalProperties: type: string @@ -14138,6 +14140,8 @@ spec: type: object host: type: string + priority: + type: integer tags: additionalProperties: type: string diff --git a/deploy/bundle.yaml b/deploy/bundle.yaml index 96f46ada8c..7ca6323545 100644 --- a/deploy/bundle.yaml +++ b/deploy/bundle.yaml @@ -7062,6 +7062,8 @@ spec: type: object host: type: string + priority: + type: integer tags: additionalProperties: type: string @@ -14820,6 +14822,8 @@ spec: type: object host: type: string + priority: + type: integer tags: additionalProperties: type: string diff --git a/deploy/cr.yaml b/deploy/cr.yaml index a58814a89e..c769e81351 100644 --- a/deploy/cr.yaml +++ b/deploy/cr.yaml @@ -77,6 +77,7 @@ spec: # replsetOverrides: # my-cluster-name-rs0-0: # host: my-cluster-name-rs0-0.example.net:27017 +# priority: 3 # tags: # key: value-0 # my-cluster-name-rs0-1: diff --git a/deploy/crd.yaml b/deploy/crd.yaml index ba327a0c6d..ce839e1be5 100644 --- a/deploy/crd.yaml +++ b/deploy/crd.yaml @@ -7062,6 +7062,8 @@ spec: type: object host: type: string + priority: + type: integer tags: additionalProperties: type: string @@ -14820,6 +14822,8 @@ spec: type: object host: type: string + priority: + type: integer tags: additionalProperties: type: string diff --git a/deploy/cw-bundle.yaml b/deploy/cw-bundle.yaml index 25074f72e4..5ab99145f9 100644 --- a/deploy/cw-bundle.yaml +++ b/deploy/cw-bundle.yaml @@ -7062,6 +7062,8 @@ spec: type: object host: type: string + priority: + type: integer tags: additionalProperties: type: string @@ -14820,6 +14822,8 @@ spec: type: object host: type: string + priority: + type: integer tags: additionalProperties: type: string diff --git a/e2e-tests/replset-overrides/compare/priorities.json b/e2e-tests/replset-overrides/compare/priorities.json new file mode 100644 index 0000000000..b17b69f053 --- /dev/null +++ b/e2e-tests/replset-overrides/compare/priorities.json @@ -0,0 +1,2 @@ +[ 1, 3, 0 ] +bye diff --git a/e2e-tests/replset-overrides/conf/some-name-override-priority.yml b/e2e-tests/replset-overrides/conf/some-name-override-priority.yml new file mode 100644 index 0000000000..6195c97b9f --- /dev/null +++ b/e2e-tests/replset-overrides/conf/some-name-override-priority.yml @@ -0,0 +1,88 @@ +apiVersion: psmdb.percona.com/v1 +kind: PerconaServerMongoDB +metadata: + finalizers: + - percona.com/delete-psmdb-pvc + name: some-name +spec: + crVersion: 1.17.0 + image: perconalab/percona-server-mongodb-operator:main-mongod7.0 + imagePullPolicy: Always + backup: + enabled: true + image: perconalab/percona-server-mongodb-operator:main-backup + storages: + minio: + type: s3 + s3: + credentialsSecret: minio-secret + region: us-east-1 + bucket: operator-testing + endpointUrl: http://minio-service:9000/ + insecureSkipTLSVerify: false + replsets: + - name: rs0 + size: 3 + expose: + enabled: false + exposeType: ClusterIP + replsetOverrides: + some-name-rs0-0: + priority: 1 + some-name-rs0-1: + priority: 3 + some-name-rs0-2: + priority: 0 + resources: + limits: + cpu: 300m + memory: 0.5G + requests: + cpu: 300m + memory: 0.5G + volumeSpec: + persistentVolumeClaim: + resources: + requests: + storage: 3Gi + secrets: + users: some-users + sharding: + configsvrReplSet: + affinity: + antiAffinityTopologyKey: none + expose: + enabled: false + exposeType: ClusterIP + podDisruptionBudget: + maxUnavailable: 1 + resources: + limits: + cpu: 300m + memory: 0.5G + requests: + cpu: 300m + memory: 0.5G + size: 3 + volumeSpec: + persistentVolumeClaim: + resources: + requests: + storage: 3Gi + enabled: false + mongos: + affinity: + antiAffinityTopologyKey: none + expose: + exposeType: ClusterIP + podDisruptionBudget: + maxUnavailable: 1 + resources: + limits: + cpu: 300m + memory: 0.5G + requests: + cpu: 300m + memory: 0.5G + size: 3 + updateStrategy: SmartUpdate diff --git a/e2e-tests/replset-overrides/run b/e2e-tests/replset-overrides/run index 2f7042f2a6..79419b9621 100755 --- a/e2e-tests/replset-overrides/run +++ b/e2e-tests/replset-overrides/run @@ -25,7 +25,17 @@ run_recovery_check() { wait_cluster_consistency "${cluster}" } -test_override_after_deploy() { +delete_cluster() { + local cluster=$1 + + echo "deleting cluster: ${cluster}" + kubectl_bin delete psmdb ${cluster} + wait_for_delete psmdb/${cluster} + wait_for_delete pod/${cluster}-rs0-0 + kubectl delete secrets --all +} + +test_override_host_after_deploy() { kubectl_bin apply \ -f ${conf_dir}/secrets_with_tls.yml \ -f ${conf_dir}/minio-secret.yml @@ -58,14 +68,10 @@ test_override_after_deploy() { run_recovery_check "${cluster}" "backup-minio-logical" "external-rs0-0.${namespace}" - echo "deleting cluster" - kubectl_bin delete psmdb ${cluster} - wait_for_delete psmdb/${cluster} - wait_for_delete pod/${cluster}-rs0-0 - kubectl delete secrets --all + delete_cluster ${cluster} } -test_deploy_with_overrides() { +test_deploy_with_host_overrides() { kubectl_bin apply \ -f ${conf_dir}/secrets_with_tls.yml \ -f ${conf_dir}/minio-secret.yml @@ -88,11 +94,34 @@ test_deploy_with_overrides() { wait_backup "backup-minio-physical" run_recovery_check "${cluster}" "backup-minio-physical" "external-rs0-0.${namespace}" - echo "deleting cluster" - kubectl_bin delete psmdb ${cluster} - wait_for_delete psmdb/${cluster} - wait_for_delete pod/${cluster}-rs0-0 - kubectl_bin delete secret --all + delete_cluster ${cluster} +} + +test_override_priority() { + kubectl_bin apply \ + -f ${conf_dir}/secrets_with_tls.yml \ + -f ${conf_dir}/minio-secret.yml + + echo "creating PSMDB cluster: ${cluster}" + apply_cluster ${test_dir}/conf/${cluster}-override-priority.yml + wait_for_running ${cluster}-rs0 3 + + echo "writing some data" + run_mongo \ + 'use myApp\n db.test.insert({ x: 100500 })' \ + "databaseAdmin:databaseAdmin123456@${cluster}-rs0.${namespace}" + compare_mongo_cmd "find" "databaseAdmin:databaseAdmin123456@${cluster}-rs0.${namespace}" + + echo "checking member priorities" + run_mongo \ + "rs.conf().members.map(m => m.priority)" \ + "databaseAdmin:databaseAdmin123456@${cluster}-rs0.${namespace}" \ + | egrep -v 'I NETWORK|W NETWORK|F NETWORK|Error saving history file|Percona Server for MongoDB|connecting to:|Unable to reach primary for set|Implicit session:|versions do not match|Error saving history file:' \ + > ${tmp_dir}/priorities.json + diff -u ${test_dir}/compare/priorities.json ${tmp_dir}/priorities.json + echo "member priorities are OK" + + delete_cluster ${cluster} } main() { @@ -101,14 +130,18 @@ main() { deploy_minio - desc "Case 1: Deploying a new cluster with replsetOverrides" - test_deploy_with_overrides + desc "Case 1: Deploying a new cluster with hostname overrides" + test_deploy_with_host_overrides desc "Case 1: PASSED" - desc "Case 2: Patching a running cluster with replsetOverrides" - test_override_after_deploy + desc "Case 2: Patching a running cluster to override hostnames" + test_override_host_after_deploy desc "Case 2: PASSED" + desc "Case 3: Overriding member priorities" + test_override_priority + desc "Case 3: PASSED" + desc "All cases PASSED" } diff --git a/e2e-tests/version-service/conf/crd.yaml b/e2e-tests/version-service/conf/crd.yaml index ba327a0c6d..ce839e1be5 100644 --- a/e2e-tests/version-service/conf/crd.yaml +++ b/e2e-tests/version-service/conf/crd.yaml @@ -7062,6 +7062,8 @@ spec: type: object host: type: string + priority: + type: integer tags: additionalProperties: type: string @@ -14820,6 +14822,8 @@ spec: type: object host: type: string + priority: + type: integer tags: additionalProperties: type: string diff --git a/pkg/apis/psmdb/v1/psmdb_types.go b/pkg/apis/psmdb/v1/psmdb_types.go index fbc2d6035d..ae63671cde 100644 --- a/pkg/apis/psmdb/v1/psmdb_types.go +++ b/pkg/apis/psmdb/v1/psmdb_types.go @@ -627,6 +627,7 @@ type ReplsetOverride struct { Host string `json:"host,omitempty"` Horizons map[string]string `json:"horizons,omitempty"` Tags map[string]string `json:"tags,omitempty"` + Priority *int `json:"priority,omitempty"` } type HorizonsSpec map[string]map[string]string diff --git a/pkg/apis/psmdb/v1/zz_generated.deepcopy.go b/pkg/apis/psmdb/v1/zz_generated.deepcopy.go index 0070389753..3aae59cae7 100644 --- a/pkg/apis/psmdb/v1/zz_generated.deepcopy.go +++ b/pkg/apis/psmdb/v1/zz_generated.deepcopy.go @@ -1463,6 +1463,11 @@ func (in *ReplsetOverride) DeepCopyInto(out *ReplsetOverride) { (*out)[key] = val } } + if in.Priority != nil { + in, out := &in.Priority, &out.Priority + *out = new(int) + **out = **in + } } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ReplsetOverride. diff --git a/pkg/controller/perconaservermongodb/mgo.go b/pkg/controller/perconaservermongodb/mgo.go index 188221c681..be0cc6d6b5 100644 --- a/pkg/controller/perconaservermongodb/mgo.go +++ b/pkg/controller/perconaservermongodb/mgo.go @@ -272,6 +272,10 @@ func (r *ReconcilePerconaServerMongoDB) getConfigMemberForPod(ctx context.Contex overrides := rs.ReplsetOverrides[pod.Name] + if overrides.Priority != nil { + member.Priority = *overrides.Priority + } + horizons := make(map[string]string) for h, domain := range rs.Horizons[pod.Name] { d := domain diff --git a/pkg/psmdb/mongo/mongo.go b/pkg/psmdb/mongo/mongo.go index 206dbb2483..2dbde48923 100644 --- a/pkg/psmdb/mongo/mongo.go +++ b/pkg/psmdb/mongo/mongo.go @@ -937,35 +937,42 @@ func (m *ConfigMembers) SetVotes(compareWith ConfigMembers, unsafePSA bool) { continue } - if votes < MaxVotingMembers { + if member.ArbiterOnly { + // Arbiter should always have a vote + []ConfigMember(*m)[i].Votes = 1 + // Arbiter should never have priority + []ConfigMember(*m)[i].Priority = 0 + } else { []ConfigMember(*m)[i].Votes = 1 - votes++ + lastVoteIdx = i - if !member.ArbiterOnly { - lastVoteIdx = i + // In unsafe PSA (Primary with a Secondary and an Arbiter), + // we are unable to set the votes and the priority simultaneously. + // Therefore, setting only the votes. + if !unsafePSA || member.Votes == 1 { // Priority can be any number in range [0,1000]. // We're setting it to 2 as default, to allow // users to configure external nodes with lower // priority than local nodes. - if !unsafePSA || member.Votes == 1 { - // In unsafe PSA (Primary with a Secondary and an Arbiter), - // we are unable to set the votes and the priority simultaneously. - // Therefore, setting only the votes. - priority := DefaultPriority - if c, ok := cm[member.Host]; ok && c > 0 { - priority = c - } - - []ConfigMember(*m)[i].Priority = priority + priority := DefaultPriority + + if c, ok := cm[member.Host]; ok { + priority = c } - } - } else if member.ArbiterOnly { - // Arbiter should always have a vote - []ConfigMember(*m)[i].Votes = 1 - // We're over the max voters limit. Make room for the arbiter - []ConfigMember(*m)[lastVoteIdx].Votes = 0 - []ConfigMember(*m)[lastVoteIdx].Priority = 0 + []ConfigMember(*m)[i].Priority = priority + } + } + votes++ + + if votes > MaxVotingMembers { + if member.ArbiterOnly { + []ConfigMember(*m)[lastVoteIdx].Votes = 0 + []ConfigMember(*m)[lastVoteIdx].Priority = 0 + } else { + []ConfigMember(*m)[i].Votes = 0 + []ConfigMember(*m)[i].Priority = 0 + } } } diff --git a/pkg/psmdb/mongo/mongo_test.go b/pkg/psmdb/mongo/mongo_test.go index e2d36f3d26..0a022e5754 100644 --- a/pkg/psmdb/mongo/mongo_test.go +++ b/pkg/psmdb/mongo/mongo_test.go @@ -20,35 +20,55 @@ func TestVoting(t *testing.T) { { "3 mongos", &mongo.ConfigMembers{ - mongo.ConfigMember{}, - mongo.ConfigMember{}, - mongo.ConfigMember{}, + mongo.ConfigMember{ + Host: "host0", + Votes: mongo.DefaultVotes, + Priority: mongo.DefaultPriority, + }, + mongo.ConfigMember{ + Host: "host1", + Votes: mongo.DefaultVotes, + Priority: mongo.DefaultPriority, + }, + mongo.ConfigMember{ + Host: "host2", + Votes: mongo.DefaultVotes, + Priority: mongo.DefaultPriority, + }, }, &mongo.ConfigMembers{ mongo.ConfigMember{ - Votes: 1, - Priority: 2, + Votes: mongo.DefaultVotes, + Priority: mongo.DefaultPriority, }, mongo.ConfigMember{ - Votes: 1, - Priority: 2, + Votes: mongo.DefaultVotes, + Priority: mongo.DefaultPriority, }, mongo.ConfigMember{ - Votes: 1, - Priority: 2, + Votes: mongo.DefaultVotes, + Priority: mongo.DefaultPriority, }, }, }, { "2 mongos", &mongo.ConfigMembers{ - mongo.ConfigMember{}, - mongo.ConfigMember{}, + mongo.ConfigMember{ + Host: "host0", + Votes: mongo.DefaultVotes, + Priority: mongo.DefaultPriority, + }, + mongo.ConfigMember{ + Host: "host1", + Votes: mongo.DefaultVotes, + Priority: mongo.DefaultPriority, + }, }, &mongo.ConfigMembers{ mongo.ConfigMember{ - Votes: 1, - Priority: 2, + Votes: mongo.DefaultVotes, + Priority: mongo.DefaultPriority, }, mongo.ConfigMember{ Votes: 0, @@ -59,21 +79,34 @@ func TestVoting(t *testing.T) { { "2 mongos + 1 arbiter", &mongo.ConfigMembers{ - mongo.ConfigMember{}, - mongo.ConfigMember{}, - mongo.ConfigMember{ArbiterOnly: true}, + mongo.ConfigMember{ + Host: "host0", + Votes: mongo.DefaultVotes, + Priority: mongo.DefaultPriority, + }, + mongo.ConfigMember{ + Host: "host1", + Votes: mongo.DefaultVotes, + Priority: mongo.DefaultPriority, + }, + mongo.ConfigMember{ + Host: "host2", + Votes: mongo.DefaultVotes, + Priority: 0, + ArbiterOnly: true, + }, }, &mongo.ConfigMembers{ mongo.ConfigMember{ - Votes: 1, - Priority: 2, + Votes: mongo.DefaultVotes, + Priority: mongo.DefaultPriority, }, mongo.ConfigMember{ - Votes: 1, - Priority: 2, + Votes: mongo.DefaultVotes, + Priority: mongo.DefaultPriority, }, mongo.ConfigMember{ - Votes: 1, + Votes: mongo.DefaultVotes, Priority: 0, }, }, @@ -81,66 +114,115 @@ func TestVoting(t *testing.T) { { "2 mongos + 1 first arbiter", &mongo.ConfigMembers{ - mongo.ConfigMember{ArbiterOnly: true}, - mongo.ConfigMember{}, - mongo.ConfigMember{}, + mongo.ConfigMember{ + Host: "host0", + Votes: mongo.DefaultVotes, + Priority: 0, + ArbiterOnly: true, + }, + mongo.ConfigMember{ + Host: "host1", + Votes: mongo.DefaultVotes, + Priority: mongo.DefaultPriority, + }, + mongo.ConfigMember{ + Host: "host2", + Votes: mongo.DefaultVotes, + Priority: mongo.DefaultPriority, + }, }, &mongo.ConfigMembers{ mongo.ConfigMember{ - Votes: 1, + Votes: mongo.DefaultVotes, Priority: 0, }, mongo.ConfigMember{ - Votes: 1, - Priority: 2, + Votes: mongo.DefaultVotes, + Priority: mongo.DefaultPriority, }, mongo.ConfigMember{ - Votes: 1, - Priority: 2, + Votes: mongo.DefaultVotes, + Priority: mongo.DefaultPriority, }, }, }, { "9 mongos", &mongo.ConfigMembers{ - mongo.ConfigMember{}, - mongo.ConfigMember{}, - mongo.ConfigMember{}, - mongo.ConfigMember{}, - mongo.ConfigMember{}, - mongo.ConfigMember{}, - mongo.ConfigMember{}, - mongo.ConfigMember{}, - mongo.ConfigMember{}, + mongo.ConfigMember{ + Host: "host0", + Votes: mongo.DefaultVotes, + Priority: mongo.DefaultPriority, + }, + mongo.ConfigMember{ + Host: "host1", + Votes: mongo.DefaultVotes, + Priority: mongo.DefaultPriority, + }, + mongo.ConfigMember{ + Host: "host2", + Votes: mongo.DefaultVotes, + Priority: mongo.DefaultPriority, + }, + mongo.ConfigMember{ + Host: "host3", + Votes: mongo.DefaultVotes, + Priority: mongo.DefaultPriority, + }, + mongo.ConfigMember{ + Host: "host4", + Votes: mongo.DefaultVotes, + Priority: mongo.DefaultPriority, + }, + mongo.ConfigMember{ + Host: "host5", + Votes: mongo.DefaultVotes, + Priority: mongo.DefaultPriority, + }, + mongo.ConfigMember{ + Host: "host6", + Votes: mongo.DefaultVotes, + Priority: mongo.DefaultPriority, + }, + mongo.ConfigMember{ + Host: "host7", + Votes: mongo.DefaultVotes, + Priority: mongo.DefaultPriority, + }, + mongo.ConfigMember{ + Host: "host8", + Votes: mongo.DefaultVotes, + Priority: mongo.DefaultPriority, + }, }, &mongo.ConfigMembers{ mongo.ConfigMember{ - Votes: 1, - Priority: 2, + Votes: mongo.DefaultVotes, + Priority: mongo.DefaultPriority, }, mongo.ConfigMember{ - Votes: 1, - Priority: 2, + Votes: mongo.DefaultVotes, + Priority: mongo.DefaultPriority, }, mongo.ConfigMember{ - Votes: 1, - Priority: 2, + Votes: mongo.DefaultVotes, + Priority: mongo.DefaultPriority, }, mongo.ConfigMember{ - Votes: 1, - Priority: 2, + Votes: mongo.DefaultVotes, + Priority: mongo.DefaultPriority, }, mongo.ConfigMember{ - Votes: 1, - Priority: 2, + Votes: mongo.DefaultVotes, + Priority: mongo.DefaultPriority, }, mongo.ConfigMember{ - Votes: 1, - Priority: 2, + Votes: mongo.DefaultVotes, + Priority: mongo.DefaultPriority, }, mongo.ConfigMember{ - Votes: 1, - Priority: 2, + Votes: mongo.DefaultVotes, + Priority: mongo.DefaultPriority, }, mongo.ConfigMember{ Votes: 0, @@ -155,43 +237,75 @@ func TestVoting(t *testing.T) { { "8 mongos", &mongo.ConfigMembers{ - mongo.ConfigMember{}, - mongo.ConfigMember{}, - mongo.ConfigMember{}, - mongo.ConfigMember{}, - mongo.ConfigMember{}, - mongo.ConfigMember{}, - mongo.ConfigMember{}, - mongo.ConfigMember{}, + mongo.ConfigMember{ + Host: "host0", + Votes: mongo.DefaultVotes, + Priority: mongo.DefaultPriority, + }, + mongo.ConfigMember{ + Host: "host1", + Votes: mongo.DefaultVotes, + Priority: mongo.DefaultPriority, + }, + mongo.ConfigMember{ + Host: "host2", + Votes: mongo.DefaultVotes, + Priority: mongo.DefaultPriority, + }, + mongo.ConfigMember{ + Host: "host3", + Votes: mongo.DefaultVotes, + Priority: mongo.DefaultPriority, + }, + mongo.ConfigMember{ + Host: "host4", + Votes: mongo.DefaultVotes, + Priority: mongo.DefaultPriority, + }, + mongo.ConfigMember{ + Host: "host5", + Votes: mongo.DefaultVotes, + Priority: mongo.DefaultPriority, + }, + mongo.ConfigMember{ + Host: "host6", + Votes: mongo.DefaultVotes, + Priority: mongo.DefaultPriority, + }, + mongo.ConfigMember{ + Host: "host7", + Votes: mongo.DefaultVotes, + Priority: mongo.DefaultPriority, + }, }, &mongo.ConfigMembers{ mongo.ConfigMember{ - Votes: 1, - Priority: 2, + Votes: mongo.DefaultVotes, + Priority: mongo.DefaultPriority, }, mongo.ConfigMember{ - Votes: 1, - Priority: 2, + Votes: mongo.DefaultVotes, + Priority: mongo.DefaultPriority, }, mongo.ConfigMember{ - Votes: 1, - Priority: 2, + Votes: mongo.DefaultVotes, + Priority: mongo.DefaultPriority, }, mongo.ConfigMember{ - Votes: 1, - Priority: 2, + Votes: mongo.DefaultVotes, + Priority: mongo.DefaultPriority, }, mongo.ConfigMember{ - Votes: 1, - Priority: 2, + Votes: mongo.DefaultVotes, + Priority: mongo.DefaultPriority, }, mongo.ConfigMember{ - Votes: 1, - Priority: 2, + Votes: mongo.DefaultVotes, + Priority: mongo.DefaultPriority, }, mongo.ConfigMember{ - Votes: 1, - Priority: 2, + Votes: mongo.DefaultVotes, + Priority: mongo.DefaultPriority, }, mongo.ConfigMember{ Votes: 0, @@ -202,51 +316,88 @@ func TestVoting(t *testing.T) { { "8 mongos + 1 arbiter", &mongo.ConfigMembers{ - mongo.ConfigMember{}, - mongo.ConfigMember{}, - mongo.ConfigMember{}, - mongo.ConfigMember{}, - mongo.ConfigMember{}, - mongo.ConfigMember{}, - mongo.ConfigMember{}, - mongo.ConfigMember{}, - mongo.ConfigMember{ArbiterOnly: true}, + mongo.ConfigMember{ + Host: "host0", + Votes: mongo.DefaultVotes, + Priority: mongo.DefaultPriority, + }, + mongo.ConfigMember{ + Host: "host1", + Votes: mongo.DefaultVotes, + Priority: mongo.DefaultPriority, + }, + mongo.ConfigMember{ + Host: "host2", + Votes: mongo.DefaultVotes, + Priority: mongo.DefaultPriority, + }, + mongo.ConfigMember{ + Host: "host3", + Votes: mongo.DefaultVotes, + Priority: mongo.DefaultPriority, + }, + mongo.ConfigMember{ + Host: "host4", + Votes: mongo.DefaultVotes, + Priority: mongo.DefaultPriority, + }, + mongo.ConfigMember{ + Host: "host5", + Votes: mongo.DefaultVotes, + Priority: mongo.DefaultPriority, + }, + mongo.ConfigMember{ + Host: "host6", + Votes: mongo.DefaultVotes, + Priority: mongo.DefaultPriority, + }, + mongo.ConfigMember{ + Host: "host7", + Votes: mongo.DefaultVotes, + Priority: mongo.DefaultPriority, + }, + mongo.ConfigMember{ + Host: "host8", + Votes: mongo.DefaultVotes, + Priority: 0, + ArbiterOnly: true, + }, }, &mongo.ConfigMembers{ mongo.ConfigMember{ - Votes: 1, - Priority: 2, + Votes: mongo.DefaultVotes, + Priority: mongo.DefaultPriority, }, mongo.ConfigMember{ - Votes: 1, - Priority: 2, + Votes: mongo.DefaultVotes, + Priority: mongo.DefaultPriority, }, mongo.ConfigMember{ - Votes: 1, - Priority: 2, + Votes: mongo.DefaultVotes, + Priority: mongo.DefaultPriority, }, mongo.ConfigMember{ - Votes: 1, - Priority: 2, + Votes: mongo.DefaultVotes, + Priority: mongo.DefaultPriority, }, mongo.ConfigMember{ - Votes: 1, - Priority: 2, + Votes: mongo.DefaultVotes, + Priority: mongo.DefaultPriority, }, mongo.ConfigMember{ - Votes: 1, - Priority: 2, + Votes: mongo.DefaultVotes, + Priority: mongo.DefaultPriority, }, mongo.ConfigMember{ - Votes: 0, - Priority: 0, + Votes: mongo.DefaultVotes, + Priority: mongo.DefaultPriority, }, mongo.ConfigMember{ Votes: 0, Priority: 0, }, mongo.ConfigMember{ - Votes: 1, + Votes: mongo.DefaultVotes, Priority: 0, }, }, @@ -254,26 +405,43 @@ func TestVoting(t *testing.T) { { "3 mongos + 1 arbiter", &mongo.ConfigMembers{ - mongo.ConfigMember{}, - mongo.ConfigMember{}, - mongo.ConfigMember{}, - mongo.ConfigMember{ArbiterOnly: true}, + mongo.ConfigMember{ + Host: "host0", + Votes: mongo.DefaultVotes, + Priority: mongo.DefaultPriority, + }, + mongo.ConfigMember{ + Host: "host1", + Votes: mongo.DefaultVotes, + Priority: mongo.DefaultPriority, + }, + mongo.ConfigMember{ + Host: "host2", + Votes: mongo.DefaultVotes, + Priority: mongo.DefaultPriority, + }, + mongo.ConfigMember{ + Host: "host3", + Votes: mongo.DefaultVotes, + Priority: 0, + ArbiterOnly: true, + }, }, &mongo.ConfigMembers{ mongo.ConfigMember{ - Votes: 1, - Priority: 2, + Votes: mongo.DefaultVotes, + Priority: mongo.DefaultPriority, }, mongo.ConfigMember{ - Votes: 1, - Priority: 2, + Votes: mongo.DefaultVotes, + Priority: mongo.DefaultPriority, }, mongo.ConfigMember{ Votes: 0, Priority: 0, }, mongo.ConfigMember{ - Votes: 1, + Votes: mongo.DefaultVotes, Priority: 0, }, }, @@ -290,7 +458,7 @@ func TestVoting(t *testing.T) { for i, member := range *c.mset { d := []mongo.ConfigMember(*c.desiered) if member.Votes != d[i].Votes || member.Priority != d[i].Priority { - t.Errorf("%s: member %d want %v, have %v", c.name, i, d[i], member) + t.Errorf("%s: member (%s) want %v, have %v", c.name, member.Host, d[i], member) } } } From a82f721ab80f4dad74cce67c419a87fbfabfa55b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ege=20G=C3=BCne=C5=9F?= Date: Tue, 5 Nov 2024 22:14:44 +0300 Subject: [PATCH 5/6] K8SPSMDB-1180: Fix deleting old scheduled backups (#1705) Co-authored-by: Viacheslav Sarzhan --- e2e-tests/functions | 2 +- .../scheduled-backup/conf/some-name-rs0-2.yml | 5 +++ .../scheduled-backup/conf/some-name-rs0-3.yml | 1 + e2e-tests/scheduled-backup/run | 33 +++++++++++++++++-- pkg/controller/perconaservermongodb/backup.go | 4 +-- pkg/psmdb/backup/pbm.go | 2 +- 6 files changed, 41 insertions(+), 6 deletions(-) diff --git a/e2e-tests/functions b/e2e-tests/functions index 4e0b6bbbb8..db1e9d4c6d 100755 --- a/e2e-tests/functions +++ b/e2e-tests/functions @@ -342,7 +342,7 @@ wait_restore() { fi done echo - set -o xtrace + set_debug if [ $wait_cluster_consistency -eq 1 ]; then wait_cluster_consistency "${cluster_name}" diff --git a/e2e-tests/scheduled-backup/conf/some-name-rs0-2.yml b/e2e-tests/scheduled-backup/conf/some-name-rs0-2.yml index e4f485592b..0a71b455bf 100644 --- a/e2e-tests/scheduled-backup/conf/some-name-rs0-2.yml +++ b/e2e-tests/scheduled-backup/conf/some-name-rs0-2.yml @@ -48,26 +48,31 @@ spec: tasks: - name: every-min-minio enabled: true + keep: 1 schedule: "* * * * *" compressionType: gzip storageName: minio - name: every-min-aws-s3 enabled: true + keep: 1 schedule: "* * * * *" compressionType: gzip storageName: aws-s3 - name: every-min-gcp-cs enabled: true + keep: 1 schedule: "* * * * *" compressionType: gzip storageName: gcp-cs - name: every-min-azure-blob enabled: true + keep: 1 schedule: "* * * * *" compressionType: gzip storageName: azure-blob - name: weekly enabled: true + keep: 1 schedule: "0 0 * * 0" compressionType: gzip storageName: aws-s3 diff --git a/e2e-tests/scheduled-backup/conf/some-name-rs0-3.yml b/e2e-tests/scheduled-backup/conf/some-name-rs0-3.yml index c4cb9b6043..c0639d14fa 100644 --- a/e2e-tests/scheduled-backup/conf/some-name-rs0-3.yml +++ b/e2e-tests/scheduled-backup/conf/some-name-rs0-3.yml @@ -48,6 +48,7 @@ spec: tasks: - name: every-min-minio enabled: true + keep: 1 type: physical schedule: "* * * * *" compressionType: gzip diff --git a/e2e-tests/scheduled-backup/run b/e2e-tests/scheduled-backup/run index eee4225707..8cb5a463c8 100755 --- a/e2e-tests/scheduled-backup/run +++ b/e2e-tests/scheduled-backup/run @@ -18,6 +18,18 @@ unlabel_node() { kubectl_bin label nodes "${LABELED_NODE}" backupWorker- --overwrite } +check_backup_count() { + local ancestor=$1 + local expected=$2 + + local count=$(kubectl_bin get psmdb-backup -l percona.com/backup-ancestor=${ancestor} | grep ready | wc -l) + + if [[ ${count} != ${expected} ]]; then + echo "${ancestor}: Expected ${expected} backups but found ${count}." + exit 1 + fi +} + create_infra "$namespace" deploy_minio @@ -69,11 +81,13 @@ wait_backup_agent $cluster-0 wait_backup_agent $cluster-1 wait_backup_agent $cluster-2 -desc 'add backups schedule, wait for the first backup' +desc 'add backups schedule, wait for backups' apply_cluster "$test_dir/conf/$cluster-2.yml" sleep 55 +desc 'disable backups schedule' apply_cluster "$test_dir/conf/$cluster.yml" + if [ -z "$SKIP_BACKUPS_TO_AWS_GCP_AZURE" ]; then backup_name_aws=$(kubectl_bin get psmdb-backup | grep aws-s3 | awk '{print$1}' | head -1) backup_name_gcp=$(kubectl_bin get psmdb-backup | grep gcp-cs | awk '{print$1}' | head -1) @@ -88,6 +102,22 @@ wait_backup "$backup_name_minio" sleep 5 +echo -n "checking backup count for every-min-minio..." +check_backup_count every-min-minio 1 +echo "OK" + +echo -n "checking backup count for every-min-aws-s3..." +check_backup_count every-min-aws-s3 1 +echo "OK" + +echo -n "checking backup count for every-min-gcp-cs..." +check_backup_count every-min-gcp-cs 1 +echo "OK" + +echo -n "checking backup count for every-min-azure-blob..." +check_backup_count every-min-azure-blob 1 +echo "OK" + desc 'check backup and restore -- minio' backup_dest_minio=$(get_backup_dest "$backup_name_minio") kubectl_bin run -i --rm aws-cli --image=perconalab/awscli --restart=Never -- \ @@ -147,7 +177,6 @@ fi desc 'add physical backup schedule, wait for the first backup' apply_cluster "$test_dir/conf/$cluster-3.yml" - sleep 55 apply_cluster "$test_dir/conf/$cluster.yml" diff --git a/pkg/controller/perconaservermongodb/backup.go b/pkg/controller/perconaservermongodb/backup.go index 18687b33de..4aadd0681c 100644 --- a/pkg/controller/perconaservermongodb/backup.go +++ b/pkg/controller/perconaservermongodb/backup.go @@ -211,8 +211,8 @@ func (r *ReconcilePerconaServerMongoDB) oldScheduledBackups(ctx context.Context, &client.ListOptions{ Namespace: cr.Namespace, LabelSelector: labels.SelectorFromSet(map[string]string{ - "cluster": cr.Name, - "ancestor": ancestor, + naming.LabelCluster: cr.Name, + naming.LabelBackupAncestor: ancestor, }), }, ) diff --git a/pkg/psmdb/backup/pbm.go b/pkg/psmdb/backup/pbm.go index fc4b6de21e..84887634a7 100644 --- a/pkg/psmdb/backup/pbm.go +++ b/pkg/psmdb/backup/pbm.go @@ -428,7 +428,7 @@ func (b *pbmC) Conn() *mongo.Client { // by given storageName func (b *pbmC) GetNSetConfig(ctx context.Context, k8sclient client.Client, cluster *api.PerconaServerMongoDB, stg api.BackupStorageSpec) error { log := logf.FromContext(ctx) - log.Info("Setting PBM config", "backup", cluster.Name) + log.Info("Setting PBM config", "cluster", cluster.Name) conf, err := GetPBMConfig(ctx, k8sclient, cluster, stg) if err != nil { From 54f358ae0095918c43ddf65fb076907034a3479f Mon Sep 17 00:00:00 2001 From: Pavel Tankov <4014969+ptankov@users.noreply.github.com> Date: Wed, 6 Nov 2024 07:41:39 +0200 Subject: [PATCH 6/6] K8SPSMDB-1199 Automate Kubernetes Providers versions provisioning for Jenkins jobs (#1701) * added supported kubernetes providers versions * Update AKS_MAX version to 1.31 * trim the v from the Minikube version, like, e.g. v1.31.0 and then add it from within the pipeline itself * Update supported Kubernetes provider versions * reverting the file name back to release_versions, because we keep only versions in it * Update MINIKUBE version variable name to MINIKUBE_REL --- e2e-tests/{release_images => release_versions} | 9 +++++++++ 1 file changed, 9 insertions(+) rename e2e-tests/{release_images => release_versions} (72%) diff --git a/e2e-tests/release_images b/e2e-tests/release_versions similarity index 72% rename from e2e-tests/release_images rename to e2e-tests/release_versions index 5881a0e1a7..755fa38074 100644 --- a/e2e-tests/release_images +++ b/e2e-tests/release_versions @@ -5,3 +5,12 @@ IMAGE_MONGOD50=percona/percona-server-mongodb:5.0.29-25 IMAGE_BACKUP=percona/percona-backup-mongodb:2.6.0 IMAGE_PMM_CLIENT=percona/pmm-client:2.43.2 IMAGE_PMM_SERVER=percona/pmm-server:2.43.2 +GKE_MIN=1.28 +GKE_MAX=1.30 +EKS_MIN=1.28 +EKS_MAX=1.31 +AKS_MIN=1.28 +AKS_MAX=1.31 +OPENSHIFT_MIN=4.13.52 +OPENSHIFT_MAX=4.17.3 +MINIKUBE_REL=1.31.0 \ No newline at end of file