From d6e9d6b1cdcb5b95f268f4ec0b9971f29423945f Mon Sep 17 00:00:00 2001 From: Andrii Dema Date: Mon, 12 May 2025 15:02:46 +0300 Subject: [PATCH 01/13] K8SPSMDB-1296: improve readiness probe https://perconadev.atlassian.net/browse/K8SPSMDB-1296 --- cmd/mongodb-healthcheck/db/db.go | 12 +++-- cmd/mongodb-healthcheck/db/ssl.go | 7 +-- cmd/mongodb-healthcheck/db/ssl_test.go | 8 +-- cmd/mongodb-healthcheck/healthcheck/health.go | 49 +++--------------- .../healthcheck/readiness.go | 34 ++++++++++++- cmd/mongodb-healthcheck/healthcheck/util.go | 51 +++++++++++++++++++ cmd/mongodb-healthcheck/tool/tool.go | 2 +- ...ulset_arbiter-clusterip-rs0-arbiter-oc.yml | 6 +++ ...tefulset_arbiter-clusterip-rs0-arbiter.yml | 6 +++ .../statefulset_arbiter-rs0-arbiter-oc.yml | 6 +++ .../statefulset_arbiter-rs0-arbiter.yml | 6 +++ .../compare/statefulset_some-name-cfg-oc.yml | 6 +++ .../compare/statefulset_some-name-cfg.yml | 6 +++ .../compare/statefulset_some-name-rs0-oc.yml | 6 +++ .../compare/statefulset_some-name-rs0.yml | 6 +++ .../statefulset_some-name-cfg-4-oc.yml | 6 +++ .../compare/statefulset_some-name-cfg-oc.yml | 6 +++ .../compare/statefulset_some-name-cfg.yml | 6 +++ .../statefulset_some-name-rs0-4-oc.yml | 6 +++ .../compare/statefulset_some-name-rs0-oc.yml | 6 +++ .../compare/statefulset_some-name-rs0.yml | 6 +++ .../compare/statefulset_some-name-cfg-oc.yml | 6 +++ .../compare/statefulset_some-name-cfg.yml | 6 +++ .../compare/statefulset_some-name-rs0-oc.yml | 6 +++ .../compare/statefulset_some-name-rs0.yml | 6 +++ .../statefulset_minimal-cluster-cfg-oc.yml | 6 +++ .../statefulset_minimal-cluster-cfg.yml | 6 +++ .../statefulset_minimal-cluster-rs0-oc.yml | 6 +++ .../statefulset_minimal-cluster-rs0.yml | 6 +++ .../statefulset_my-cluster-name-cfg-oc.yml | 6 +++ .../statefulset_my-cluster-name-cfg.yml | 6 +++ .../statefulset_my-cluster-name-rs0-oc.yml | 6 +++ .../statefulset_my-cluster-name-rs0.yml | 6 +++ .../compare/statefulset_some-name-rs0.yml | 6 +++ .../compare/statefulset_some-name-rs0.yml | 6 +++ .../compare/statefulset_some-name-rs0.yml | 6 +++ ...ulset_some-name-rs0_restore_sharded-oc.yml | 6 +++ ...tefulset_some-name-rs0_restore_sharded.yml | 6 +++ ...et_some-name-rs0_restore-arbiter-nv-oc.yml | 6 +++ ...ulset_some-name-rs0_restore-arbiter-nv.yml | 6 +++ .../statefulset_some-name-rs0_restore-oc.yml | 6 +++ .../statefulset_some-name-rs0_restore.yml | 6 +++ ...ulset_some-name-rs0_restore_sharded-oc.yml | 6 +++ ...tefulset_some-name-rs0_restore_sharded.yml | 6 +++ ...et_some-name-rs0_restore-arbiter-nv-oc.yml | 6 +++ ...ulset_some-name-rs0_restore-arbiter-nv.yml | 6 +++ .../statefulset_some-name-rs0_restore-oc.yml | 6 +++ .../statefulset_some-name-rs0_restore.yml | 6 +++ e2e-tests/demand-backup-physical/run | 2 +- .../statefulset_some-name-cfg-4-oc.yml | 6 +++ .../compare/statefulset_some-name-cfg-oc.yml | 6 +++ .../compare/statefulset_some-name-cfg.yml | 6 +++ .../statefulset_some-name-rs0-4-oc.yml | 6 +++ .../compare/statefulset_some-name-rs0-oc.yml | 6 +++ .../compare/statefulset_some-name-rs0.yml | 6 +++ .../compare/statefulset_some-name-rs1-oc.yml | 6 +++ .../compare/statefulset_some-name-rs1.yml | 6 +++ .../compare/statefulset_some-name-rs2-oc.yml | 6 +++ .../compare/statefulset_some-name-rs2.yml | 6 +++ .../compare/statefulset_some-name-rs0-oc.yml | 6 +++ .../compare/statefulset_some-name-rs0.yml | 6 +++ .../statefulset_some-name-cfg-4-oc.yml | 6 +++ .../compare/statefulset_some-name-cfg-oc.yml | 6 +++ .../compare/statefulset_some-name-cfg.yml | 6 +++ .../statefulset_some-name-rs0-4-oc.yml | 6 +++ .../compare/statefulset_some-name-rs0-oc.yml | 6 +++ ...set_some-name-rs0-sharding-disabled-oc.yml | 6 +++ ...fulset_some-name-rs0-sharding-disabled.yml | 6 +++ ...lset_some-name-rs0-sharding-enabled-oc.yml | 6 +++ ...efulset_some-name-rs0-sharding-enabled.yml | 6 +++ .../compare/statefulset_some-name-rs0.yml | 6 +++ .../statefulset_another-name-rs0-4-oc.yml | 6 +++ .../statefulset_another-name-rs0-oc.yml | 6 +++ .../compare/statefulset_another-name-rs0.yml | 6 +++ .../compare/statefulset_some-name-rs0-oc.yml | 6 +++ .../compare/statefulset_some-name-rs0.yml | 6 +++ ...statefulset_no-limits-rs0-increased-oc.yml | 6 +++ .../statefulset_no-limits-rs0-increased.yml | 6 +++ .../compare/statefulset_no-limits-rs0-oc.yml | 6 +++ .../compare/statefulset_no-limits-rs0.yml | 6 +++ ...no-requests-no-limits-rs0-increased-oc.yml | 6 +++ ...et_no-requests-no-limits-rs0-increased.yml | 6 +++ ...atefulset_no-requests-no-limits-rs0-oc.yml | 6 +++ .../statefulset_no-requests-no-limits-rs0.yml | 6 +++ ...atefulset_no-requests-rs0-increased-oc.yml | 6 +++ .../statefulset_no-requests-rs0-increased.yml | 6 +++ .../statefulset_no-requests-rs0-oc.yml | 6 +++ .../compare/statefulset_no-requests-rs0.yml | 6 +++ .../compare/statefulset_monitoring-cfg-oc.yml | 6 +++ .../compare/statefulset_monitoring-cfg.yml | 6 +++ .../statefulset_monitoring-rs0-no-pmm-oc.yml | 6 +++ .../statefulset_monitoring-rs0-no-pmm.yml | 6 +++ .../compare/statefulset_monitoring-rs0-oc.yml | 6 +++ .../compare/statefulset_monitoring-rs0.yml | 6 +++ .../statefulset_nonvoting-rs0-nv-oc.yml | 6 +++ .../compare/statefulset_nonvoting-rs0-nv.yml | 6 +++ .../compare/statefulset_one-pod-rs0-oc.yml | 6 +++ .../statefulset_one-pod-rs0-secret-oc.yml | 6 +++ .../statefulset_one-pod-rs0-secret.yml | 6 +++ .../compare/statefulset_one-pod-rs0.yml | 6 +++ .../statefulset_some-name-cfg-4-oc.yml | 6 +++ .../compare/statefulset_some-name-cfg-oc.yml | 6 +++ .../compare/statefulset_some-name-cfg.yml | 6 +++ .../statefulset_some-name-rs0-4-oc.yml | 6 +++ .../compare/statefulset_some-name-rs0-oc.yml | 6 +++ .../compare/statefulset_some-name-rs0.yml | 6 +++ .../statefulset_some-name-rs1-4-oc.yml | 6 +++ .../compare/statefulset_some-name-rs1-oc.yml | 6 +++ .../compare/statefulset_some-name-rs1.yml | 6 +++ .../statefulset_some-name-rs2-4-oc.yml | 6 +++ .../compare/statefulset_some-name-rs2-oc.yml | 6 +++ .../compare/statefulset_some-name-rs2.yml | 6 +++ .../statefulset_some-name-cfg-4-oc.yml | 6 +++ .../compare/statefulset_some-name-cfg-oc.yml | 6 +++ .../compare/statefulset_some-name-cfg.yml | 6 +++ .../statefulset_some-name-rs0-4-oc.yml | 6 +++ .../compare/statefulset_some-name-rs0-oc.yml | 6 +++ .../compare/statefulset_some-name-rs0.yml | 6 +++ .../statefulset_some-name-rs1-4-oc.yml | 6 +++ .../compare/statefulset_some-name-rs1-oc.yml | 6 +++ .../compare/statefulset_some-name-rs1.yml | 6 +++ .../statefulset_some-name-rs2-4-oc.yml | 6 +++ .../compare/statefulset_some-name-rs2-oc.yml | 6 +++ .../compare/statefulset_some-name-rs2.yml | 6 +++ .../statefulset_some-name-cfg-4-oc.yml | 6 +++ .../compare/statefulset_some-name-cfg-oc.yml | 6 +++ .../compare/statefulset_some-name-cfg.yml | 6 +++ .../statefulset_some-name-rs0-4-oc.yml | 6 +++ .../compare/statefulset_some-name-rs0-oc.yml | 6 +++ .../compare/statefulset_some-name-rs0.yml | 6 +++ .../statefulset_some-name-rs1-4-oc.yml | 6 +++ .../compare/statefulset_some-name-rs1-oc.yml | 6 +++ .../compare/statefulset_some-name-rs1.yml | 6 +++ .../statefulset_some-name-rs2-4-oc.yml | 6 +++ .../compare/statefulset_some-name-rs2-oc.yml | 6 +++ .../compare/statefulset_some-name-rs2.yml | 6 +++ .../compare/statefulset_some-name-rs0-oc.yml | 6 +++ .../compare/statefulset_some-name-rs0.yml | 6 +++ .../compare/statefulset_some-name-rs0-oc.yml | 6 +++ .../compare/statefulset_some-name-rs0.yml | 6 +++ .../compare/statefulset_some-name-rs0-oc.yml | 6 +++ .../compare/statefulset_some-name-rs0.yml | 6 +++ .../compare/statefulset_some-name-rs0-oc.yml | 6 +++ .../compare/statefulset_some-name-rs0.yml | 6 +++ .../statefulset_sec-context-rs0-changed.yml | 6 +++ .../compare/statefulset_sec-context-rs0.yml | 6 +++ .../compare/statefulset_cluster-ip-rs0-oc.yml | 6 +++ .../compare/statefulset_cluster-ip-rs0.yml | 6 +++ .../statefulset_local-balancer-rs0-oc.yml | 6 +++ .../statefulset_local-balancer-rs0.yml | 6 +++ .../compare/statefulset_node-port-rs0-oc.yml | 6 +++ .../compare/statefulset_node-port-rs0.yml | 6 +++ .../compare/statefulset_mydb-rs0-oc.yml | 6 +++ .../compare/statefulset_mydb-rs0.yml | 6 +++ ...tatefulset_smart-update-rs0-arbiter-oc.yml | 6 +++ .../statefulset_smart-update-rs0-arbiter.yml | 6 +++ .../statefulset_smart-update-rs0-oc.yml | 6 +++ .../compare/statefulset_smart-update-rs0.yml | 6 +++ .../compare/statefulset_emptydir-rs0-oc.yml | 6 +++ .../compare/statefulset_emptydir-rs0.yml | 6 +++ .../compare/statefulset_hostpath-rs0-oc.yml | 6 +++ .../compare/statefulset_hostpath-rs0.yml | 6 +++ .../compare/statefulset_some-name-cfg-oc.yml | 6 +++ ...tefulset_some-name-cfg-tls-disabled-oc.yml | 6 +++ ...statefulset_some-name-cfg-tls-disabled.yml | 6 +++ .../compare/statefulset_some-name-cfg.yml | 6 +++ .../compare/statefulset_some-name-rs0-oc.yml | 6 +++ ...tefulset_some-name-rs0-tls-disabled-oc.yml | 6 +++ ...statefulset_some-name-rs0-tls-disabled.yml | 6 +++ .../compare/statefulset_some-name-rs0.yml | 6 +++ ...atefulset_version-service-exact-rs0-oc.yml | 6 +++ .../statefulset_version-service-exact-rs0.yml | 6 +++ ...tefulset_version-service-latest-rs0-oc.yml | 6 +++ ...statefulset_version-service-latest-rs0.yml | 6 +++ ...atefulset_version-service-major-rs0-oc.yml | 6 +++ .../statefulset_version-service-major-rs0.yml | 6 +++ ...set_version-service-recommended-rs0-oc.yml | 6 +++ ...fulset_version-service-recommended-rs0.yml | 6 +++ ...set_version-service-unreachable-rs0-oc.yml | 6 +++ ...fulset_version-service-unreachable-rs0.yml | 6 +++ pkg/apis/psmdb/v1/psmdb_defaults.go | 12 +++++ pkg/psmdb/client.go | 6 +-- pkg/psmdb/mongo/mongo.go | 28 +++++----- 183 files changed, 1168 insertions(+), 75 deletions(-) create mode 100644 cmd/mongodb-healthcheck/healthcheck/util.go diff --git a/cmd/mongodb-healthcheck/db/db.go b/cmd/mongodb-healthcheck/db/db.go index f9d7c53f2..97a2147fa 100644 --- a/cmd/mongodb-healthcheck/db/db.go +++ b/cmd/mongodb-healthcheck/db/db.go @@ -29,25 +29,27 @@ var ( ) func Dial(ctx context.Context, conf *Config) (mongo.Client, error) { - if err := conf.configureTLS(); err != nil { + log := logf.FromContext(ctx).WithName("Dial") + ctx = logf.IntoContext(ctx, log) + + if err := conf.configureTLS(ctx); err != nil { return nil, errors.Wrap(err, "configure TLS") } - log := logf.FromContext(ctx) log.V(1).Info("Connecting to mongodb", "hosts", conf.Hosts, "ssl", conf.SSL.Enabled, "ssl_insecure", conf.SSL.Insecure) if conf.Username != "" && conf.Password != "" { log.V(1).Info("Enabling authentication for session", "user", conf.Username) } - cl, err := mongo.Dial(&conf.Config) + cl, err := mongo.Dial(ctx, &conf.Config) if err != nil { cfg := conf.Config cfg.Direct = true cfg.ReplSetName = "" - cl, err = mongo.Dial(&cfg) + cl, err = mongo.Dial(ctx, &cfg) if err != nil { - return nil, errors.Wrap(err, "filed to dial mongo") + return nil, errors.Wrap(err, "failed to dial mongo") } } diff --git a/cmd/mongodb-healthcheck/db/ssl.go b/cmd/mongodb-healthcheck/db/ssl.go index 0c38fe8f9..4c5ad1a53 100644 --- a/cmd/mongodb-healthcheck/db/ssl.go +++ b/cmd/mongodb-healthcheck/db/ssl.go @@ -15,6 +15,7 @@ package db import ( + "context" "crypto/tls" "crypto/x509" "os" @@ -40,8 +41,8 @@ func (sc *SSLConfig) loadCaCertificate() (*x509.CertPool, error) { return certificates, nil } -func (cnf *Config) configureTLS() error { - log := logf.Log +func (cnf *Config) configureTLS(ctx context.Context) error { + log := logf.FromContext(ctx).WithName("configureTLS") if !cnf.SSL.Enabled { return nil @@ -72,7 +73,7 @@ func (cnf *Config) configureTLS() error { return errors.Wrapf(err, "check if file with name %s exists", cnf.SSL.CAFile) } - log.V(1).Info("Loading SSL/TLS Certificate Authority: %s", "ca", cnf.SSL.CAFile) + log.V(1).Info("Loading SSL/TLS Certificate Authority", "ca", cnf.SSL.CAFile) ca, err := cnf.SSL.loadCaCertificate() if err != nil { return errors.Wrapf(err, "load client CAs from %s", cnf.SSL.CAFile) diff --git a/cmd/mongodb-healthcheck/db/ssl_test.go b/cmd/mongodb-healthcheck/db/ssl_test.go index 36f0241b8..7e239daf5 100644 --- a/cmd/mongodb-healthcheck/db/ssl_test.go +++ b/cmd/mongodb-healthcheck/db/ssl_test.go @@ -16,7 +16,7 @@ func TestSSLNotEnabled(t *testing.T) { }, } - if err := cfg.configureTLS(); err != nil { + if err := cfg.configureTLS(t.Context()); err != nil { t.Fatalf("TLS configuration failed: %s", err) } @@ -32,7 +32,7 @@ func TestSSLEnabled(t *testing.T) { }, } - if err := cfg.configureTLS(); err != nil { + if err := cfg.configureTLS(t.Context()); err != nil { t.Fatalf("TLS configuration failed: %s", err) } @@ -49,7 +49,7 @@ func TestPEMKeyFileDoesNotExists(t *testing.T) { }, } - err := cfg.configureTLS() + err := cfg.configureTLS(t.Context()) if err == nil { t.Fatal("Expected TLS config to fail, but it returned no error") } @@ -71,7 +71,7 @@ func TestCAFileDoesNotExists(t *testing.T) { }, } - err := cfg.configureTLS() + err := cfg.configureTLS(t.Context()) if err == nil { t.Fatal("Expected TLS config to fail, but it returned no error") } diff --git a/cmd/mongodb-healthcheck/healthcheck/health.go b/cmd/mongodb-healthcheck/healthcheck/health.go index 3a6de9ce9..1494c5d1c 100644 --- a/cmd/mongodb-healthcheck/healthcheck/health.go +++ b/cmd/mongodb-healthcheck/healthcheck/health.go @@ -16,12 +16,9 @@ package healthcheck import ( "context" - "encoding/json" - v "github.com/hashicorp/go-version" "github.com/pkg/errors" "go.mongodb.org/mongo-driver/bson" - "go.mongodb.org/mongo-driver/bson/primitive" logf "sigs.k8s.io/controller-runtime/pkg/log" "github.com/percona/percona-server-mongodb-operator/cmd/mongodb-healthcheck/db" @@ -32,6 +29,7 @@ var ErrNoReplsetConfigStr = "(NotYetInitialized) no replset config has been rece func HealthCheckMongosLiveness(ctx context.Context, cnf *db.Config) (err error) { log := logf.FromContext(ctx).WithName("HealthCheckMongosLiveness") + ctx = logf.IntoContext(ctx, log) client, err := db.Dial(ctx, cnf) if err != nil { @@ -58,6 +56,7 @@ func HealthCheckMongosLiveness(ctx context.Context, cnf *db.Config) (err error) func HealthCheckMongodLiveness(ctx context.Context, cnf *db.Config, startupDelaySeconds int64) (_ *mongo.MemberState, err error) { log := logf.FromContext(ctx).WithName("HealthCheckMongodLiveness") + ctx = logf.IntoContext(ctx, log) client, err := db.Dial(ctx, cnf) if err != nil { @@ -74,50 +73,14 @@ func HealthCheckMongodLiveness(ctx context.Context, cnf *db.Config, startupDelay return nil, errors.Wrap(err, "get isMaster response") } - buildInfo, err := client.RSBuildInfo(ctx) + rsStatus, err := getStatus(ctx, client) if err != nil { - return nil, errors.Wrap(err, "get buildInfo response") - } - - replSetStatusCommand := bson.D{{Key: "replSetGetStatus", Value: 1}} - mongoVersion := v.Must(v.NewVersion(buildInfo.Version)) - if mongoVersion.Compare(v.Must(v.NewVersion("4.2.1"))) < 0 { - // https://docs.mongodb.com/manual/reference/command/replSetGetStatus/#syntax - replSetStatusCommand = append(replSetStatusCommand, primitive.E{Key: "initialSync", Value: 1}) - } - - res := client.Database("admin").RunCommand(ctx, replSetStatusCommand) - if res.Err() != nil { - // if we come this far, it means db connection was successful - // standalone mongod nodes in an unmanaged cluster doesn't need - // to die before they added to a replset - if res.Err().Error() == ErrNoReplsetConfigStr { + if err.Error() == ErrNoReplsetConfigStr { state := mongo.MemberStateUnknown - log.V(1).Info("replSetGetStatus failed", "err", res.Err().Error(), "state", state) + log.V(1).Info("replSetGetStatus failed", "err", err.Error(), "state", state) return &state, nil } - return nil, errors.Wrap(res.Err(), "get replsetGetStatus response") - } - - // this is a workaround to fix decoding of empty interfaces - // https://jira.mongodb.org/browse/GODRIVER-988 - rsStatus := ReplSetStatus{} - tempResult := bson.M{} - err = res.Decode(&tempResult) - if err != nil { - return nil, errors.Wrap(err, "decode replsetGetStatus response") - } - - if err == nil { - result, err := json.Marshal(tempResult) - if err != nil { - return nil, errors.Wrap(err, "marshal temp result") - } - - err = json.Unmarshal(result, &rsStatus) - if err != nil { - return nil, errors.Wrap(err, "unmarshal temp result") - } + return nil, errors.Wrap(err, "get replSetGetStatus response") } oplogRs := OplogRs{} diff --git a/cmd/mongodb-healthcheck/healthcheck/readiness.go b/cmd/mongodb-healthcheck/healthcheck/readiness.go index b58ed28c4..3db3127d4 100644 --- a/cmd/mongodb-healthcheck/healthcheck/readiness.go +++ b/cmd/mongodb-healthcheck/healthcheck/readiness.go @@ -17,6 +17,7 @@ package healthcheck import ( "context" "net" + "time" "github.com/pkg/errors" "go.mongodb.org/mongo-driver/bson" @@ -27,21 +28,50 @@ import ( ) // MongodReadinessCheck runs a ping on a pmgo.SessionManager to check server readiness -func MongodReadinessCheck(ctx context.Context, addr string) error { +func MongodReadinessCheck(ctx context.Context, cnf *db.Config) error { log := logf.FromContext(ctx).WithName("MongodReadinessCheck") + ctx = logf.IntoContext(ctx, log) var d net.Dialer + addr := cnf.Hosts[0] log.V(1).Info("Connecting to " + addr) conn, err := d.DialContext(ctx, "tcp", addr) if err != nil { return errors.Wrap(err, "dial") } - return conn.Close() + if err := conn.Close(); err != nil { + return err + } + + s, err := func() (ReplSetStatus, error) { + cnf.Timeout = time.Second + client, err := db.Dial(ctx, cnf) + if err != nil { + return ReplSetStatus{}, errors.Wrap(err, "connection error") + } + defer func() { + if derr := client.Disconnect(ctx); derr != nil && err == nil { + err = errors.Wrap(derr, "failed to disconnect") + } + }() + return getStatus(ctx, client) + }() + if err != nil { + log.Error(err, "Failed to get replset status") + return nil + } + + if err := CheckState(s, 0, 0); err != nil { + return errors.Wrap(err, "check state") + } + + return nil } func MongosReadinessCheck(ctx context.Context, cnf *db.Config) (err error) { log := logf.FromContext(ctx).WithName("MongosReadinessCheck") + ctx = logf.IntoContext(ctx, log) client, err := db.Dial(ctx, cnf) if err != nil { diff --git a/cmd/mongodb-healthcheck/healthcheck/util.go b/cmd/mongodb-healthcheck/healthcheck/util.go new file mode 100644 index 000000000..b4c3607f9 --- /dev/null +++ b/cmd/mongodb-healthcheck/healthcheck/util.go @@ -0,0 +1,51 @@ +package healthcheck + +import ( + "context" + "encoding/json" + + v "github.com/hashicorp/go-version" + "github.com/pkg/errors" + "go.mongodb.org/mongo-driver/bson" + "go.mongodb.org/mongo-driver/bson/primitive" + + "github.com/percona/percona-server-mongodb-operator/pkg/psmdb/mongo" +) + +func getStatus(ctx context.Context, client mongo.Client) (ReplSetStatus, error) { + buildInfo, err := client.RSBuildInfo(ctx) + if err != nil { + return ReplSetStatus{}, errors.Wrap(err, "get buildInfo response") + } + + replSetStatusCommand := bson.D{{Key: "replSetGetStatus", Value: 1}} + mongoVersion := v.Must(v.NewVersion(buildInfo.Version)) + if mongoVersion.Compare(v.Must(v.NewVersion("4.2.1"))) < 0 { + // https://docs.mongodb.com/manual/reference/command/replSetGetStatus/#syntax + replSetStatusCommand = append(replSetStatusCommand, primitive.E{Key: "initialSync", Value: 1}) + } + + res := client.Database("admin").RunCommand(ctx, replSetStatusCommand) + if res.Err() != nil { + if res.Err().Error() == ErrNoReplsetConfigStr { + return ReplSetStatus{}, errors.New(ErrNoReplsetConfigStr) + } + return ReplSetStatus{}, errors.Wrap(res.Err(), "get replsetGetStatus response") + } + + // this is a workaround to fix decoding of empty interfaces + // https://jira.mongodb.org/browse/GODRIVER-988 + rsStatus := ReplSetStatus{} + tempResult := bson.M{} + if err := res.Decode(&tempResult); err != nil { + return ReplSetStatus{}, errors.Wrap(err, "decode replsetGetStatus response") + } + result, err := json.Marshal(tempResult) + if err != nil { + return ReplSetStatus{}, errors.Wrap(err, "marshal temp result") + } + if err = json.Unmarshal(result, &rsStatus); err != nil { + return ReplSetStatus{}, errors.Wrap(err, "unmarshal temp result") + } + return rsStatus, nil +} diff --git a/cmd/mongodb-healthcheck/tool/tool.go b/cmd/mongodb-healthcheck/tool/tool.go index bafdb7730..2aa4148f0 100644 --- a/cmd/mongodb-healthcheck/tool/tool.go +++ b/cmd/mongodb-healthcheck/tool/tool.go @@ -111,7 +111,7 @@ func (app *App) Run(ctx context.Context) error { switch *component { case "mongod": - err := healthcheck.MongodReadinessCheck(ctx, cnf.Hosts[0]) + err := healthcheck.MongodReadinessCheck(ctx, cnf) if err != nil { return errors.Wrap(err, "member failed Kubernetes readiness check") } diff --git a/e2e-tests/arbiter/compare/statefulset_arbiter-clusterip-rs0-arbiter-oc.yml b/e2e-tests/arbiter/compare/statefulset_arbiter-clusterip-rs0-arbiter-oc.yml index 49a02584c..062dc96d6 100644 --- a/e2e-tests/arbiter/compare/statefulset_arbiter-clusterip-rs0-arbiter-oc.yml +++ b/e2e-tests/arbiter/compare/statefulset_arbiter-clusterip-rs0-arbiter-oc.yml @@ -113,6 +113,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/arbiter/compare/statefulset_arbiter-clusterip-rs0-arbiter.yml b/e2e-tests/arbiter/compare/statefulset_arbiter-clusterip-rs0-arbiter.yml index 797dc46bc..d938d0ea4 100644 --- a/e2e-tests/arbiter/compare/statefulset_arbiter-clusterip-rs0-arbiter.yml +++ b/e2e-tests/arbiter/compare/statefulset_arbiter-clusterip-rs0-arbiter.yml @@ -107,6 +107,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/arbiter/compare/statefulset_arbiter-rs0-arbiter-oc.yml b/e2e-tests/arbiter/compare/statefulset_arbiter-rs0-arbiter-oc.yml index 694ee77a9..11e301532 100644 --- a/e2e-tests/arbiter/compare/statefulset_arbiter-rs0-arbiter-oc.yml +++ b/e2e-tests/arbiter/compare/statefulset_arbiter-rs0-arbiter-oc.yml @@ -114,6 +114,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/arbiter/compare/statefulset_arbiter-rs0-arbiter.yml b/e2e-tests/arbiter/compare/statefulset_arbiter-rs0-arbiter.yml index 32d628619..59632f063 100644 --- a/e2e-tests/arbiter/compare/statefulset_arbiter-rs0-arbiter.yml +++ b/e2e-tests/arbiter/compare/statefulset_arbiter-rs0-arbiter.yml @@ -114,6 +114,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/custom-tls/compare/statefulset_some-name-cfg-oc.yml b/e2e-tests/custom-tls/compare/statefulset_some-name-cfg-oc.yml index 5f346cca5..a2471dcd7 100644 --- a/e2e-tests/custom-tls/compare/statefulset_some-name-cfg-oc.yml +++ b/e2e-tests/custom-tls/compare/statefulset_some-name-cfg-oc.yml @@ -114,6 +114,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 3 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/custom-tls/compare/statefulset_some-name-cfg.yml b/e2e-tests/custom-tls/compare/statefulset_some-name-cfg.yml index 1c7d07c6e..75558b29c 100644 --- a/e2e-tests/custom-tls/compare/statefulset_some-name-cfg.yml +++ b/e2e-tests/custom-tls/compare/statefulset_some-name-cfg.yml @@ -114,6 +114,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 3 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/custom-tls/compare/statefulset_some-name-rs0-oc.yml b/e2e-tests/custom-tls/compare/statefulset_some-name-rs0-oc.yml index c1f79fa31..1d105219e 100644 --- a/e2e-tests/custom-tls/compare/statefulset_some-name-rs0-oc.yml +++ b/e2e-tests/custom-tls/compare/statefulset_some-name-rs0-oc.yml @@ -103,6 +103,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/custom-tls/compare/statefulset_some-name-rs0.yml b/e2e-tests/custom-tls/compare/statefulset_some-name-rs0.yml index 80111f688..9e948781f 100644 --- a/e2e-tests/custom-tls/compare/statefulset_some-name-rs0.yml +++ b/e2e-tests/custom-tls/compare/statefulset_some-name-rs0.yml @@ -103,6 +103,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/custom-users-roles-sharded/compare/statefulset_some-name-cfg-4-oc.yml b/e2e-tests/custom-users-roles-sharded/compare/statefulset_some-name-cfg-4-oc.yml index 469b2313b..2fc79dca6 100644 --- a/e2e-tests/custom-users-roles-sharded/compare/statefulset_some-name-cfg-4-oc.yml +++ b/e2e-tests/custom-users-roles-sharded/compare/statefulset_some-name-cfg-4-oc.yml @@ -114,6 +114,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 3 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/custom-users-roles-sharded/compare/statefulset_some-name-cfg-oc.yml b/e2e-tests/custom-users-roles-sharded/compare/statefulset_some-name-cfg-oc.yml index c034912f1..755bbce50 100644 --- a/e2e-tests/custom-users-roles-sharded/compare/statefulset_some-name-cfg-oc.yml +++ b/e2e-tests/custom-users-roles-sharded/compare/statefulset_some-name-cfg-oc.yml @@ -114,6 +114,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 3 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/custom-users-roles-sharded/compare/statefulset_some-name-cfg.yml b/e2e-tests/custom-users-roles-sharded/compare/statefulset_some-name-cfg.yml index 3e9f802e0..b4ac61e2e 100644 --- a/e2e-tests/custom-users-roles-sharded/compare/statefulset_some-name-cfg.yml +++ b/e2e-tests/custom-users-roles-sharded/compare/statefulset_some-name-cfg.yml @@ -114,6 +114,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 3 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/custom-users-roles-sharded/compare/statefulset_some-name-rs0-4-oc.yml b/e2e-tests/custom-users-roles-sharded/compare/statefulset_some-name-rs0-4-oc.yml index cb465544a..f95d110b2 100644 --- a/e2e-tests/custom-users-roles-sharded/compare/statefulset_some-name-rs0-4-oc.yml +++ b/e2e-tests/custom-users-roles-sharded/compare/statefulset_some-name-rs0-4-oc.yml @@ -104,6 +104,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/custom-users-roles-sharded/compare/statefulset_some-name-rs0-oc.yml b/e2e-tests/custom-users-roles-sharded/compare/statefulset_some-name-rs0-oc.yml index 3bc73e32a..b626fb6d6 100644 --- a/e2e-tests/custom-users-roles-sharded/compare/statefulset_some-name-rs0-oc.yml +++ b/e2e-tests/custom-users-roles-sharded/compare/statefulset_some-name-rs0-oc.yml @@ -104,6 +104,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/custom-users-roles-sharded/compare/statefulset_some-name-rs0.yml b/e2e-tests/custom-users-roles-sharded/compare/statefulset_some-name-rs0.yml index f172d963d..61a83fc6f 100644 --- a/e2e-tests/custom-users-roles-sharded/compare/statefulset_some-name-rs0.yml +++ b/e2e-tests/custom-users-roles-sharded/compare/statefulset_some-name-rs0.yml @@ -104,6 +104,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/data-at-rest-encryption/compare/statefulset_some-name-cfg-oc.yml b/e2e-tests/data-at-rest-encryption/compare/statefulset_some-name-cfg-oc.yml index efab3f8b9..323483978 100644 --- a/e2e-tests/data-at-rest-encryption/compare/statefulset_some-name-cfg-oc.yml +++ b/e2e-tests/data-at-rest-encryption/compare/statefulset_some-name-cfg-oc.yml @@ -101,6 +101,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 3 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/data-at-rest-encryption/compare/statefulset_some-name-cfg.yml b/e2e-tests/data-at-rest-encryption/compare/statefulset_some-name-cfg.yml index e9deb6704..df5facd2b 100644 --- a/e2e-tests/data-at-rest-encryption/compare/statefulset_some-name-cfg.yml +++ b/e2e-tests/data-at-rest-encryption/compare/statefulset_some-name-cfg.yml @@ -101,6 +101,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 3 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/data-at-rest-encryption/compare/statefulset_some-name-rs0-oc.yml b/e2e-tests/data-at-rest-encryption/compare/statefulset_some-name-rs0-oc.yml index f0c2bdfa4..de9c2b1e1 100644 --- a/e2e-tests/data-at-rest-encryption/compare/statefulset_some-name-rs0-oc.yml +++ b/e2e-tests/data-at-rest-encryption/compare/statefulset_some-name-rs0-oc.yml @@ -102,6 +102,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/data-at-rest-encryption/compare/statefulset_some-name-rs0.yml b/e2e-tests/data-at-rest-encryption/compare/statefulset_some-name-rs0.yml index 8c3b2aacd..94e7372b4 100644 --- a/e2e-tests/data-at-rest-encryption/compare/statefulset_some-name-rs0.yml +++ b/e2e-tests/data-at-rest-encryption/compare/statefulset_some-name-rs0.yml @@ -102,6 +102,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/default-cr/compare/statefulset_minimal-cluster-cfg-oc.yml b/e2e-tests/default-cr/compare/statefulset_minimal-cluster-cfg-oc.yml index b40889a24..5ef60423a 100644 --- a/e2e-tests/default-cr/compare/statefulset_minimal-cluster-cfg-oc.yml +++ b/e2e-tests/default-cr/compare/statefulset_minimal-cluster-cfg-oc.yml @@ -114,6 +114,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 3 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/default-cr/compare/statefulset_minimal-cluster-cfg.yml b/e2e-tests/default-cr/compare/statefulset_minimal-cluster-cfg.yml index 172248f54..e9e04eae7 100644 --- a/e2e-tests/default-cr/compare/statefulset_minimal-cluster-cfg.yml +++ b/e2e-tests/default-cr/compare/statefulset_minimal-cluster-cfg.yml @@ -114,6 +114,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 3 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/default-cr/compare/statefulset_minimal-cluster-rs0-oc.yml b/e2e-tests/default-cr/compare/statefulset_minimal-cluster-rs0-oc.yml index 6310f18a3..139273be1 100644 --- a/e2e-tests/default-cr/compare/statefulset_minimal-cluster-rs0-oc.yml +++ b/e2e-tests/default-cr/compare/statefulset_minimal-cluster-rs0-oc.yml @@ -114,6 +114,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/default-cr/compare/statefulset_minimal-cluster-rs0.yml b/e2e-tests/default-cr/compare/statefulset_minimal-cluster-rs0.yml index 810f344ec..3b523172f 100644 --- a/e2e-tests/default-cr/compare/statefulset_minimal-cluster-rs0.yml +++ b/e2e-tests/default-cr/compare/statefulset_minimal-cluster-rs0.yml @@ -114,6 +114,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/default-cr/compare/statefulset_my-cluster-name-cfg-oc.yml b/e2e-tests/default-cr/compare/statefulset_my-cluster-name-cfg-oc.yml index a28ae0aaf..70a24f94e 100644 --- a/e2e-tests/default-cr/compare/statefulset_my-cluster-name-cfg-oc.yml +++ b/e2e-tests/default-cr/compare/statefulset_my-cluster-name-cfg-oc.yml @@ -103,6 +103,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 3 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/default-cr/compare/statefulset_my-cluster-name-cfg.yml b/e2e-tests/default-cr/compare/statefulset_my-cluster-name-cfg.yml index ac2fbeb26..a045b850b 100644 --- a/e2e-tests/default-cr/compare/statefulset_my-cluster-name-cfg.yml +++ b/e2e-tests/default-cr/compare/statefulset_my-cluster-name-cfg.yml @@ -103,6 +103,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 3 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/default-cr/compare/statefulset_my-cluster-name-rs0-oc.yml b/e2e-tests/default-cr/compare/statefulset_my-cluster-name-rs0-oc.yml index 60442d6d9..11490fff3 100644 --- a/e2e-tests/default-cr/compare/statefulset_my-cluster-name-rs0-oc.yml +++ b/e2e-tests/default-cr/compare/statefulset_my-cluster-name-rs0-oc.yml @@ -103,6 +103,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/default-cr/compare/statefulset_my-cluster-name-rs0.yml b/e2e-tests/default-cr/compare/statefulset_my-cluster-name-rs0.yml index fd1e70673..35deb604b 100644 --- a/e2e-tests/default-cr/compare/statefulset_my-cluster-name-rs0.yml +++ b/e2e-tests/default-cr/compare/statefulset_my-cluster-name-rs0.yml @@ -103,6 +103,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/demand-backup-eks-credentials-irsa/compare/statefulset_some-name-rs0.yml b/e2e-tests/demand-backup-eks-credentials-irsa/compare/statefulset_some-name-rs0.yml index 0b78d9981..7c58282f2 100644 --- a/e2e-tests/demand-backup-eks-credentials-irsa/compare/statefulset_some-name-rs0.yml +++ b/e2e-tests/demand-backup-eks-credentials-irsa/compare/statefulset_some-name-rs0.yml @@ -103,6 +103,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/demand-backup-eks-credentials/compare/statefulset_some-name-rs0.yml b/e2e-tests/demand-backup-eks-credentials/compare/statefulset_some-name-rs0.yml index 0b78d9981..7c58282f2 100644 --- a/e2e-tests/demand-backup-eks-credentials/compare/statefulset_some-name-rs0.yml +++ b/e2e-tests/demand-backup-eks-credentials/compare/statefulset_some-name-rs0.yml @@ -103,6 +103,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/demand-backup-fs/compare/statefulset_some-name-rs0.yml b/e2e-tests/demand-backup-fs/compare/statefulset_some-name-rs0.yml index e4cf4aac7..b87ccb2db 100644 --- a/e2e-tests/demand-backup-fs/compare/statefulset_some-name-rs0.yml +++ b/e2e-tests/demand-backup-fs/compare/statefulset_some-name-rs0.yml @@ -114,6 +114,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/demand-backup-incremental-sharded/compare/statefulset_some-name-rs0_restore_sharded-oc.yml b/e2e-tests/demand-backup-incremental-sharded/compare/statefulset_some-name-rs0_restore_sharded-oc.yml index cdd5647ea..7887b826e 100644 --- a/e2e-tests/demand-backup-incremental-sharded/compare/statefulset_some-name-rs0_restore_sharded-oc.yml +++ b/e2e-tests/demand-backup-incremental-sharded/compare/statefulset_some-name-rs0_restore_sharded-oc.yml @@ -128,6 +128,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/demand-backup-incremental-sharded/compare/statefulset_some-name-rs0_restore_sharded.yml b/e2e-tests/demand-backup-incremental-sharded/compare/statefulset_some-name-rs0_restore_sharded.yml index 8ce5f5087..e535b02b7 100644 --- a/e2e-tests/demand-backup-incremental-sharded/compare/statefulset_some-name-rs0_restore_sharded.yml +++ b/e2e-tests/demand-backup-incremental-sharded/compare/statefulset_some-name-rs0_restore_sharded.yml @@ -128,6 +128,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/demand-backup-incremental/compare/statefulset_some-name-rs0_restore-arbiter-nv-oc.yml b/e2e-tests/demand-backup-incremental/compare/statefulset_some-name-rs0_restore-arbiter-nv-oc.yml index c98cec73e..b95fdf2a8 100644 --- a/e2e-tests/demand-backup-incremental/compare/statefulset_some-name-rs0_restore-arbiter-nv-oc.yml +++ b/e2e-tests/demand-backup-incremental/compare/statefulset_some-name-rs0_restore-arbiter-nv-oc.yml @@ -127,6 +127,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/demand-backup-incremental/compare/statefulset_some-name-rs0_restore-arbiter-nv.yml b/e2e-tests/demand-backup-incremental/compare/statefulset_some-name-rs0_restore-arbiter-nv.yml index 53b34ec38..9b5a866f8 100644 --- a/e2e-tests/demand-backup-incremental/compare/statefulset_some-name-rs0_restore-arbiter-nv.yml +++ b/e2e-tests/demand-backup-incremental/compare/statefulset_some-name-rs0_restore-arbiter-nv.yml @@ -127,6 +127,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/demand-backup-incremental/compare/statefulset_some-name-rs0_restore-oc.yml b/e2e-tests/demand-backup-incremental/compare/statefulset_some-name-rs0_restore-oc.yml index 274ba54ba..adf054a1e 100644 --- a/e2e-tests/demand-backup-incremental/compare/statefulset_some-name-rs0_restore-oc.yml +++ b/e2e-tests/demand-backup-incremental/compare/statefulset_some-name-rs0_restore-oc.yml @@ -127,6 +127,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/demand-backup-incremental/compare/statefulset_some-name-rs0_restore.yml b/e2e-tests/demand-backup-incremental/compare/statefulset_some-name-rs0_restore.yml index 08273fb3d..3de329b2f 100644 --- a/e2e-tests/demand-backup-incremental/compare/statefulset_some-name-rs0_restore.yml +++ b/e2e-tests/demand-backup-incremental/compare/statefulset_some-name-rs0_restore.yml @@ -127,6 +127,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/demand-backup-physical-sharded/compare/statefulset_some-name-rs0_restore_sharded-oc.yml b/e2e-tests/demand-backup-physical-sharded/compare/statefulset_some-name-rs0_restore_sharded-oc.yml index cdd5647ea..7887b826e 100644 --- a/e2e-tests/demand-backup-physical-sharded/compare/statefulset_some-name-rs0_restore_sharded-oc.yml +++ b/e2e-tests/demand-backup-physical-sharded/compare/statefulset_some-name-rs0_restore_sharded-oc.yml @@ -128,6 +128,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/demand-backup-physical-sharded/compare/statefulset_some-name-rs0_restore_sharded.yml b/e2e-tests/demand-backup-physical-sharded/compare/statefulset_some-name-rs0_restore_sharded.yml index 8ce5f5087..e535b02b7 100644 --- a/e2e-tests/demand-backup-physical-sharded/compare/statefulset_some-name-rs0_restore_sharded.yml +++ b/e2e-tests/demand-backup-physical-sharded/compare/statefulset_some-name-rs0_restore_sharded.yml @@ -128,6 +128,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/demand-backup-physical/compare/statefulset_some-name-rs0_restore-arbiter-nv-oc.yml b/e2e-tests/demand-backup-physical/compare/statefulset_some-name-rs0_restore-arbiter-nv-oc.yml index c98cec73e..b95fdf2a8 100644 --- a/e2e-tests/demand-backup-physical/compare/statefulset_some-name-rs0_restore-arbiter-nv-oc.yml +++ b/e2e-tests/demand-backup-physical/compare/statefulset_some-name-rs0_restore-arbiter-nv-oc.yml @@ -127,6 +127,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/demand-backup-physical/compare/statefulset_some-name-rs0_restore-arbiter-nv.yml b/e2e-tests/demand-backup-physical/compare/statefulset_some-name-rs0_restore-arbiter-nv.yml index 53b34ec38..9b5a866f8 100644 --- a/e2e-tests/demand-backup-physical/compare/statefulset_some-name-rs0_restore-arbiter-nv.yml +++ b/e2e-tests/demand-backup-physical/compare/statefulset_some-name-rs0_restore-arbiter-nv.yml @@ -127,6 +127,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/demand-backup-physical/compare/statefulset_some-name-rs0_restore-oc.yml b/e2e-tests/demand-backup-physical/compare/statefulset_some-name-rs0_restore-oc.yml index 274ba54ba..adf054a1e 100644 --- a/e2e-tests/demand-backup-physical/compare/statefulset_some-name-rs0_restore-oc.yml +++ b/e2e-tests/demand-backup-physical/compare/statefulset_some-name-rs0_restore-oc.yml @@ -127,6 +127,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/demand-backup-physical/compare/statefulset_some-name-rs0_restore.yml b/e2e-tests/demand-backup-physical/compare/statefulset_some-name-rs0_restore.yml index 08273fb3d..3de329b2f 100644 --- a/e2e-tests/demand-backup-physical/compare/statefulset_some-name-rs0_restore.yml +++ b/e2e-tests/demand-backup-physical/compare/statefulset_some-name-rs0_restore.yml @@ -127,6 +127,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/demand-backup-physical/run b/e2e-tests/demand-backup-physical/run index bb668a413..ee7927b30 100755 --- a/e2e-tests/demand-backup-physical/run +++ b/e2e-tests/demand-backup-physical/run @@ -149,4 +149,4 @@ backup_dest_minio=$(get_backup_dest "${backup_name_minio}") run_restore ${backup_name_minio} run_recovery_check ${backup_name_minio} "_restore-arbiter-nv" -destroy "$namespace" +#destroy "$namespace" diff --git a/e2e-tests/demand-backup-sharded/compare/statefulset_some-name-cfg-4-oc.yml b/e2e-tests/demand-backup-sharded/compare/statefulset_some-name-cfg-4-oc.yml index fec3adca5..bd361bc46 100644 --- a/e2e-tests/demand-backup-sharded/compare/statefulset_some-name-cfg-4-oc.yml +++ b/e2e-tests/demand-backup-sharded/compare/statefulset_some-name-cfg-4-oc.yml @@ -115,6 +115,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 3 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/demand-backup-sharded/compare/statefulset_some-name-cfg-oc.yml b/e2e-tests/demand-backup-sharded/compare/statefulset_some-name-cfg-oc.yml index 1cad9937d..3e5747b2c 100644 --- a/e2e-tests/demand-backup-sharded/compare/statefulset_some-name-cfg-oc.yml +++ b/e2e-tests/demand-backup-sharded/compare/statefulset_some-name-cfg-oc.yml @@ -115,6 +115,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 3 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/demand-backup-sharded/compare/statefulset_some-name-cfg.yml b/e2e-tests/demand-backup-sharded/compare/statefulset_some-name-cfg.yml index 94a0252ff..99c1652ea 100644 --- a/e2e-tests/demand-backup-sharded/compare/statefulset_some-name-cfg.yml +++ b/e2e-tests/demand-backup-sharded/compare/statefulset_some-name-cfg.yml @@ -115,6 +115,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 3 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/demand-backup-sharded/compare/statefulset_some-name-rs0-4-oc.yml b/e2e-tests/demand-backup-sharded/compare/statefulset_some-name-rs0-4-oc.yml index 4690e83bc..ede84d8f8 100644 --- a/e2e-tests/demand-backup-sharded/compare/statefulset_some-name-rs0-4-oc.yml +++ b/e2e-tests/demand-backup-sharded/compare/statefulset_some-name-rs0-4-oc.yml @@ -104,6 +104,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/demand-backup-sharded/compare/statefulset_some-name-rs0-oc.yml b/e2e-tests/demand-backup-sharded/compare/statefulset_some-name-rs0-oc.yml index a449f2386..1c86712e6 100644 --- a/e2e-tests/demand-backup-sharded/compare/statefulset_some-name-rs0-oc.yml +++ b/e2e-tests/demand-backup-sharded/compare/statefulset_some-name-rs0-oc.yml @@ -104,6 +104,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/demand-backup-sharded/compare/statefulset_some-name-rs0.yml b/e2e-tests/demand-backup-sharded/compare/statefulset_some-name-rs0.yml index 46c33f2be..dc120d12f 100644 --- a/e2e-tests/demand-backup-sharded/compare/statefulset_some-name-rs0.yml +++ b/e2e-tests/demand-backup-sharded/compare/statefulset_some-name-rs0.yml @@ -104,6 +104,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/demand-backup-sharded/compare/statefulset_some-name-rs1-oc.yml b/e2e-tests/demand-backup-sharded/compare/statefulset_some-name-rs1-oc.yml index b1395c14a..0d89707ab 100644 --- a/e2e-tests/demand-backup-sharded/compare/statefulset_some-name-rs1-oc.yml +++ b/e2e-tests/demand-backup-sharded/compare/statefulset_some-name-rs1-oc.yml @@ -104,6 +104,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/demand-backup-sharded/compare/statefulset_some-name-rs1.yml b/e2e-tests/demand-backup-sharded/compare/statefulset_some-name-rs1.yml index 02f7b564d..1f39937e7 100644 --- a/e2e-tests/demand-backup-sharded/compare/statefulset_some-name-rs1.yml +++ b/e2e-tests/demand-backup-sharded/compare/statefulset_some-name-rs1.yml @@ -104,6 +104,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/demand-backup-sharded/compare/statefulset_some-name-rs2-oc.yml b/e2e-tests/demand-backup-sharded/compare/statefulset_some-name-rs2-oc.yml index e04f5fdec..4a7746226 100644 --- a/e2e-tests/demand-backup-sharded/compare/statefulset_some-name-rs2-oc.yml +++ b/e2e-tests/demand-backup-sharded/compare/statefulset_some-name-rs2-oc.yml @@ -104,6 +104,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/demand-backup-sharded/compare/statefulset_some-name-rs2.yml b/e2e-tests/demand-backup-sharded/compare/statefulset_some-name-rs2.yml index 400fe7c77..f70328bc6 100644 --- a/e2e-tests/demand-backup-sharded/compare/statefulset_some-name-rs2.yml +++ b/e2e-tests/demand-backup-sharded/compare/statefulset_some-name-rs2.yml @@ -104,6 +104,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/demand-backup/compare/statefulset_some-name-rs0-oc.yml b/e2e-tests/demand-backup/compare/statefulset_some-name-rs0-oc.yml index 970a865a7..40dd98d3c 100644 --- a/e2e-tests/demand-backup/compare/statefulset_some-name-rs0-oc.yml +++ b/e2e-tests/demand-backup/compare/statefulset_some-name-rs0-oc.yml @@ -103,6 +103,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/demand-backup/compare/statefulset_some-name-rs0.yml b/e2e-tests/demand-backup/compare/statefulset_some-name-rs0.yml index 13169146c..2fea39fa7 100644 --- a/e2e-tests/demand-backup/compare/statefulset_some-name-rs0.yml +++ b/e2e-tests/demand-backup/compare/statefulset_some-name-rs0.yml @@ -103,6 +103,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/expose-sharded/compare/statefulset_some-name-cfg-4-oc.yml b/e2e-tests/expose-sharded/compare/statefulset_some-name-cfg-4-oc.yml index 743c4a67d..fceddc8a2 100644 --- a/e2e-tests/expose-sharded/compare/statefulset_some-name-cfg-4-oc.yml +++ b/e2e-tests/expose-sharded/compare/statefulset_some-name-cfg-4-oc.yml @@ -114,6 +114,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 3 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/expose-sharded/compare/statefulset_some-name-cfg-oc.yml b/e2e-tests/expose-sharded/compare/statefulset_some-name-cfg-oc.yml index 4462017dc..1bca9dc66 100644 --- a/e2e-tests/expose-sharded/compare/statefulset_some-name-cfg-oc.yml +++ b/e2e-tests/expose-sharded/compare/statefulset_some-name-cfg-oc.yml @@ -114,6 +114,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 3 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/expose-sharded/compare/statefulset_some-name-cfg.yml b/e2e-tests/expose-sharded/compare/statefulset_some-name-cfg.yml index d0d7ba75f..9b68a63c6 100644 --- a/e2e-tests/expose-sharded/compare/statefulset_some-name-cfg.yml +++ b/e2e-tests/expose-sharded/compare/statefulset_some-name-cfg.yml @@ -114,6 +114,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 3 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/expose-sharded/compare/statefulset_some-name-rs0-4-oc.yml b/e2e-tests/expose-sharded/compare/statefulset_some-name-rs0-4-oc.yml index 0cf6e9bbb..1394a7c9a 100644 --- a/e2e-tests/expose-sharded/compare/statefulset_some-name-rs0-4-oc.yml +++ b/e2e-tests/expose-sharded/compare/statefulset_some-name-rs0-4-oc.yml @@ -104,6 +104,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/expose-sharded/compare/statefulset_some-name-rs0-oc.yml b/e2e-tests/expose-sharded/compare/statefulset_some-name-rs0-oc.yml index 0cf6e9bbb..1394a7c9a 100644 --- a/e2e-tests/expose-sharded/compare/statefulset_some-name-rs0-oc.yml +++ b/e2e-tests/expose-sharded/compare/statefulset_some-name-rs0-oc.yml @@ -104,6 +104,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/expose-sharded/compare/statefulset_some-name-rs0-sharding-disabled-oc.yml b/e2e-tests/expose-sharded/compare/statefulset_some-name-rs0-sharding-disabled-oc.yml index e2b82202a..04b0020de 100644 --- a/e2e-tests/expose-sharded/compare/statefulset_some-name-rs0-sharding-disabled-oc.yml +++ b/e2e-tests/expose-sharded/compare/statefulset_some-name-rs0-sharding-disabled-oc.yml @@ -103,6 +103,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/expose-sharded/compare/statefulset_some-name-rs0-sharding-disabled.yml b/e2e-tests/expose-sharded/compare/statefulset_some-name-rs0-sharding-disabled.yml index 598a9f8d8..db2c6b087 100644 --- a/e2e-tests/expose-sharded/compare/statefulset_some-name-rs0-sharding-disabled.yml +++ b/e2e-tests/expose-sharded/compare/statefulset_some-name-rs0-sharding-disabled.yml @@ -103,6 +103,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/expose-sharded/compare/statefulset_some-name-rs0-sharding-enabled-oc.yml b/e2e-tests/expose-sharded/compare/statefulset_some-name-rs0-sharding-enabled-oc.yml index 37d0400bf..42a4d94d2 100644 --- a/e2e-tests/expose-sharded/compare/statefulset_some-name-rs0-sharding-enabled-oc.yml +++ b/e2e-tests/expose-sharded/compare/statefulset_some-name-rs0-sharding-enabled-oc.yml @@ -104,6 +104,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/expose-sharded/compare/statefulset_some-name-rs0-sharding-enabled.yml b/e2e-tests/expose-sharded/compare/statefulset_some-name-rs0-sharding-enabled.yml index 392649e89..83df14cb9 100644 --- a/e2e-tests/expose-sharded/compare/statefulset_some-name-rs0-sharding-enabled.yml +++ b/e2e-tests/expose-sharded/compare/statefulset_some-name-rs0-sharding-enabled.yml @@ -104,6 +104,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/expose-sharded/compare/statefulset_some-name-rs0.yml b/e2e-tests/expose-sharded/compare/statefulset_some-name-rs0.yml index f4c0bb4a2..55b0fa7a9 100644 --- a/e2e-tests/expose-sharded/compare/statefulset_some-name-rs0.yml +++ b/e2e-tests/expose-sharded/compare/statefulset_some-name-rs0.yml @@ -104,6 +104,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/init-deploy/compare/statefulset_another-name-rs0-4-oc.yml b/e2e-tests/init-deploy/compare/statefulset_another-name-rs0-4-oc.yml index 4994e4419..24c80bcb5 100644 --- a/e2e-tests/init-deploy/compare/statefulset_another-name-rs0-4-oc.yml +++ b/e2e-tests/init-deploy/compare/statefulset_another-name-rs0-4-oc.yml @@ -98,6 +98,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/init-deploy/compare/statefulset_another-name-rs0-oc.yml b/e2e-tests/init-deploy/compare/statefulset_another-name-rs0-oc.yml index 9fac7a2cf..4daee2686 100644 --- a/e2e-tests/init-deploy/compare/statefulset_another-name-rs0-oc.yml +++ b/e2e-tests/init-deploy/compare/statefulset_another-name-rs0-oc.yml @@ -98,6 +98,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/init-deploy/compare/statefulset_another-name-rs0.yml b/e2e-tests/init-deploy/compare/statefulset_another-name-rs0.yml index d8a2daa05..e9d51a66a 100644 --- a/e2e-tests/init-deploy/compare/statefulset_another-name-rs0.yml +++ b/e2e-tests/init-deploy/compare/statefulset_another-name-rs0.yml @@ -98,6 +98,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/init-deploy/compare/statefulset_some-name-rs0-oc.yml b/e2e-tests/init-deploy/compare/statefulset_some-name-rs0-oc.yml index 3de431d23..b40656bb1 100644 --- a/e2e-tests/init-deploy/compare/statefulset_some-name-rs0-oc.yml +++ b/e2e-tests/init-deploy/compare/statefulset_some-name-rs0-oc.yml @@ -103,6 +103,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/init-deploy/compare/statefulset_some-name-rs0.yml b/e2e-tests/init-deploy/compare/statefulset_some-name-rs0.yml index 1bbc35c2e..69be31df4 100644 --- a/e2e-tests/init-deploy/compare/statefulset_some-name-rs0.yml +++ b/e2e-tests/init-deploy/compare/statefulset_some-name-rs0.yml @@ -103,6 +103,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/limits/compare/statefulset_no-limits-rs0-increased-oc.yml b/e2e-tests/limits/compare/statefulset_no-limits-rs0-increased-oc.yml index a785d930c..47e2533e5 100644 --- a/e2e-tests/limits/compare/statefulset_no-limits-rs0-increased-oc.yml +++ b/e2e-tests/limits/compare/statefulset_no-limits-rs0-increased-oc.yml @@ -114,6 +114,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/limits/compare/statefulset_no-limits-rs0-increased.yml b/e2e-tests/limits/compare/statefulset_no-limits-rs0-increased.yml index 3449784e7..e8464052a 100644 --- a/e2e-tests/limits/compare/statefulset_no-limits-rs0-increased.yml +++ b/e2e-tests/limits/compare/statefulset_no-limits-rs0-increased.yml @@ -114,6 +114,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/limits/compare/statefulset_no-limits-rs0-oc.yml b/e2e-tests/limits/compare/statefulset_no-limits-rs0-oc.yml index 308486f10..3022dbcf0 100644 --- a/e2e-tests/limits/compare/statefulset_no-limits-rs0-oc.yml +++ b/e2e-tests/limits/compare/statefulset_no-limits-rs0-oc.yml @@ -114,6 +114,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/limits/compare/statefulset_no-limits-rs0.yml b/e2e-tests/limits/compare/statefulset_no-limits-rs0.yml index d19ae92d0..1c421c8d8 100644 --- a/e2e-tests/limits/compare/statefulset_no-limits-rs0.yml +++ b/e2e-tests/limits/compare/statefulset_no-limits-rs0.yml @@ -114,6 +114,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/limits/compare/statefulset_no-requests-no-limits-rs0-increased-oc.yml b/e2e-tests/limits/compare/statefulset_no-requests-no-limits-rs0-increased-oc.yml index bea7e9427..3a383c2fc 100644 --- a/e2e-tests/limits/compare/statefulset_no-requests-no-limits-rs0-increased-oc.yml +++ b/e2e-tests/limits/compare/statefulset_no-requests-no-limits-rs0-increased-oc.yml @@ -114,6 +114,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/limits/compare/statefulset_no-requests-no-limits-rs0-increased.yml b/e2e-tests/limits/compare/statefulset_no-requests-no-limits-rs0-increased.yml index 404c3996a..ab5633568 100644 --- a/e2e-tests/limits/compare/statefulset_no-requests-no-limits-rs0-increased.yml +++ b/e2e-tests/limits/compare/statefulset_no-requests-no-limits-rs0-increased.yml @@ -114,6 +114,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/limits/compare/statefulset_no-requests-no-limits-rs0-oc.yml b/e2e-tests/limits/compare/statefulset_no-requests-no-limits-rs0-oc.yml index bea7e9427..3a383c2fc 100644 --- a/e2e-tests/limits/compare/statefulset_no-requests-no-limits-rs0-oc.yml +++ b/e2e-tests/limits/compare/statefulset_no-requests-no-limits-rs0-oc.yml @@ -114,6 +114,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/limits/compare/statefulset_no-requests-no-limits-rs0.yml b/e2e-tests/limits/compare/statefulset_no-requests-no-limits-rs0.yml index 404c3996a..ab5633568 100644 --- a/e2e-tests/limits/compare/statefulset_no-requests-no-limits-rs0.yml +++ b/e2e-tests/limits/compare/statefulset_no-requests-no-limits-rs0.yml @@ -114,6 +114,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/limits/compare/statefulset_no-requests-rs0-increased-oc.yml b/e2e-tests/limits/compare/statefulset_no-requests-rs0-increased-oc.yml index aa1fa8a37..74506ff68 100644 --- a/e2e-tests/limits/compare/statefulset_no-requests-rs0-increased-oc.yml +++ b/e2e-tests/limits/compare/statefulset_no-requests-rs0-increased-oc.yml @@ -115,6 +115,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/limits/compare/statefulset_no-requests-rs0-increased.yml b/e2e-tests/limits/compare/statefulset_no-requests-rs0-increased.yml index 95335fbc9..e65914e0f 100644 --- a/e2e-tests/limits/compare/statefulset_no-requests-rs0-increased.yml +++ b/e2e-tests/limits/compare/statefulset_no-requests-rs0-increased.yml @@ -115,6 +115,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/limits/compare/statefulset_no-requests-rs0-oc.yml b/e2e-tests/limits/compare/statefulset_no-requests-rs0-oc.yml index 78336b758..30c2611be 100644 --- a/e2e-tests/limits/compare/statefulset_no-requests-rs0-oc.yml +++ b/e2e-tests/limits/compare/statefulset_no-requests-rs0-oc.yml @@ -115,6 +115,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/limits/compare/statefulset_no-requests-rs0.yml b/e2e-tests/limits/compare/statefulset_no-requests-rs0.yml index ed19d5e0b..977df3bde 100644 --- a/e2e-tests/limits/compare/statefulset_no-requests-rs0.yml +++ b/e2e-tests/limits/compare/statefulset_no-requests-rs0.yml @@ -115,6 +115,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/monitoring-2-0/compare/statefulset_monitoring-cfg-oc.yml b/e2e-tests/monitoring-2-0/compare/statefulset_monitoring-cfg-oc.yml index b1e9de599..a007b3c2b 100644 --- a/e2e-tests/monitoring-2-0/compare/statefulset_monitoring-cfg-oc.yml +++ b/e2e-tests/monitoring-2-0/compare/statefulset_monitoring-cfg-oc.yml @@ -115,6 +115,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 3 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/monitoring-2-0/compare/statefulset_monitoring-cfg.yml b/e2e-tests/monitoring-2-0/compare/statefulset_monitoring-cfg.yml index ca3bebfe2..e81e1424d 100644 --- a/e2e-tests/monitoring-2-0/compare/statefulset_monitoring-cfg.yml +++ b/e2e-tests/monitoring-2-0/compare/statefulset_monitoring-cfg.yml @@ -115,6 +115,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 3 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/monitoring-2-0/compare/statefulset_monitoring-rs0-no-pmm-oc.yml b/e2e-tests/monitoring-2-0/compare/statefulset_monitoring-rs0-no-pmm-oc.yml index f5077e78b..162bb0e6f 100644 --- a/e2e-tests/monitoring-2-0/compare/statefulset_monitoring-rs0-no-pmm-oc.yml +++ b/e2e-tests/monitoring-2-0/compare/statefulset_monitoring-rs0-no-pmm-oc.yml @@ -103,6 +103,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/monitoring-2-0/compare/statefulset_monitoring-rs0-no-pmm.yml b/e2e-tests/monitoring-2-0/compare/statefulset_monitoring-rs0-no-pmm.yml index 9edd80401..434bf1f68 100644 --- a/e2e-tests/monitoring-2-0/compare/statefulset_monitoring-rs0-no-pmm.yml +++ b/e2e-tests/monitoring-2-0/compare/statefulset_monitoring-rs0-no-pmm.yml @@ -103,6 +103,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/monitoring-2-0/compare/statefulset_monitoring-rs0-oc.yml b/e2e-tests/monitoring-2-0/compare/statefulset_monitoring-rs0-oc.yml index 92ffbc8c9..347542e6b 100644 --- a/e2e-tests/monitoring-2-0/compare/statefulset_monitoring-rs0-oc.yml +++ b/e2e-tests/monitoring-2-0/compare/statefulset_monitoring-rs0-oc.yml @@ -103,6 +103,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/monitoring-2-0/compare/statefulset_monitoring-rs0.yml b/e2e-tests/monitoring-2-0/compare/statefulset_monitoring-rs0.yml index 745a002d8..465f61445 100644 --- a/e2e-tests/monitoring-2-0/compare/statefulset_monitoring-rs0.yml +++ b/e2e-tests/monitoring-2-0/compare/statefulset_monitoring-rs0.yml @@ -103,6 +103,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/non-voting/compare/statefulset_nonvoting-rs0-nv-oc.yml b/e2e-tests/non-voting/compare/statefulset_nonvoting-rs0-nv-oc.yml index 625ddb0cd..07dadf3c3 100644 --- a/e2e-tests/non-voting/compare/statefulset_nonvoting-rs0-nv-oc.yml +++ b/e2e-tests/non-voting/compare/statefulset_nonvoting-rs0-nv-oc.yml @@ -114,6 +114,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/non-voting/compare/statefulset_nonvoting-rs0-nv.yml b/e2e-tests/non-voting/compare/statefulset_nonvoting-rs0-nv.yml index 40dd379f2..94eb3bdf3 100644 --- a/e2e-tests/non-voting/compare/statefulset_nonvoting-rs0-nv.yml +++ b/e2e-tests/non-voting/compare/statefulset_nonvoting-rs0-nv.yml @@ -114,6 +114,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/one-pod/compare/statefulset_one-pod-rs0-oc.yml b/e2e-tests/one-pod/compare/statefulset_one-pod-rs0-oc.yml index 09f232d33..0109f2cbb 100644 --- a/e2e-tests/one-pod/compare/statefulset_one-pod-rs0-oc.yml +++ b/e2e-tests/one-pod/compare/statefulset_one-pod-rs0-oc.yml @@ -112,6 +112,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/one-pod/compare/statefulset_one-pod-rs0-secret-oc.yml b/e2e-tests/one-pod/compare/statefulset_one-pod-rs0-secret-oc.yml index e35239617..23b38d283 100644 --- a/e2e-tests/one-pod/compare/statefulset_one-pod-rs0-secret-oc.yml +++ b/e2e-tests/one-pod/compare/statefulset_one-pod-rs0-secret-oc.yml @@ -112,6 +112,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/one-pod/compare/statefulset_one-pod-rs0-secret.yml b/e2e-tests/one-pod/compare/statefulset_one-pod-rs0-secret.yml index 38ad207b0..0ebcdd5ea 100644 --- a/e2e-tests/one-pod/compare/statefulset_one-pod-rs0-secret.yml +++ b/e2e-tests/one-pod/compare/statefulset_one-pod-rs0-secret.yml @@ -112,6 +112,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/one-pod/compare/statefulset_one-pod-rs0.yml b/e2e-tests/one-pod/compare/statefulset_one-pod-rs0.yml index 4ff3f4d4c..c732760b0 100644 --- a/e2e-tests/one-pod/compare/statefulset_one-pod-rs0.yml +++ b/e2e-tests/one-pod/compare/statefulset_one-pod-rs0.yml @@ -112,6 +112,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/pitr-physical-backup-source/compare/statefulset_some-name-cfg-4-oc.yml b/e2e-tests/pitr-physical-backup-source/compare/statefulset_some-name-cfg-4-oc.yml index 5425a7a9b..51fe36b66 100644 --- a/e2e-tests/pitr-physical-backup-source/compare/statefulset_some-name-cfg-4-oc.yml +++ b/e2e-tests/pitr-physical-backup-source/compare/statefulset_some-name-cfg-4-oc.yml @@ -113,6 +113,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 3 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/pitr-physical-backup-source/compare/statefulset_some-name-cfg-oc.yml b/e2e-tests/pitr-physical-backup-source/compare/statefulset_some-name-cfg-oc.yml index 5425a7a9b..51fe36b66 100644 --- a/e2e-tests/pitr-physical-backup-source/compare/statefulset_some-name-cfg-oc.yml +++ b/e2e-tests/pitr-physical-backup-source/compare/statefulset_some-name-cfg-oc.yml @@ -113,6 +113,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 3 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/pitr-physical-backup-source/compare/statefulset_some-name-cfg.yml b/e2e-tests/pitr-physical-backup-source/compare/statefulset_some-name-cfg.yml index 72ec24d79..cc5bc8bcb 100644 --- a/e2e-tests/pitr-physical-backup-source/compare/statefulset_some-name-cfg.yml +++ b/e2e-tests/pitr-physical-backup-source/compare/statefulset_some-name-cfg.yml @@ -113,6 +113,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 3 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/pitr-physical-backup-source/compare/statefulset_some-name-rs0-4-oc.yml b/e2e-tests/pitr-physical-backup-source/compare/statefulset_some-name-rs0-4-oc.yml index 8edaebbb0..66d472b7b 100644 --- a/e2e-tests/pitr-physical-backup-source/compare/statefulset_some-name-rs0-4-oc.yml +++ b/e2e-tests/pitr-physical-backup-source/compare/statefulset_some-name-rs0-4-oc.yml @@ -104,6 +104,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/pitr-physical-backup-source/compare/statefulset_some-name-rs0-oc.yml b/e2e-tests/pitr-physical-backup-source/compare/statefulset_some-name-rs0-oc.yml index 8edaebbb0..66d472b7b 100644 --- a/e2e-tests/pitr-physical-backup-source/compare/statefulset_some-name-rs0-oc.yml +++ b/e2e-tests/pitr-physical-backup-source/compare/statefulset_some-name-rs0-oc.yml @@ -104,6 +104,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/pitr-physical-backup-source/compare/statefulset_some-name-rs0.yml b/e2e-tests/pitr-physical-backup-source/compare/statefulset_some-name-rs0.yml index 96fe3a97a..bc3d9b2c4 100644 --- a/e2e-tests/pitr-physical-backup-source/compare/statefulset_some-name-rs0.yml +++ b/e2e-tests/pitr-physical-backup-source/compare/statefulset_some-name-rs0.yml @@ -104,6 +104,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/pitr-physical-backup-source/compare/statefulset_some-name-rs1-4-oc.yml b/e2e-tests/pitr-physical-backup-source/compare/statefulset_some-name-rs1-4-oc.yml index d2be4d56f..477fcfa83 100644 --- a/e2e-tests/pitr-physical-backup-source/compare/statefulset_some-name-rs1-4-oc.yml +++ b/e2e-tests/pitr-physical-backup-source/compare/statefulset_some-name-rs1-4-oc.yml @@ -104,6 +104,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/pitr-physical-backup-source/compare/statefulset_some-name-rs1-oc.yml b/e2e-tests/pitr-physical-backup-source/compare/statefulset_some-name-rs1-oc.yml index c22d483a3..d1945b62d 100644 --- a/e2e-tests/pitr-physical-backup-source/compare/statefulset_some-name-rs1-oc.yml +++ b/e2e-tests/pitr-physical-backup-source/compare/statefulset_some-name-rs1-oc.yml @@ -104,6 +104,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/pitr-physical-backup-source/compare/statefulset_some-name-rs1.yml b/e2e-tests/pitr-physical-backup-source/compare/statefulset_some-name-rs1.yml index 8a6a2819f..51ddfb90f 100644 --- a/e2e-tests/pitr-physical-backup-source/compare/statefulset_some-name-rs1.yml +++ b/e2e-tests/pitr-physical-backup-source/compare/statefulset_some-name-rs1.yml @@ -104,6 +104,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/pitr-physical-backup-source/compare/statefulset_some-name-rs2-4-oc.yml b/e2e-tests/pitr-physical-backup-source/compare/statefulset_some-name-rs2-4-oc.yml index e976d5250..e193dd720 100644 --- a/e2e-tests/pitr-physical-backup-source/compare/statefulset_some-name-rs2-4-oc.yml +++ b/e2e-tests/pitr-physical-backup-source/compare/statefulset_some-name-rs2-4-oc.yml @@ -104,6 +104,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/pitr-physical-backup-source/compare/statefulset_some-name-rs2-oc.yml b/e2e-tests/pitr-physical-backup-source/compare/statefulset_some-name-rs2-oc.yml index 56073c608..dec3b3774 100644 --- a/e2e-tests/pitr-physical-backup-source/compare/statefulset_some-name-rs2-oc.yml +++ b/e2e-tests/pitr-physical-backup-source/compare/statefulset_some-name-rs2-oc.yml @@ -104,6 +104,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/pitr-physical-backup-source/compare/statefulset_some-name-rs2.yml b/e2e-tests/pitr-physical-backup-source/compare/statefulset_some-name-rs2.yml index 575de5b7a..d14f226fe 100644 --- a/e2e-tests/pitr-physical-backup-source/compare/statefulset_some-name-rs2.yml +++ b/e2e-tests/pitr-physical-backup-source/compare/statefulset_some-name-rs2.yml @@ -104,6 +104,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/pitr-physical/compare/statefulset_some-name-cfg-4-oc.yml b/e2e-tests/pitr-physical/compare/statefulset_some-name-cfg-4-oc.yml index 5425a7a9b..51fe36b66 100644 --- a/e2e-tests/pitr-physical/compare/statefulset_some-name-cfg-4-oc.yml +++ b/e2e-tests/pitr-physical/compare/statefulset_some-name-cfg-4-oc.yml @@ -113,6 +113,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 3 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/pitr-physical/compare/statefulset_some-name-cfg-oc.yml b/e2e-tests/pitr-physical/compare/statefulset_some-name-cfg-oc.yml index 5425a7a9b..51fe36b66 100644 --- a/e2e-tests/pitr-physical/compare/statefulset_some-name-cfg-oc.yml +++ b/e2e-tests/pitr-physical/compare/statefulset_some-name-cfg-oc.yml @@ -113,6 +113,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 3 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/pitr-physical/compare/statefulset_some-name-cfg.yml b/e2e-tests/pitr-physical/compare/statefulset_some-name-cfg.yml index 72ec24d79..cc5bc8bcb 100644 --- a/e2e-tests/pitr-physical/compare/statefulset_some-name-cfg.yml +++ b/e2e-tests/pitr-physical/compare/statefulset_some-name-cfg.yml @@ -113,6 +113,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 3 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/pitr-physical/compare/statefulset_some-name-rs0-4-oc.yml b/e2e-tests/pitr-physical/compare/statefulset_some-name-rs0-4-oc.yml index 8edaebbb0..66d472b7b 100644 --- a/e2e-tests/pitr-physical/compare/statefulset_some-name-rs0-4-oc.yml +++ b/e2e-tests/pitr-physical/compare/statefulset_some-name-rs0-4-oc.yml @@ -104,6 +104,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/pitr-physical/compare/statefulset_some-name-rs0-oc.yml b/e2e-tests/pitr-physical/compare/statefulset_some-name-rs0-oc.yml index 8edaebbb0..66d472b7b 100644 --- a/e2e-tests/pitr-physical/compare/statefulset_some-name-rs0-oc.yml +++ b/e2e-tests/pitr-physical/compare/statefulset_some-name-rs0-oc.yml @@ -104,6 +104,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/pitr-physical/compare/statefulset_some-name-rs0.yml b/e2e-tests/pitr-physical/compare/statefulset_some-name-rs0.yml index 96fe3a97a..bc3d9b2c4 100644 --- a/e2e-tests/pitr-physical/compare/statefulset_some-name-rs0.yml +++ b/e2e-tests/pitr-physical/compare/statefulset_some-name-rs0.yml @@ -104,6 +104,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/pitr-physical/compare/statefulset_some-name-rs1-4-oc.yml b/e2e-tests/pitr-physical/compare/statefulset_some-name-rs1-4-oc.yml index d2be4d56f..477fcfa83 100644 --- a/e2e-tests/pitr-physical/compare/statefulset_some-name-rs1-4-oc.yml +++ b/e2e-tests/pitr-physical/compare/statefulset_some-name-rs1-4-oc.yml @@ -104,6 +104,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/pitr-physical/compare/statefulset_some-name-rs1-oc.yml b/e2e-tests/pitr-physical/compare/statefulset_some-name-rs1-oc.yml index c22d483a3..d1945b62d 100644 --- a/e2e-tests/pitr-physical/compare/statefulset_some-name-rs1-oc.yml +++ b/e2e-tests/pitr-physical/compare/statefulset_some-name-rs1-oc.yml @@ -104,6 +104,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/pitr-physical/compare/statefulset_some-name-rs1.yml b/e2e-tests/pitr-physical/compare/statefulset_some-name-rs1.yml index 8a6a2819f..51ddfb90f 100644 --- a/e2e-tests/pitr-physical/compare/statefulset_some-name-rs1.yml +++ b/e2e-tests/pitr-physical/compare/statefulset_some-name-rs1.yml @@ -104,6 +104,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/pitr-physical/compare/statefulset_some-name-rs2-4-oc.yml b/e2e-tests/pitr-physical/compare/statefulset_some-name-rs2-4-oc.yml index e976d5250..e193dd720 100644 --- a/e2e-tests/pitr-physical/compare/statefulset_some-name-rs2-4-oc.yml +++ b/e2e-tests/pitr-physical/compare/statefulset_some-name-rs2-4-oc.yml @@ -104,6 +104,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/pitr-physical/compare/statefulset_some-name-rs2-oc.yml b/e2e-tests/pitr-physical/compare/statefulset_some-name-rs2-oc.yml index 56073c608..dec3b3774 100644 --- a/e2e-tests/pitr-physical/compare/statefulset_some-name-rs2-oc.yml +++ b/e2e-tests/pitr-physical/compare/statefulset_some-name-rs2-oc.yml @@ -104,6 +104,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/pitr-physical/compare/statefulset_some-name-rs2.yml b/e2e-tests/pitr-physical/compare/statefulset_some-name-rs2.yml index 575de5b7a..d14f226fe 100644 --- a/e2e-tests/pitr-physical/compare/statefulset_some-name-rs2.yml +++ b/e2e-tests/pitr-physical/compare/statefulset_some-name-rs2.yml @@ -104,6 +104,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/pitr-sharded/compare/statefulset_some-name-cfg-4-oc.yml b/e2e-tests/pitr-sharded/compare/statefulset_some-name-cfg-4-oc.yml index 743c4a67d..fceddc8a2 100644 --- a/e2e-tests/pitr-sharded/compare/statefulset_some-name-cfg-4-oc.yml +++ b/e2e-tests/pitr-sharded/compare/statefulset_some-name-cfg-4-oc.yml @@ -114,6 +114,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 3 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/pitr-sharded/compare/statefulset_some-name-cfg-oc.yml b/e2e-tests/pitr-sharded/compare/statefulset_some-name-cfg-oc.yml index 4462017dc..1bca9dc66 100644 --- a/e2e-tests/pitr-sharded/compare/statefulset_some-name-cfg-oc.yml +++ b/e2e-tests/pitr-sharded/compare/statefulset_some-name-cfg-oc.yml @@ -114,6 +114,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 3 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/pitr-sharded/compare/statefulset_some-name-cfg.yml b/e2e-tests/pitr-sharded/compare/statefulset_some-name-cfg.yml index d0d7ba75f..9b68a63c6 100644 --- a/e2e-tests/pitr-sharded/compare/statefulset_some-name-cfg.yml +++ b/e2e-tests/pitr-sharded/compare/statefulset_some-name-cfg.yml @@ -114,6 +114,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 3 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/pitr-sharded/compare/statefulset_some-name-rs0-4-oc.yml b/e2e-tests/pitr-sharded/compare/statefulset_some-name-rs0-4-oc.yml index 9accbf1a7..94ec886db 100644 --- a/e2e-tests/pitr-sharded/compare/statefulset_some-name-rs0-4-oc.yml +++ b/e2e-tests/pitr-sharded/compare/statefulset_some-name-rs0-4-oc.yml @@ -104,6 +104,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/pitr-sharded/compare/statefulset_some-name-rs0-oc.yml b/e2e-tests/pitr-sharded/compare/statefulset_some-name-rs0-oc.yml index f528b660d..cb7b0d359 100644 --- a/e2e-tests/pitr-sharded/compare/statefulset_some-name-rs0-oc.yml +++ b/e2e-tests/pitr-sharded/compare/statefulset_some-name-rs0-oc.yml @@ -104,6 +104,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/pitr-sharded/compare/statefulset_some-name-rs0.yml b/e2e-tests/pitr-sharded/compare/statefulset_some-name-rs0.yml index 74411898e..c8186bd36 100644 --- a/e2e-tests/pitr-sharded/compare/statefulset_some-name-rs0.yml +++ b/e2e-tests/pitr-sharded/compare/statefulset_some-name-rs0.yml @@ -104,6 +104,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/pitr-sharded/compare/statefulset_some-name-rs1-4-oc.yml b/e2e-tests/pitr-sharded/compare/statefulset_some-name-rs1-4-oc.yml index f2cc09831..fd0c1d021 100644 --- a/e2e-tests/pitr-sharded/compare/statefulset_some-name-rs1-4-oc.yml +++ b/e2e-tests/pitr-sharded/compare/statefulset_some-name-rs1-4-oc.yml @@ -104,6 +104,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/pitr-sharded/compare/statefulset_some-name-rs1-oc.yml b/e2e-tests/pitr-sharded/compare/statefulset_some-name-rs1-oc.yml index 08d8a6f7e..b2b05bb53 100644 --- a/e2e-tests/pitr-sharded/compare/statefulset_some-name-rs1-oc.yml +++ b/e2e-tests/pitr-sharded/compare/statefulset_some-name-rs1-oc.yml @@ -104,6 +104,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/pitr-sharded/compare/statefulset_some-name-rs1.yml b/e2e-tests/pitr-sharded/compare/statefulset_some-name-rs1.yml index c22ba33cf..a19ea750f 100644 --- a/e2e-tests/pitr-sharded/compare/statefulset_some-name-rs1.yml +++ b/e2e-tests/pitr-sharded/compare/statefulset_some-name-rs1.yml @@ -104,6 +104,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/pitr-sharded/compare/statefulset_some-name-rs2-4-oc.yml b/e2e-tests/pitr-sharded/compare/statefulset_some-name-rs2-4-oc.yml index 6ffb7c1cd..0a25201f2 100644 --- a/e2e-tests/pitr-sharded/compare/statefulset_some-name-rs2-4-oc.yml +++ b/e2e-tests/pitr-sharded/compare/statefulset_some-name-rs2-4-oc.yml @@ -104,6 +104,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/pitr-sharded/compare/statefulset_some-name-rs2-oc.yml b/e2e-tests/pitr-sharded/compare/statefulset_some-name-rs2-oc.yml index f7a745c3a..5a4f1d236 100644 --- a/e2e-tests/pitr-sharded/compare/statefulset_some-name-rs2-oc.yml +++ b/e2e-tests/pitr-sharded/compare/statefulset_some-name-rs2-oc.yml @@ -104,6 +104,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/pitr-sharded/compare/statefulset_some-name-rs2.yml b/e2e-tests/pitr-sharded/compare/statefulset_some-name-rs2.yml index 1e5498e4e..cc753e563 100644 --- a/e2e-tests/pitr-sharded/compare/statefulset_some-name-rs2.yml +++ b/e2e-tests/pitr-sharded/compare/statefulset_some-name-rs2.yml @@ -104,6 +104,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/pitr/compare/statefulset_some-name-rs0-oc.yml b/e2e-tests/pitr/compare/statefulset_some-name-rs0-oc.yml index 970a865a7..40dd98d3c 100644 --- a/e2e-tests/pitr/compare/statefulset_some-name-rs0-oc.yml +++ b/e2e-tests/pitr/compare/statefulset_some-name-rs0-oc.yml @@ -103,6 +103,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/pitr/compare/statefulset_some-name-rs0.yml b/e2e-tests/pitr/compare/statefulset_some-name-rs0.yml index 13169146c..2fea39fa7 100644 --- a/e2e-tests/pitr/compare/statefulset_some-name-rs0.yml +++ b/e2e-tests/pitr/compare/statefulset_some-name-rs0.yml @@ -103,6 +103,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/pvc-resize/compare/statefulset_some-name-rs0-oc.yml b/e2e-tests/pvc-resize/compare/statefulset_some-name-rs0-oc.yml index 327d3eb21..6e09704b8 100644 --- a/e2e-tests/pvc-resize/compare/statefulset_some-name-rs0-oc.yml +++ b/e2e-tests/pvc-resize/compare/statefulset_some-name-rs0-oc.yml @@ -103,6 +103,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/pvc-resize/compare/statefulset_some-name-rs0.yml b/e2e-tests/pvc-resize/compare/statefulset_some-name-rs0.yml index 79f57dd66..f102d6dfe 100644 --- a/e2e-tests/pvc-resize/compare/statefulset_some-name-rs0.yml +++ b/e2e-tests/pvc-resize/compare/statefulset_some-name-rs0.yml @@ -103,6 +103,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/rs-shard-migration/compare/statefulset_some-name-rs0-oc.yml b/e2e-tests/rs-shard-migration/compare/statefulset_some-name-rs0-oc.yml index 3de431d23..b40656bb1 100644 --- a/e2e-tests/rs-shard-migration/compare/statefulset_some-name-rs0-oc.yml +++ b/e2e-tests/rs-shard-migration/compare/statefulset_some-name-rs0-oc.yml @@ -103,6 +103,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/rs-shard-migration/compare/statefulset_some-name-rs0.yml b/e2e-tests/rs-shard-migration/compare/statefulset_some-name-rs0.yml index 1bbc35c2e..69be31df4 100644 --- a/e2e-tests/rs-shard-migration/compare/statefulset_some-name-rs0.yml +++ b/e2e-tests/rs-shard-migration/compare/statefulset_some-name-rs0.yml @@ -103,6 +103,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/scheduled-backup/compare/statefulset_some-name-rs0-oc.yml b/e2e-tests/scheduled-backup/compare/statefulset_some-name-rs0-oc.yml index 90335fc86..5636bd695 100644 --- a/e2e-tests/scheduled-backup/compare/statefulset_some-name-rs0-oc.yml +++ b/e2e-tests/scheduled-backup/compare/statefulset_some-name-rs0-oc.yml @@ -103,6 +103,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/scheduled-backup/compare/statefulset_some-name-rs0.yml b/e2e-tests/scheduled-backup/compare/statefulset_some-name-rs0.yml index 72f1e70e1..a607d61e4 100644 --- a/e2e-tests/scheduled-backup/compare/statefulset_some-name-rs0.yml +++ b/e2e-tests/scheduled-backup/compare/statefulset_some-name-rs0.yml @@ -103,6 +103,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/security-context/compare/statefulset_sec-context-rs0-changed.yml b/e2e-tests/security-context/compare/statefulset_sec-context-rs0-changed.yml index fd82316b2..365f50a53 100644 --- a/e2e-tests/security-context/compare/statefulset_sec-context-rs0-changed.yml +++ b/e2e-tests/security-context/compare/statefulset_sec-context-rs0-changed.yml @@ -104,6 +104,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/security-context/compare/statefulset_sec-context-rs0.yml b/e2e-tests/security-context/compare/statefulset_sec-context-rs0.yml index cd8b69e68..1e78683e4 100644 --- a/e2e-tests/security-context/compare/statefulset_sec-context-rs0.yml +++ b/e2e-tests/security-context/compare/statefulset_sec-context-rs0.yml @@ -104,6 +104,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/service-per-pod/compare/statefulset_cluster-ip-rs0-oc.yml b/e2e-tests/service-per-pod/compare/statefulset_cluster-ip-rs0-oc.yml index 70618d865..7a5b00402 100644 --- a/e2e-tests/service-per-pod/compare/statefulset_cluster-ip-rs0-oc.yml +++ b/e2e-tests/service-per-pod/compare/statefulset_cluster-ip-rs0-oc.yml @@ -102,6 +102,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/service-per-pod/compare/statefulset_cluster-ip-rs0.yml b/e2e-tests/service-per-pod/compare/statefulset_cluster-ip-rs0.yml index d672cff6c..08916353c 100644 --- a/e2e-tests/service-per-pod/compare/statefulset_cluster-ip-rs0.yml +++ b/e2e-tests/service-per-pod/compare/statefulset_cluster-ip-rs0.yml @@ -102,6 +102,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/service-per-pod/compare/statefulset_local-balancer-rs0-oc.yml b/e2e-tests/service-per-pod/compare/statefulset_local-balancer-rs0-oc.yml index d39a7833d..80cf5a1bc 100644 --- a/e2e-tests/service-per-pod/compare/statefulset_local-balancer-rs0-oc.yml +++ b/e2e-tests/service-per-pod/compare/statefulset_local-balancer-rs0-oc.yml @@ -102,6 +102,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/service-per-pod/compare/statefulset_local-balancer-rs0.yml b/e2e-tests/service-per-pod/compare/statefulset_local-balancer-rs0.yml index bb0d44b07..44b1b879c 100644 --- a/e2e-tests/service-per-pod/compare/statefulset_local-balancer-rs0.yml +++ b/e2e-tests/service-per-pod/compare/statefulset_local-balancer-rs0.yml @@ -102,6 +102,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/service-per-pod/compare/statefulset_node-port-rs0-oc.yml b/e2e-tests/service-per-pod/compare/statefulset_node-port-rs0-oc.yml index 690a59104..aa2f52d6f 100644 --- a/e2e-tests/service-per-pod/compare/statefulset_node-port-rs0-oc.yml +++ b/e2e-tests/service-per-pod/compare/statefulset_node-port-rs0-oc.yml @@ -102,6 +102,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/service-per-pod/compare/statefulset_node-port-rs0.yml b/e2e-tests/service-per-pod/compare/statefulset_node-port-rs0.yml index 524ae360c..5f68e4155 100644 --- a/e2e-tests/service-per-pod/compare/statefulset_node-port-rs0.yml +++ b/e2e-tests/service-per-pod/compare/statefulset_node-port-rs0.yml @@ -102,6 +102,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/serviceless-external-nodes/compare/statefulset_mydb-rs0-oc.yml b/e2e-tests/serviceless-external-nodes/compare/statefulset_mydb-rs0-oc.yml index e1c00719a..13cb9e46d 100644 --- a/e2e-tests/serviceless-external-nodes/compare/statefulset_mydb-rs0-oc.yml +++ b/e2e-tests/serviceless-external-nodes/compare/statefulset_mydb-rs0-oc.yml @@ -104,6 +104,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/serviceless-external-nodes/compare/statefulset_mydb-rs0.yml b/e2e-tests/serviceless-external-nodes/compare/statefulset_mydb-rs0.yml index ea0ff9e44..bcd51a9b8 100644 --- a/e2e-tests/serviceless-external-nodes/compare/statefulset_mydb-rs0.yml +++ b/e2e-tests/serviceless-external-nodes/compare/statefulset_mydb-rs0.yml @@ -104,6 +104,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/smart-update/compare/statefulset_smart-update-rs0-arbiter-oc.yml b/e2e-tests/smart-update/compare/statefulset_smart-update-rs0-arbiter-oc.yml index f05093ad7..dfcb0a9ae 100644 --- a/e2e-tests/smart-update/compare/statefulset_smart-update-rs0-arbiter-oc.yml +++ b/e2e-tests/smart-update/compare/statefulset_smart-update-rs0-arbiter-oc.yml @@ -103,6 +103,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/smart-update/compare/statefulset_smart-update-rs0-arbiter.yml b/e2e-tests/smart-update/compare/statefulset_smart-update-rs0-arbiter.yml index 65a54de87..918444f8f 100644 --- a/e2e-tests/smart-update/compare/statefulset_smart-update-rs0-arbiter.yml +++ b/e2e-tests/smart-update/compare/statefulset_smart-update-rs0-arbiter.yml @@ -103,6 +103,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/smart-update/compare/statefulset_smart-update-rs0-oc.yml b/e2e-tests/smart-update/compare/statefulset_smart-update-rs0-oc.yml index 4d246b4fb..01a323b53 100644 --- a/e2e-tests/smart-update/compare/statefulset_smart-update-rs0-oc.yml +++ b/e2e-tests/smart-update/compare/statefulset_smart-update-rs0-oc.yml @@ -103,6 +103,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/smart-update/compare/statefulset_smart-update-rs0.yml b/e2e-tests/smart-update/compare/statefulset_smart-update-rs0.yml index c393cc0e7..b66fdd996 100644 --- a/e2e-tests/smart-update/compare/statefulset_smart-update-rs0.yml +++ b/e2e-tests/smart-update/compare/statefulset_smart-update-rs0.yml @@ -103,6 +103,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/storage/compare/statefulset_emptydir-rs0-oc.yml b/e2e-tests/storage/compare/statefulset_emptydir-rs0-oc.yml index f1dd38e17..0185d1814 100644 --- a/e2e-tests/storage/compare/statefulset_emptydir-rs0-oc.yml +++ b/e2e-tests/storage/compare/statefulset_emptydir-rs0-oc.yml @@ -114,6 +114,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/storage/compare/statefulset_emptydir-rs0.yml b/e2e-tests/storage/compare/statefulset_emptydir-rs0.yml index bfacb44f4..2e9e3ee90 100644 --- a/e2e-tests/storage/compare/statefulset_emptydir-rs0.yml +++ b/e2e-tests/storage/compare/statefulset_emptydir-rs0.yml @@ -114,6 +114,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/storage/compare/statefulset_hostpath-rs0-oc.yml b/e2e-tests/storage/compare/statefulset_hostpath-rs0-oc.yml index 86a13aabf..9d9f3972a 100644 --- a/e2e-tests/storage/compare/statefulset_hostpath-rs0-oc.yml +++ b/e2e-tests/storage/compare/statefulset_hostpath-rs0-oc.yml @@ -102,6 +102,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/storage/compare/statefulset_hostpath-rs0.yml b/e2e-tests/storage/compare/statefulset_hostpath-rs0.yml index 1bc8e3149..db618f743 100644 --- a/e2e-tests/storage/compare/statefulset_hostpath-rs0.yml +++ b/e2e-tests/storage/compare/statefulset_hostpath-rs0.yml @@ -114,6 +114,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/tls-issue-cert-manager/compare/statefulset_some-name-cfg-oc.yml b/e2e-tests/tls-issue-cert-manager/compare/statefulset_some-name-cfg-oc.yml index 5f346cca5..a2471dcd7 100644 --- a/e2e-tests/tls-issue-cert-manager/compare/statefulset_some-name-cfg-oc.yml +++ b/e2e-tests/tls-issue-cert-manager/compare/statefulset_some-name-cfg-oc.yml @@ -114,6 +114,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 3 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/tls-issue-cert-manager/compare/statefulset_some-name-cfg-tls-disabled-oc.yml b/e2e-tests/tls-issue-cert-manager/compare/statefulset_some-name-cfg-tls-disabled-oc.yml index 9b6f766af..6829172ed 100644 --- a/e2e-tests/tls-issue-cert-manager/compare/statefulset_some-name-cfg-tls-disabled-oc.yml +++ b/e2e-tests/tls-issue-cert-manager/compare/statefulset_some-name-cfg-tls-disabled-oc.yml @@ -108,6 +108,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 3 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/tls-issue-cert-manager/compare/statefulset_some-name-cfg-tls-disabled.yml b/e2e-tests/tls-issue-cert-manager/compare/statefulset_some-name-cfg-tls-disabled.yml index 918befc9d..aa64406ea 100644 --- a/e2e-tests/tls-issue-cert-manager/compare/statefulset_some-name-cfg-tls-disabled.yml +++ b/e2e-tests/tls-issue-cert-manager/compare/statefulset_some-name-cfg-tls-disabled.yml @@ -108,6 +108,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 3 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/tls-issue-cert-manager/compare/statefulset_some-name-cfg.yml b/e2e-tests/tls-issue-cert-manager/compare/statefulset_some-name-cfg.yml index 1c7d07c6e..75558b29c 100644 --- a/e2e-tests/tls-issue-cert-manager/compare/statefulset_some-name-cfg.yml +++ b/e2e-tests/tls-issue-cert-manager/compare/statefulset_some-name-cfg.yml @@ -114,6 +114,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 3 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/tls-issue-cert-manager/compare/statefulset_some-name-rs0-oc.yml b/e2e-tests/tls-issue-cert-manager/compare/statefulset_some-name-rs0-oc.yml index c1f79fa31..1d105219e 100644 --- a/e2e-tests/tls-issue-cert-manager/compare/statefulset_some-name-rs0-oc.yml +++ b/e2e-tests/tls-issue-cert-manager/compare/statefulset_some-name-rs0-oc.yml @@ -103,6 +103,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/tls-issue-cert-manager/compare/statefulset_some-name-rs0-tls-disabled-oc.yml b/e2e-tests/tls-issue-cert-manager/compare/statefulset_some-name-rs0-tls-disabled-oc.yml index 5e07803c5..15f8bc313 100644 --- a/e2e-tests/tls-issue-cert-manager/compare/statefulset_some-name-rs0-tls-disabled-oc.yml +++ b/e2e-tests/tls-issue-cert-manager/compare/statefulset_some-name-rs0-tls-disabled-oc.yml @@ -97,6 +97,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/tls-issue-cert-manager/compare/statefulset_some-name-rs0-tls-disabled.yml b/e2e-tests/tls-issue-cert-manager/compare/statefulset_some-name-rs0-tls-disabled.yml index 0f7d26ec8..96be9e532 100644 --- a/e2e-tests/tls-issue-cert-manager/compare/statefulset_some-name-rs0-tls-disabled.yml +++ b/e2e-tests/tls-issue-cert-manager/compare/statefulset_some-name-rs0-tls-disabled.yml @@ -97,6 +97,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/tls-issue-cert-manager/compare/statefulset_some-name-rs0.yml b/e2e-tests/tls-issue-cert-manager/compare/statefulset_some-name-rs0.yml index 80111f688..9e948781f 100644 --- a/e2e-tests/tls-issue-cert-manager/compare/statefulset_some-name-rs0.yml +++ b/e2e-tests/tls-issue-cert-manager/compare/statefulset_some-name-rs0.yml @@ -103,6 +103,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/version-service/compare/statefulset_version-service-exact-rs0-oc.yml b/e2e-tests/version-service/compare/statefulset_version-service-exact-rs0-oc.yml index 4bd991796..6e8125932 100644 --- a/e2e-tests/version-service/compare/statefulset_version-service-exact-rs0-oc.yml +++ b/e2e-tests/version-service/compare/statefulset_version-service-exact-rs0-oc.yml @@ -103,6 +103,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/version-service/compare/statefulset_version-service-exact-rs0.yml b/e2e-tests/version-service/compare/statefulset_version-service-exact-rs0.yml index 50c7b60aa..41a19e63e 100644 --- a/e2e-tests/version-service/compare/statefulset_version-service-exact-rs0.yml +++ b/e2e-tests/version-service/compare/statefulset_version-service-exact-rs0.yml @@ -103,6 +103,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/version-service/compare/statefulset_version-service-latest-rs0-oc.yml b/e2e-tests/version-service/compare/statefulset_version-service-latest-rs0-oc.yml index e8a642be3..1ac084a61 100644 --- a/e2e-tests/version-service/compare/statefulset_version-service-latest-rs0-oc.yml +++ b/e2e-tests/version-service/compare/statefulset_version-service-latest-rs0-oc.yml @@ -103,6 +103,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/version-service/compare/statefulset_version-service-latest-rs0.yml b/e2e-tests/version-service/compare/statefulset_version-service-latest-rs0.yml index 5da8e5d7e..7a0598a51 100644 --- a/e2e-tests/version-service/compare/statefulset_version-service-latest-rs0.yml +++ b/e2e-tests/version-service/compare/statefulset_version-service-latest-rs0.yml @@ -103,6 +103,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/version-service/compare/statefulset_version-service-major-rs0-oc.yml b/e2e-tests/version-service/compare/statefulset_version-service-major-rs0-oc.yml index 33bdc328f..6f7b0b027 100644 --- a/e2e-tests/version-service/compare/statefulset_version-service-major-rs0-oc.yml +++ b/e2e-tests/version-service/compare/statefulset_version-service-major-rs0-oc.yml @@ -103,6 +103,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/version-service/compare/statefulset_version-service-major-rs0.yml b/e2e-tests/version-service/compare/statefulset_version-service-major-rs0.yml index 334b972a9..d6fafed3c 100644 --- a/e2e-tests/version-service/compare/statefulset_version-service-major-rs0.yml +++ b/e2e-tests/version-service/compare/statefulset_version-service-major-rs0.yml @@ -103,6 +103,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/version-service/compare/statefulset_version-service-recommended-rs0-oc.yml b/e2e-tests/version-service/compare/statefulset_version-service-recommended-rs0-oc.yml index dd20eb40f..b8fab928a 100644 --- a/e2e-tests/version-service/compare/statefulset_version-service-recommended-rs0-oc.yml +++ b/e2e-tests/version-service/compare/statefulset_version-service-recommended-rs0-oc.yml @@ -103,6 +103,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/version-service/compare/statefulset_version-service-recommended-rs0.yml b/e2e-tests/version-service/compare/statefulset_version-service-recommended-rs0.yml index 3e8489f9b..f85a2d51f 100644 --- a/e2e-tests/version-service/compare/statefulset_version-service-recommended-rs0.yml +++ b/e2e-tests/version-service/compare/statefulset_version-service-recommended-rs0.yml @@ -103,6 +103,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/version-service/compare/statefulset_version-service-unreachable-rs0-oc.yml b/e2e-tests/version-service/compare/statefulset_version-service-unreachable-rs0-oc.yml index 74dbf45cf..c2199c29f 100644 --- a/e2e-tests/version-service/compare/statefulset_version-service-unreachable-rs0-oc.yml +++ b/e2e-tests/version-service/compare/statefulset_version-service-unreachable-rs0-oc.yml @@ -103,6 +103,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 5 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/version-service/compare/statefulset_version-service-unreachable-rs0.yml b/e2e-tests/version-service/compare/statefulset_version-service-unreachable-rs0.yml index eb556f236..6174336ea 100644 --- a/e2e-tests/version-service/compare/statefulset_version-service-unreachable-rs0.yml +++ b/e2e-tests/version-service/compare/statefulset_version-service-unreachable-rs0.yml @@ -103,6 +103,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 5 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/pkg/apis/psmdb/v1/psmdb_defaults.go b/pkg/apis/psmdb/v1/psmdb_defaults.go index 4e41f089c..afeb2380c 100644 --- a/pkg/apis/psmdb/v1/psmdb_defaults.go +++ b/pkg/apis/psmdb/v1/psmdb_defaults.go @@ -466,6 +466,12 @@ func (cr *PerconaServerMongoDB) CheckNSetDefaults(ctx context.Context, platform "--component", "mongod", }, } + if cr.TLSEnabled() && cr.CompareVersion("1.21.0") >= 0 { + replset.ReadinessProbe.Exec.Command = append(replset.ReadinessProbe.Exec.Command, + "--ssl", "--sslInsecure", + "--sslCAFile", "/etc/mongodb-ssl/ca.crt", + "--sslPEMKeyFile", "/tmp/tls.pem") + } if cr.CompareVersion("1.15.0") < 0 { replset.ReadinessProbe.Exec = nil @@ -797,6 +803,12 @@ func (nv *NonVotingSpec) SetDefaults(cr *PerconaServerMongoDB, rs *ReplsetSpec) "--component", "mongod", }, } + if cr.TLSEnabled() && cr.CompareVersion("1.21.0") >= 0 { + nv.ReadinessProbe.Exec.Command = append(nv.ReadinessProbe.Exec.Command, + "--ssl", "--sslInsecure", + "--sslCAFile", "/etc/mongodb-ssl/ca.crt", + "--sslPEMKeyFile", "/tmp/tls.pem") + } if cr.CompareVersion("1.15.0") < 0 { nv.ReadinessProbe.Exec = nil diff --git a/pkg/psmdb/client.go b/pkg/psmdb/client.go index 3c093cf8f..d22221d29 100644 --- a/pkg/psmdb/client.go +++ b/pkg/psmdb/client.go @@ -59,7 +59,7 @@ func MongoClient(ctx context.Context, k8sClient client.Client, cr *api.PerconaSe conf.TLSConf = &tlsCfg } - return mongo.Dial(conf) + return mongo.Dial(ctx, conf) } func MongosClient(ctx context.Context, k8sclient client.Client, cr *api.PerconaServerMongoDB, c Credentials) (mongo.Client, error) { @@ -82,7 +82,7 @@ func MongosClient(ctx context.Context, k8sclient client.Client, cr *api.PerconaS conf.TLSConf = &tlsCfg } - return mongo.Dial(&conf) + return mongo.Dial(ctx, &conf) } func StandaloneClient(ctx context.Context, k8sclient client.Client, cr *api.PerconaServerMongoDB, c Credentials, host string, tlsEnabled bool) (mongo.Client, error) { @@ -102,5 +102,5 @@ func StandaloneClient(ctx context.Context, k8sclient client.Client, cr *api.Perc conf.TLSConf = &tlsCfg } - return mongo.Dial(&conf) + return mongo.Dial(ctx, &conf) } diff --git a/pkg/psmdb/mongo/mongo.go b/pkg/psmdb/mongo/mongo.go index dcbceb6f1..0893bd0ac 100644 --- a/pkg/psmdb/mongo/mongo.go +++ b/pkg/psmdb/mongo/mongo.go @@ -25,6 +25,7 @@ type Config struct { Password string TLSConf *tls.Config Direct bool + Timeout time.Duration } type Client interface { @@ -75,9 +76,11 @@ func ToInterface(client *mongo.Client) Client { return &mongoClient{client} } -func Dial(conf *Config) (Client, error) { - ctx, connectcancel := context.WithTimeout(context.Background(), 10*time.Second) - defer connectcancel() +func Dial(ctx context.Context, conf *Config) (Client, error) { + timeout := 10 * time.Second + if conf.Timeout != 0 { + timeout = conf.Timeout + } journal := true wc := writeconcern.Majority() @@ -88,8 +91,8 @@ func Dial(conf *Config) (Client, error) { SetReadPreference(readpref.Primary()). SetTLSConfig(conf.TLSConf). SetDirect(conf.Direct). - SetConnectTimeout(10 * time.Second). - SetServerSelectionTimeout(10 * time.Second) + SetConnectTimeout(timeout). + SetServerSelectionTimeout(timeout) if conf.ReplSetName != "" { opts.SetReplicaSet(conf.ReplSetName) @@ -101,24 +104,24 @@ func Dial(conf *Config) (Client, error) { }) } - client, err := mongo.Connect(ctx, opts) + tCtx, cancel := context.WithTimeout(ctx, timeout) + defer cancel() + client, err := mongo.Connect(tCtx, opts) if err != nil { return nil, errors.Wrap(err, "connect to mongo rs") } - defer func() { if err != nil { - derr := client.Disconnect(ctx) + derr := client.Disconnect(tCtx) if derr != nil { log.Error(err, "failed to disconnect") } } }() - ctx, pingcancel := context.WithTimeout(context.Background(), 10*time.Second) - defer pingcancel() - - err = client.Ping(ctx, readpref.Primary()) + tCtx, cancel = context.WithTimeout(ctx, timeout) + defer cancel() + err = client.Ping(tCtx, readpref.Primary()) if err != nil { return nil, errors.Wrap(err, "ping mongo") } @@ -260,7 +263,6 @@ func (client *mongoClient) UpdateRole(ctx context.Context, db string, role Role) } return nil - } func (client *mongoClient) GetRole(ctx context.Context, db, role string) (*Role, error) { From d75cca12e85bb95307d390cba7d47ac724d3251f Mon Sep 17 00:00:00 2001 From: Andrii Dema Date: Thu, 22 May 2025 12:30:55 +0300 Subject: [PATCH 02/13] fix tests --- .../compare/statefulset_another-name-rs0-4-oc.yml | 6 ------ .../init-deploy/compare/statefulset_another-name-rs0-oc.yml | 6 ------ .../init-deploy/compare/statefulset_another-name-rs0.yml | 6 ------ .../compare/statefulset_monitoring-pmm3-cfg-oc.yml | 6 ++++++ .../compare/statefulset_monitoring-pmm3-cfg.yml | 6 ++++++ .../compare/statefulset_monitoring-pmm3-rs0-no-pmm-oc.yml | 6 ++++++ .../compare/statefulset_monitoring-pmm3-rs0-no-pmm.yml | 6 ++++++ .../compare/statefulset_monitoring-pmm3-rs0-oc.yml | 6 ++++++ .../compare/statefulset_monitoring-pmm3-rs0.yml | 6 ++++++ 9 files changed, 36 insertions(+), 18 deletions(-) diff --git a/e2e-tests/init-deploy/compare/statefulset_another-name-rs0-4-oc.yml b/e2e-tests/init-deploy/compare/statefulset_another-name-rs0-4-oc.yml index 24c80bcb5..4994e4419 100644 --- a/e2e-tests/init-deploy/compare/statefulset_another-name-rs0-4-oc.yml +++ b/e2e-tests/init-deploy/compare/statefulset_another-name-rs0-4-oc.yml @@ -98,12 +98,6 @@ spec: - readiness - --component - mongod - - --ssl - - --sslInsecure - - --sslCAFile - - /etc/mongodb-ssl/ca.crt - - --sslPEMKeyFile - - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/init-deploy/compare/statefulset_another-name-rs0-oc.yml b/e2e-tests/init-deploy/compare/statefulset_another-name-rs0-oc.yml index 4daee2686..9fac7a2cf 100644 --- a/e2e-tests/init-deploy/compare/statefulset_another-name-rs0-oc.yml +++ b/e2e-tests/init-deploy/compare/statefulset_another-name-rs0-oc.yml @@ -98,12 +98,6 @@ spec: - readiness - --component - mongod - - --ssl - - --sslInsecure - - --sslCAFile - - /etc/mongodb-ssl/ca.crt - - --sslPEMKeyFile - - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/init-deploy/compare/statefulset_another-name-rs0.yml b/e2e-tests/init-deploy/compare/statefulset_another-name-rs0.yml index e9d51a66a..d8a2daa05 100644 --- a/e2e-tests/init-deploy/compare/statefulset_another-name-rs0.yml +++ b/e2e-tests/init-deploy/compare/statefulset_another-name-rs0.yml @@ -98,12 +98,6 @@ spec: - readiness - --component - mongod - - --ssl - - --sslInsecure - - --sslCAFile - - /etc/mongodb-ssl/ca.crt - - --sslPEMKeyFile - - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/monitoring-pmm3/compare/statefulset_monitoring-pmm3-cfg-oc.yml b/e2e-tests/monitoring-pmm3/compare/statefulset_monitoring-pmm3-cfg-oc.yml index 0720b9596..d251cd82e 100644 --- a/e2e-tests/monitoring-pmm3/compare/statefulset_monitoring-pmm3-cfg-oc.yml +++ b/e2e-tests/monitoring-pmm3/compare/statefulset_monitoring-pmm3-cfg-oc.yml @@ -115,6 +115,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 3 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/monitoring-pmm3/compare/statefulset_monitoring-pmm3-cfg.yml b/e2e-tests/monitoring-pmm3/compare/statefulset_monitoring-pmm3-cfg.yml index e73c9939e..994914693 100644 --- a/e2e-tests/monitoring-pmm3/compare/statefulset_monitoring-pmm3-cfg.yml +++ b/e2e-tests/monitoring-pmm3/compare/statefulset_monitoring-pmm3-cfg.yml @@ -115,6 +115,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 3 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/monitoring-pmm3/compare/statefulset_monitoring-pmm3-rs0-no-pmm-oc.yml b/e2e-tests/monitoring-pmm3/compare/statefulset_monitoring-pmm3-rs0-no-pmm-oc.yml index 73ca5e0e8..7ec30a962 100644 --- a/e2e-tests/monitoring-pmm3/compare/statefulset_monitoring-pmm3-rs0-no-pmm-oc.yml +++ b/e2e-tests/monitoring-pmm3/compare/statefulset_monitoring-pmm3-rs0-no-pmm-oc.yml @@ -103,6 +103,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/monitoring-pmm3/compare/statefulset_monitoring-pmm3-rs0-no-pmm.yml b/e2e-tests/monitoring-pmm3/compare/statefulset_monitoring-pmm3-rs0-no-pmm.yml index 6247c9542..769f3c8ae 100644 --- a/e2e-tests/monitoring-pmm3/compare/statefulset_monitoring-pmm3-rs0-no-pmm.yml +++ b/e2e-tests/monitoring-pmm3/compare/statefulset_monitoring-pmm3-rs0-no-pmm.yml @@ -103,6 +103,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/monitoring-pmm3/compare/statefulset_monitoring-pmm3-rs0-oc.yml b/e2e-tests/monitoring-pmm3/compare/statefulset_monitoring-pmm3-rs0-oc.yml index 5fcc35f41..ff5e1a702 100644 --- a/e2e-tests/monitoring-pmm3/compare/statefulset_monitoring-pmm3-rs0-oc.yml +++ b/e2e-tests/monitoring-pmm3/compare/statefulset_monitoring-pmm3-rs0-oc.yml @@ -103,6 +103,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/monitoring-pmm3/compare/statefulset_monitoring-pmm3-rs0.yml b/e2e-tests/monitoring-pmm3/compare/statefulset_monitoring-pmm3-rs0.yml index daa7b4caf..27383e1d4 100644 --- a/e2e-tests/monitoring-pmm3/compare/statefulset_monitoring-pmm3-rs0.yml +++ b/e2e-tests/monitoring-pmm3/compare/statefulset_monitoring-pmm3-rs0.yml @@ -103,6 +103,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 From 52df399e3faceaccb2a373beae85831afdfcb36e Mon Sep 17 00:00:00 2001 From: Andrii Dema Date: Thu, 22 May 2025 14:50:29 +0300 Subject: [PATCH 03/13] fix unit-test --- .../testdata/reconcile-statefulset/cfg-arbiter.yaml | 6 ++++++ .../testdata/reconcile-statefulset/cfg-mongod.yaml | 6 ++++++ .../testdata/reconcile-statefulset/cfg-nv.yaml | 6 ++++++ .../testdata/reconcile-statefulset/rs0-arbiter.yaml | 6 ++++++ .../testdata/reconcile-statefulset/rs0-mongod.yaml | 6 ++++++ .../testdata/reconcile-statefulset/rs0-nv.yaml | 6 ++++++ 6 files changed, 36 insertions(+) diff --git a/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/cfg-arbiter.yaml b/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/cfg-arbiter.yaml index 6567f52ef..5e81a8bef 100644 --- a/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/cfg-arbiter.yaml +++ b/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/cfg-arbiter.yaml @@ -115,6 +115,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 3 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/cfg-mongod.yaml b/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/cfg-mongod.yaml index 6567f52ef..5e81a8bef 100644 --- a/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/cfg-mongod.yaml +++ b/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/cfg-mongod.yaml @@ -115,6 +115,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 3 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/cfg-nv.yaml b/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/cfg-nv.yaml index 6567f52ef..5e81a8bef 100644 --- a/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/cfg-nv.yaml +++ b/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/cfg-nv.yaml @@ -115,6 +115,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 3 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/rs0-arbiter.yaml b/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/rs0-arbiter.yaml index 68597bedd..2164c5983 100644 --- a/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/rs0-arbiter.yaml +++ b/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/rs0-arbiter.yaml @@ -115,6 +115,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/rs0-mongod.yaml b/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/rs0-mongod.yaml index f0e28a4f5..b7fabfd79 100644 --- a/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/rs0-mongod.yaml +++ b/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/rs0-mongod.yaml @@ -115,6 +115,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/rs0-nv.yaml b/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/rs0-nv.yaml index 17dc3e568..e595adc39 100644 --- a/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/rs0-nv.yaml +++ b/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/rs0-nv.yaml @@ -115,6 +115,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 From 5d322e338c3237c14908812c325a218d69f763f6 Mon Sep 17 00:00:00 2001 From: Andrii Dema Date: Fri, 23 May 2025 14:11:57 +0300 Subject: [PATCH 04/13] fix tests --- .../statefulset_some-name-cfg-tls-disabled-oc.yml | 6 ------ .../statefulset_some-name-cfg-tls-disabled.yml | 6 ------ .../statefulset_some-name-rs0-tls-disabled-oc.yml | 6 ------ .../statefulset_some-name-rs0-tls-disabled.yml | 6 ------ e2e-tests/upgrade-consistency-sharded-tls/run | 12 ++++++------ .../compare/statefulset_some-name-rs0-1210-oc.yml | 8 +++++++- .../compare/statefulset_some-name-rs0-1210.yml | 8 +++++++- 7 files changed, 20 insertions(+), 32 deletions(-) diff --git a/e2e-tests/tls-issue-cert-manager/compare/statefulset_some-name-cfg-tls-disabled-oc.yml b/e2e-tests/tls-issue-cert-manager/compare/statefulset_some-name-cfg-tls-disabled-oc.yml index 6829172ed..9b6f766af 100644 --- a/e2e-tests/tls-issue-cert-manager/compare/statefulset_some-name-cfg-tls-disabled-oc.yml +++ b/e2e-tests/tls-issue-cert-manager/compare/statefulset_some-name-cfg-tls-disabled-oc.yml @@ -108,12 +108,6 @@ spec: - readiness - --component - mongod - - --ssl - - --sslInsecure - - --sslCAFile - - /etc/mongodb-ssl/ca.crt - - --sslPEMKeyFile - - /tmp/tls.pem failureThreshold: 3 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/tls-issue-cert-manager/compare/statefulset_some-name-cfg-tls-disabled.yml b/e2e-tests/tls-issue-cert-manager/compare/statefulset_some-name-cfg-tls-disabled.yml index aa64406ea..918befc9d 100644 --- a/e2e-tests/tls-issue-cert-manager/compare/statefulset_some-name-cfg-tls-disabled.yml +++ b/e2e-tests/tls-issue-cert-manager/compare/statefulset_some-name-cfg-tls-disabled.yml @@ -108,12 +108,6 @@ spec: - readiness - --component - mongod - - --ssl - - --sslInsecure - - --sslCAFile - - /etc/mongodb-ssl/ca.crt - - --sslPEMKeyFile - - /tmp/tls.pem failureThreshold: 3 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/tls-issue-cert-manager/compare/statefulset_some-name-rs0-tls-disabled-oc.yml b/e2e-tests/tls-issue-cert-manager/compare/statefulset_some-name-rs0-tls-disabled-oc.yml index 15f8bc313..5e07803c5 100644 --- a/e2e-tests/tls-issue-cert-manager/compare/statefulset_some-name-rs0-tls-disabled-oc.yml +++ b/e2e-tests/tls-issue-cert-manager/compare/statefulset_some-name-rs0-tls-disabled-oc.yml @@ -97,12 +97,6 @@ spec: - readiness - --component - mongod - - --ssl - - --sslInsecure - - --sslCAFile - - /etc/mongodb-ssl/ca.crt - - --sslPEMKeyFile - - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/tls-issue-cert-manager/compare/statefulset_some-name-rs0-tls-disabled.yml b/e2e-tests/tls-issue-cert-manager/compare/statefulset_some-name-rs0-tls-disabled.yml index 96be9e532..0f7d26ec8 100644 --- a/e2e-tests/tls-issue-cert-manager/compare/statefulset_some-name-rs0-tls-disabled.yml +++ b/e2e-tests/tls-issue-cert-manager/compare/statefulset_some-name-rs0-tls-disabled.yml @@ -97,12 +97,6 @@ spec: - readiness - --component - mongod - - --ssl - - --sslInsecure - - --sslCAFile - - /etc/mongodb-ssl/ca.crt - - --sslPEMKeyFile - - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/upgrade-consistency-sharded-tls/run b/e2e-tests/upgrade-consistency-sharded-tls/run index 083f41ae7..dda41539e 100755 --- a/e2e-tests/upgrade-consistency-sharded-tls/run +++ b/e2e-tests/upgrade-consistency-sharded-tls/run @@ -93,20 +93,20 @@ main() { sleep 20 desc 'check if Pod started' wait_cluster - compare_generation "5" "statefulset" "${CLUSTER}-rs0" - compare_generation "5" "statefulset" "${CLUSTER}-cfg" + compare_generation "6" "statefulset" "${CLUSTER}-rs0" + compare_generation "6" "statefulset" "${CLUSTER}-cfg" renew_certificate "some-name-ssl" sleep 20 wait_cluster - compare_generation "6" "statefulset" "${CLUSTER}-rs0" - compare_generation "6" "statefulset" "${CLUSTER}-cfg" + compare_generation "7" "statefulset" "${CLUSTER}-rs0" + compare_generation "7" "statefulset" "${CLUSTER}-cfg" renew_certificate "some-name-ssl-internal" sleep 20 wait_cluster - compare_generation "7" "statefulset" "${CLUSTER}-rs0" - compare_generation "7" "statefulset" "${CLUSTER}-cfg" + compare_generation "8" "statefulset" "${CLUSTER}-rs0" + compare_generation "8" "statefulset" "${CLUSTER}-cfg" desc 'check if service and statefulset created with expected config' compare_kubectl service/${CLUSTER}-rs0 "-1210" diff --git a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-rs0-1210-oc.yml b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-rs0-1210-oc.yml index 3de431d23..b9a363159 100644 --- a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-rs0-1210-oc.yml +++ b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-rs0-1210-oc.yml @@ -2,7 +2,7 @@ apiVersion: apps/v1 kind: StatefulSet metadata: annotations: {} - generation: 1 + generation: 2 labels: app.kubernetes.io/component: mongod app.kubernetes.io/instance: some-name @@ -103,6 +103,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-rs0-1210.yml b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-rs0-1210.yml index 1bbc35c2e..3bdbdb0f3 100644 --- a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-rs0-1210.yml +++ b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-rs0-1210.yml @@ -2,7 +2,7 @@ apiVersion: apps/v1 kind: StatefulSet metadata: annotations: {} - generation: 1 + generation: 2 labels: app.kubernetes.io/component: mongod app.kubernetes.io/instance: some-name @@ -103,6 +103,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 From fb8a8efa6daee31556f23f3673318516493acd15 Mon Sep 17 00:00:00 2001 From: Andrii Dema Date: Tue, 27 May 2025 13:20:17 +0300 Subject: [PATCH 05/13] fix unit-test --- .../testdata/reconcile-statefulset/cfg-hidden.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/cfg-hidden.yaml b/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/cfg-hidden.yaml index 6567f52ef..5e81a8bef 100644 --- a/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/cfg-hidden.yaml +++ b/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/cfg-hidden.yaml @@ -115,6 +115,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 3 initialDelaySeconds: 10 periodSeconds: 3 From c896cbe9e9a7ebf18204cb58bb967bf2194bc40a Mon Sep 17 00:00:00 2001 From: Andrii Dema Date: Tue, 27 May 2025 14:03:03 +0300 Subject: [PATCH 06/13] ignore connection error in readiness probe --- cmd/mongodb-healthcheck/healthcheck/health.go | 3 +++ .../healthcheck/readiness.go | 17 ++++++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/cmd/mongodb-healthcheck/healthcheck/health.go b/cmd/mongodb-healthcheck/healthcheck/health.go index 1494c5d1c..ec3ef8bfd 100644 --- a/cmd/mongodb-healthcheck/healthcheck/health.go +++ b/cmd/mongodb-healthcheck/healthcheck/health.go @@ -127,6 +127,9 @@ type ReplSetStatus struct { type InitialSyncStatus interface{} func CheckState(rs ReplSetStatus, startupDelaySeconds int64, oplogSize int64) error { + if rs.GetSelf() == nil { + return errors.New("invalid replset status") + } uptime := rs.GetSelf().Uptime switch rs.MyState { diff --git a/cmd/mongodb-healthcheck/healthcheck/readiness.go b/cmd/mongodb-healthcheck/healthcheck/readiness.go index 3db3127d4..644e6ddfe 100644 --- a/cmd/mongodb-healthcheck/healthcheck/readiness.go +++ b/cmd/mongodb-healthcheck/healthcheck/readiness.go @@ -44,25 +44,28 @@ func MongodReadinessCheck(ctx context.Context, cnf *db.Config) error { return err } - s, err := func() (ReplSetStatus, error) { + s, err := func() (*ReplSetStatus, error) { cnf.Timeout = time.Second client, err := db.Dial(ctx, cnf) if err != nil { - return ReplSetStatus{}, errors.Wrap(err, "connection error") + return nil, nil } defer func() { if derr := client.Disconnect(ctx); derr != nil && err == nil { err = errors.Wrap(derr, "failed to disconnect") } }() - return getStatus(ctx, client) + rs, err := getStatus(ctx, client) + if err != nil { + return nil, err + } + return &rs, nil }() - if err != nil { - log.Error(err, "Failed to get replset status") - return nil + if err != nil || s == nil { + return err } - if err := CheckState(s, 0, 0); err != nil { + if err := CheckState(*s, 0, 0); err != nil { return errors.Wrap(err, "check state") } From ae932d3a61842217cea12236b43b45e25d50f526 Mon Sep 17 00:00:00 2001 From: Andrii Dema Date: Tue, 27 May 2025 14:17:25 +0300 Subject: [PATCH 07/13] delete util.go --- cmd/mongodb-healthcheck/healthcheck/health.go | 11 +--- .../healthcheck/readiness.go | 4 +- cmd/mongodb-healthcheck/healthcheck/util.go | 51 ------------------- pkg/psmdb/mongo/models.go | 7 ++- 4 files changed, 9 insertions(+), 64 deletions(-) delete mode 100644 cmd/mongodb-healthcheck/healthcheck/util.go diff --git a/cmd/mongodb-healthcheck/healthcheck/health.go b/cmd/mongodb-healthcheck/healthcheck/health.go index ec3ef8bfd..140ea44c3 100644 --- a/cmd/mongodb-healthcheck/healthcheck/health.go +++ b/cmd/mongodb-healthcheck/healthcheck/health.go @@ -73,7 +73,7 @@ func HealthCheckMongodLiveness(ctx context.Context, cnf *db.Config, startupDelay return nil, errors.Wrap(err, "get isMaster response") } - rsStatus, err := getStatus(ctx, client) + rsStatus, err := client.RSStatus(ctx) if err != nil { if err.Error() == ErrNoReplsetConfigStr { state := mongo.MemberStateUnknown @@ -119,14 +119,7 @@ type OplogRs struct { StorageSize int64 `bson:"storageSize" json:"storageSize"` } -type ReplSetStatus struct { - InitialSyncStatus InitialSyncStatus `bson:"initialSyncStatus" json:"initialSyncStatus"` - mongo.Status `bson:",inline"` -} - -type InitialSyncStatus interface{} - -func CheckState(rs ReplSetStatus, startupDelaySeconds int64, oplogSize int64) error { +func CheckState(rs mongo.Status, startupDelaySeconds int64, oplogSize int64) error { if rs.GetSelf() == nil { return errors.New("invalid replset status") } diff --git a/cmd/mongodb-healthcheck/healthcheck/readiness.go b/cmd/mongodb-healthcheck/healthcheck/readiness.go index 644e6ddfe..fd45b9f83 100644 --- a/cmd/mongodb-healthcheck/healthcheck/readiness.go +++ b/cmd/mongodb-healthcheck/healthcheck/readiness.go @@ -44,7 +44,7 @@ func MongodReadinessCheck(ctx context.Context, cnf *db.Config) error { return err } - s, err := func() (*ReplSetStatus, error) { + s, err := func() (*mongo.Status, error) { cnf.Timeout = time.Second client, err := db.Dial(ctx, cnf) if err != nil { @@ -55,7 +55,7 @@ func MongodReadinessCheck(ctx context.Context, cnf *db.Config) error { err = errors.Wrap(derr, "failed to disconnect") } }() - rs, err := getStatus(ctx, client) + rs, err := client.RSStatus(ctx) if err != nil { return nil, err } diff --git a/cmd/mongodb-healthcheck/healthcheck/util.go b/cmd/mongodb-healthcheck/healthcheck/util.go deleted file mode 100644 index b4c3607f9..000000000 --- a/cmd/mongodb-healthcheck/healthcheck/util.go +++ /dev/null @@ -1,51 +0,0 @@ -package healthcheck - -import ( - "context" - "encoding/json" - - v "github.com/hashicorp/go-version" - "github.com/pkg/errors" - "go.mongodb.org/mongo-driver/bson" - "go.mongodb.org/mongo-driver/bson/primitive" - - "github.com/percona/percona-server-mongodb-operator/pkg/psmdb/mongo" -) - -func getStatus(ctx context.Context, client mongo.Client) (ReplSetStatus, error) { - buildInfo, err := client.RSBuildInfo(ctx) - if err != nil { - return ReplSetStatus{}, errors.Wrap(err, "get buildInfo response") - } - - replSetStatusCommand := bson.D{{Key: "replSetGetStatus", Value: 1}} - mongoVersion := v.Must(v.NewVersion(buildInfo.Version)) - if mongoVersion.Compare(v.Must(v.NewVersion("4.2.1"))) < 0 { - // https://docs.mongodb.com/manual/reference/command/replSetGetStatus/#syntax - replSetStatusCommand = append(replSetStatusCommand, primitive.E{Key: "initialSync", Value: 1}) - } - - res := client.Database("admin").RunCommand(ctx, replSetStatusCommand) - if res.Err() != nil { - if res.Err().Error() == ErrNoReplsetConfigStr { - return ReplSetStatus{}, errors.New(ErrNoReplsetConfigStr) - } - return ReplSetStatus{}, errors.Wrap(res.Err(), "get replsetGetStatus response") - } - - // this is a workaround to fix decoding of empty interfaces - // https://jira.mongodb.org/browse/GODRIVER-988 - rsStatus := ReplSetStatus{} - tempResult := bson.M{} - if err := res.Decode(&tempResult); err != nil { - return ReplSetStatus{}, errors.Wrap(err, "decode replsetGetStatus response") - } - result, err := json.Marshal(tempResult) - if err != nil { - return ReplSetStatus{}, errors.Wrap(err, "marshal temp result") - } - if err = json.Unmarshal(result, &rsStatus); err != nil { - return ReplSetStatus{}, errors.Wrap(err, "unmarshal temp result") - } - return rsStatus, nil -} diff --git a/pkg/psmdb/mongo/models.go b/pkg/psmdb/mongo/models.go index 8f6fb7855..ab8f8a2c7 100644 --- a/pkg/psmdb/mongo/models.go +++ b/pkg/psmdb/mongo/models.go @@ -136,6 +136,7 @@ type IsMasterResp struct { } type Status struct { + InitialSyncStatus any `bson:"initialSyncStatus" json:"initialSyncStatus"` Set string `bson:"set" json:"set"` Date time.Time `bson:"date" json:"date"` MyState MemberState `bson:"myState" json:"myState"` @@ -188,8 +189,10 @@ type StatusOptimes struct { DurableOptime *Optime `bson:"durableOpTime" json:"durableOpTime"` } -type MemberHealth int -type MemberState int +type ( + MemberHealth int + MemberState int +) const ( MemberHealthDown MemberHealth = iota From 01dedaaea29b893e4e81593bc5511000d1dc8144 Mon Sep 17 00:00:00 2001 From: Andrii Dema Date: Tue, 27 May 2025 14:23:44 +0300 Subject: [PATCH 08/13] fix manifests --- deploy/bundle.yaml | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/deploy/bundle.yaml b/deploy/bundle.yaml index 30dff703b..2440d7902 100644 --- a/deploy/bundle.yaml +++ b/deploy/bundle.yaml @@ -25110,15 +25110,26 @@ apiVersion: apps/v1 kind: Deployment metadata: name: percona-server-mongodb-operator + labels: + app.kubernetes.io/component: operator + app.kubernetes.io/instance: percona-server-mongodb-operator + app.kubernetes.io/name: percona-server-mongodb-operator + app.kubernetes.io/part-of: percona-server-mongodb-operator spec: replicas: 1 selector: matchLabels: - name: percona-server-mongodb-operator + app.kubernetes.io/component: operator + app.kubernetes.io/instance: percona-server-mongodb-operator + app.kubernetes.io/name: percona-server-mongodb-operator + app.kubernetes.io/part-of: percona-server-mongodb-operator template: metadata: labels: - name: percona-server-mongodb-operator + app.kubernetes.io/component: operator + app.kubernetes.io/instance: percona-server-mongodb-operator + app.kubernetes.io/name: percona-server-mongodb-operator + app.kubernetes.io/part-of: percona-server-mongodb-operator spec: serviceAccountName: percona-server-mongodb-operator containers: From 62650d958513b183bc9d5133fc91123e4032f025 Mon Sep 17 00:00:00 2001 From: Andrii Dema Date: Thu, 29 May 2025 14:57:14 +0300 Subject: [PATCH 09/13] fix compare files --- .../compare/statefulset_some-name-rs0_restore-oc.yml | 6 ++++++ .../compare/statefulset_some-name-rs0_restore.yml | 6 ++++++ .../compare/statefulset_some-name-rs0_restore-oc.yml | 6 ++++++ .../compare/statefulset_some-name-rs0_restore.yml | 6 ++++++ .../compare/statefulset_some-name-rs0_restore-oc.yml | 6 ++++++ .../compare/statefulset_some-name-rs0_restore.yml | 6 ++++++ .../statefulset_some-name-rs0_restore_sharded-oc.yml | 6 ++++++ .../compare/statefulset_some-name-rs0_restore_sharded.yml | 6 ++++++ .../statefulset_some-name-rs0_restore_sharded-oc.yml | 6 ++++++ .../compare/statefulset_some-name-rs0_restore_sharded.yml | 6 ++++++ .../statefulset_some-name-rs0_restore_sharded-oc.yml | 6 ++++++ .../compare/statefulset_some-name-rs0_restore_sharded.yml | 6 ++++++ .../statefulset_some-name-rs0_restore_sharded-oc.yml | 6 ++++++ .../compare/statefulset_some-name-rs0_restore_sharded.yml | 6 ++++++ 14 files changed, 84 insertions(+) diff --git a/e2e-tests/demand-backup-physical-aws/compare/statefulset_some-name-rs0_restore-oc.yml b/e2e-tests/demand-backup-physical-aws/compare/statefulset_some-name-rs0_restore-oc.yml index 274ba54ba..adf054a1e 100644 --- a/e2e-tests/demand-backup-physical-aws/compare/statefulset_some-name-rs0_restore-oc.yml +++ b/e2e-tests/demand-backup-physical-aws/compare/statefulset_some-name-rs0_restore-oc.yml @@ -127,6 +127,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/demand-backup-physical-aws/compare/statefulset_some-name-rs0_restore.yml b/e2e-tests/demand-backup-physical-aws/compare/statefulset_some-name-rs0_restore.yml index 08273fb3d..3de329b2f 100644 --- a/e2e-tests/demand-backup-physical-aws/compare/statefulset_some-name-rs0_restore.yml +++ b/e2e-tests/demand-backup-physical-aws/compare/statefulset_some-name-rs0_restore.yml @@ -127,6 +127,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/demand-backup-physical-azure/compare/statefulset_some-name-rs0_restore-oc.yml b/e2e-tests/demand-backup-physical-azure/compare/statefulset_some-name-rs0_restore-oc.yml index 274ba54ba..adf054a1e 100644 --- a/e2e-tests/demand-backup-physical-azure/compare/statefulset_some-name-rs0_restore-oc.yml +++ b/e2e-tests/demand-backup-physical-azure/compare/statefulset_some-name-rs0_restore-oc.yml @@ -127,6 +127,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/demand-backup-physical-azure/compare/statefulset_some-name-rs0_restore.yml b/e2e-tests/demand-backup-physical-azure/compare/statefulset_some-name-rs0_restore.yml index 08273fb3d..3de329b2f 100644 --- a/e2e-tests/demand-backup-physical-azure/compare/statefulset_some-name-rs0_restore.yml +++ b/e2e-tests/demand-backup-physical-azure/compare/statefulset_some-name-rs0_restore.yml @@ -127,6 +127,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/demand-backup-physical-minio/compare/statefulset_some-name-rs0_restore-oc.yml b/e2e-tests/demand-backup-physical-minio/compare/statefulset_some-name-rs0_restore-oc.yml index 274ba54ba..adf054a1e 100644 --- a/e2e-tests/demand-backup-physical-minio/compare/statefulset_some-name-rs0_restore-oc.yml +++ b/e2e-tests/demand-backup-physical-minio/compare/statefulset_some-name-rs0_restore-oc.yml @@ -127,6 +127,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/demand-backup-physical-minio/compare/statefulset_some-name-rs0_restore.yml b/e2e-tests/demand-backup-physical-minio/compare/statefulset_some-name-rs0_restore.yml index 08273fb3d..3de329b2f 100644 --- a/e2e-tests/demand-backup-physical-minio/compare/statefulset_some-name-rs0_restore.yml +++ b/e2e-tests/demand-backup-physical-minio/compare/statefulset_some-name-rs0_restore.yml @@ -127,6 +127,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/demand-backup-physical-sharded-azure/compare/statefulset_some-name-rs0_restore_sharded-oc.yml b/e2e-tests/demand-backup-physical-sharded-azure/compare/statefulset_some-name-rs0_restore_sharded-oc.yml index cdd5647ea..7887b826e 100644 --- a/e2e-tests/demand-backup-physical-sharded-azure/compare/statefulset_some-name-rs0_restore_sharded-oc.yml +++ b/e2e-tests/demand-backup-physical-sharded-azure/compare/statefulset_some-name-rs0_restore_sharded-oc.yml @@ -128,6 +128,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/demand-backup-physical-sharded-azure/compare/statefulset_some-name-rs0_restore_sharded.yml b/e2e-tests/demand-backup-physical-sharded-azure/compare/statefulset_some-name-rs0_restore_sharded.yml index 8ce5f5087..e535b02b7 100644 --- a/e2e-tests/demand-backup-physical-sharded-azure/compare/statefulset_some-name-rs0_restore_sharded.yml +++ b/e2e-tests/demand-backup-physical-sharded-azure/compare/statefulset_some-name-rs0_restore_sharded.yml @@ -128,6 +128,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/demand-backup-physical-sharded-gcp/compare/statefulset_some-name-rs0_restore_sharded-oc.yml b/e2e-tests/demand-backup-physical-sharded-gcp/compare/statefulset_some-name-rs0_restore_sharded-oc.yml index cdd5647ea..7887b826e 100644 --- a/e2e-tests/demand-backup-physical-sharded-gcp/compare/statefulset_some-name-rs0_restore_sharded-oc.yml +++ b/e2e-tests/demand-backup-physical-sharded-gcp/compare/statefulset_some-name-rs0_restore_sharded-oc.yml @@ -128,6 +128,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/demand-backup-physical-sharded-gcp/compare/statefulset_some-name-rs0_restore_sharded.yml b/e2e-tests/demand-backup-physical-sharded-gcp/compare/statefulset_some-name-rs0_restore_sharded.yml index 8ce5f5087..e535b02b7 100644 --- a/e2e-tests/demand-backup-physical-sharded-gcp/compare/statefulset_some-name-rs0_restore_sharded.yml +++ b/e2e-tests/demand-backup-physical-sharded-gcp/compare/statefulset_some-name-rs0_restore_sharded.yml @@ -128,6 +128,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/demand-backup-physical-sharded-minio/compare/statefulset_some-name-rs0_restore_sharded-oc.yml b/e2e-tests/demand-backup-physical-sharded-minio/compare/statefulset_some-name-rs0_restore_sharded-oc.yml index cdd5647ea..7887b826e 100644 --- a/e2e-tests/demand-backup-physical-sharded-minio/compare/statefulset_some-name-rs0_restore_sharded-oc.yml +++ b/e2e-tests/demand-backup-physical-sharded-minio/compare/statefulset_some-name-rs0_restore_sharded-oc.yml @@ -128,6 +128,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/demand-backup-physical-sharded-minio/compare/statefulset_some-name-rs0_restore_sharded.yml b/e2e-tests/demand-backup-physical-sharded-minio/compare/statefulset_some-name-rs0_restore_sharded.yml index 8ce5f5087..e535b02b7 100644 --- a/e2e-tests/demand-backup-physical-sharded-minio/compare/statefulset_some-name-rs0_restore_sharded.yml +++ b/e2e-tests/demand-backup-physical-sharded-minio/compare/statefulset_some-name-rs0_restore_sharded.yml @@ -128,6 +128,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/demand-backup-physical-sharded-parallel/compare/statefulset_some-name-rs0_restore_sharded-oc.yml b/e2e-tests/demand-backup-physical-sharded-parallel/compare/statefulset_some-name-rs0_restore_sharded-oc.yml index cdd5647ea..7887b826e 100644 --- a/e2e-tests/demand-backup-physical-sharded-parallel/compare/statefulset_some-name-rs0_restore_sharded-oc.yml +++ b/e2e-tests/demand-backup-physical-sharded-parallel/compare/statefulset_some-name-rs0_restore_sharded-oc.yml @@ -128,6 +128,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/demand-backup-physical-sharded-parallel/compare/statefulset_some-name-rs0_restore_sharded.yml b/e2e-tests/demand-backup-physical-sharded-parallel/compare/statefulset_some-name-rs0_restore_sharded.yml index 8ce5f5087..e535b02b7 100644 --- a/e2e-tests/demand-backup-physical-sharded-parallel/compare/statefulset_some-name-rs0_restore_sharded.yml +++ b/e2e-tests/demand-backup-physical-sharded-parallel/compare/statefulset_some-name-rs0_restore_sharded.yml @@ -128,6 +128,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 From 5116da4427317144ff9ce5cacc8110f9f100a604 Mon Sep 17 00:00:00 2001 From: Andrii Dema Date: Fri, 30 May 2025 01:02:26 +0300 Subject: [PATCH 10/13] fix tests --- .../compare/statefulset_some-name-rs0-hidden.yml | 6 ++++++ .../compare/statefulset_some-name-rs0-nv.yml | 6 ++++++ .../compare/statefulset_some-name-rs0.yml | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/e2e-tests/non-voting-and-hidden/compare/statefulset_some-name-rs0-hidden.yml b/e2e-tests/non-voting-and-hidden/compare/statefulset_some-name-rs0-hidden.yml index ae8af0974..f7241fe89 100644 --- a/e2e-tests/non-voting-and-hidden/compare/statefulset_some-name-rs0-hidden.yml +++ b/e2e-tests/non-voting-and-hidden/compare/statefulset_some-name-rs0-hidden.yml @@ -114,6 +114,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/non-voting-and-hidden/compare/statefulset_some-name-rs0-nv.yml b/e2e-tests/non-voting-and-hidden/compare/statefulset_some-name-rs0-nv.yml index 88905b62c..6cbbe3053 100644 --- a/e2e-tests/non-voting-and-hidden/compare/statefulset_some-name-rs0-nv.yml +++ b/e2e-tests/non-voting-and-hidden/compare/statefulset_some-name-rs0-nv.yml @@ -114,6 +114,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/non-voting-and-hidden/compare/statefulset_some-name-rs0.yml b/e2e-tests/non-voting-and-hidden/compare/statefulset_some-name-rs0.yml index 3f22c5af9..db88f6fae 100644 --- a/e2e-tests/non-voting-and-hidden/compare/statefulset_some-name-rs0.yml +++ b/e2e-tests/non-voting-and-hidden/compare/statefulset_some-name-rs0.yml @@ -114,6 +114,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 From 8fc44b863b1d9fe29d22a37b4620bd6cd26f6a34 Mon Sep 17 00:00:00 2001 From: Andrii Dema Date: Fri, 30 May 2025 15:04:22 +0300 Subject: [PATCH 11/13] add readiness probe to hidden replsets --- pkg/apis/psmdb/v1/psmdb_defaults.go | 10 ++++++++-- .../testdata/reconcile-statefulset/rs0-hidden.yaml | 6 ++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/pkg/apis/psmdb/v1/psmdb_defaults.go b/pkg/apis/psmdb/v1/psmdb_defaults.go index 71033d4ae..5dcaabd09 100644 --- a/pkg/apis/psmdb/v1/psmdb_defaults.go +++ b/pkg/apis/psmdb/v1/psmdb_defaults.go @@ -929,7 +929,7 @@ func (h *HiddenSpec) setLivenessProbe(cr *PerconaServerMongoDB, rs *ReplsetSpec) } } -func (h *HiddenSpec) setReadinessProbe(rs *ReplsetSpec) { +func (h *HiddenSpec) setReadinessProbe(cr *PerconaServerMongoDB, rs *ReplsetSpec) { if h.ReadinessProbe == nil { h.ReadinessProbe = &corev1.Probe{} } @@ -942,6 +942,12 @@ func (h *HiddenSpec) setReadinessProbe(rs *ReplsetSpec) { "--component", "mongod", }, } + if cr.TLSEnabled() { + h.ReadinessProbe.Exec.Command = append(h.ReadinessProbe.Exec.Command, + "--ssl", "--sslInsecure", + "--sslCAFile", "/etc/mongodb-ssl/ca.crt", + "--sslPEMKeyFile", "/tmp/tls.pem") + } } if h.ReadinessProbe.InitialDelaySeconds < 1 { h.ReadinessProbe.InitialDelaySeconds = rs.ReadinessProbe.InitialDelaySeconds @@ -971,7 +977,7 @@ func (h *HiddenSpec) SetDefaults(cr *PerconaServerMongoDB, rs *ReplsetSpec) erro } h.setLivenessProbe(cr, rs) - h.setReadinessProbe(rs) + h.setReadinessProbe(cr, rs) if len(h.ServiceAccountName) == 0 { h.ServiceAccountName = WorkloadSA diff --git a/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/rs0-hidden.yaml b/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/rs0-hidden.yaml index 2ac346974..4be22a2cb 100644 --- a/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/rs0-hidden.yaml +++ b/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/rs0-hidden.yaml @@ -115,6 +115,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 From 5059ea57325fc9e4a1838fd3d1780cc731b35a66 Mon Sep 17 00:00:00 2001 From: Andrii Dema Date: Mon, 2 Jun 2025 12:54:23 +0300 Subject: [PATCH 12/13] ignore invalid replset --- cmd/mongodb-healthcheck/healthcheck/readiness.go | 3 +++ pkg/psmdb/mongo/mongo.go | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/cmd/mongodb-healthcheck/healthcheck/readiness.go b/cmd/mongodb-healthcheck/healthcheck/readiness.go index fd45b9f83..af066489b 100644 --- a/cmd/mongodb-healthcheck/healthcheck/readiness.go +++ b/cmd/mongodb-healthcheck/healthcheck/readiness.go @@ -57,6 +57,9 @@ func MongodReadinessCheck(ctx context.Context, cnf *db.Config) error { }() rs, err := client.RSStatus(ctx) if err != nil { + if errors.Is(err, mongo.ErrInvalidReplsetConfig) { + return nil, nil + } return nil, err } return &rs, nil diff --git a/pkg/psmdb/mongo/mongo.go b/pkg/psmdb/mongo/mongo.go index 7e3891c3f..30e0e3f39 100644 --- a/pkg/psmdb/mongo/mongo.go +++ b/pkg/psmdb/mongo/mongo.go @@ -375,11 +375,18 @@ func (client *mongoClient) WriteConfig(ctx context.Context, cfg RSConfig, force return nil } +var ErrInvalidReplsetConfig = errors.New("invalid replicaset config") + func (client *mongoClient) RSStatus(ctx context.Context) (Status, error) { status := Status{} resp := client.Database("admin").RunCommand(ctx, bson.D{{Key: "replSetGetStatus", Value: 1}}) if resp.Err() != nil { + if cmdErr, ok := resp.Err().(mongo.CommandError); ok { + if cmdErr.Code == 93 { + return status, ErrInvalidReplsetConfig + } + } return status, errors.Wrap(resp.Err(), "replSetGetStatus") } From cd834df28df9b61510cd3bdf17208295c4489164 Mon Sep 17 00:00:00 2001 From: Andrii Dema Date: Wed, 11 Jun 2025 16:39:23 +0300 Subject: [PATCH 13/13] fix upgrade-consistency test --- .../compare/statefulset_some-name-cfg-1210-oc.yml | 8 +++++++- .../compare/statefulset_some-name-cfg-1210.yml | 8 +++++++- .../compare/statefulset_some-name-rs0-1210-oc.yml | 8 +++++++- .../compare/statefulset_some-name-rs0-1210.yml | 8 +++++++- 4 files changed, 28 insertions(+), 4 deletions(-) diff --git a/e2e-tests/upgrade-consistency-sharded-tls/compare/statefulset_some-name-cfg-1210-oc.yml b/e2e-tests/upgrade-consistency-sharded-tls/compare/statefulset_some-name-cfg-1210-oc.yml index 1640b7b61..a04891b42 100644 --- a/e2e-tests/upgrade-consistency-sharded-tls/compare/statefulset_some-name-cfg-1210-oc.yml +++ b/e2e-tests/upgrade-consistency-sharded-tls/compare/statefulset_some-name-cfg-1210-oc.yml @@ -2,7 +2,7 @@ apiVersion: apps/v1 kind: StatefulSet metadata: annotations: {} - generation: 7 + generation: 8 labels: app.kubernetes.io/component: cfg app.kubernetes.io/instance: some-name @@ -115,6 +115,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 3 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/upgrade-consistency-sharded-tls/compare/statefulset_some-name-cfg-1210.yml b/e2e-tests/upgrade-consistency-sharded-tls/compare/statefulset_some-name-cfg-1210.yml index bfd388030..5902bdbad 100644 --- a/e2e-tests/upgrade-consistency-sharded-tls/compare/statefulset_some-name-cfg-1210.yml +++ b/e2e-tests/upgrade-consistency-sharded-tls/compare/statefulset_some-name-cfg-1210.yml @@ -2,7 +2,7 @@ apiVersion: apps/v1 kind: StatefulSet metadata: annotations: {} - generation: 7 + generation: 8 labels: app.kubernetes.io/component: cfg app.kubernetes.io/instance: some-name @@ -115,6 +115,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 3 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/upgrade-consistency-sharded-tls/compare/statefulset_some-name-rs0-1210-oc.yml b/e2e-tests/upgrade-consistency-sharded-tls/compare/statefulset_some-name-rs0-1210-oc.yml index 794034ad9..c06308465 100644 --- a/e2e-tests/upgrade-consistency-sharded-tls/compare/statefulset_some-name-rs0-1210-oc.yml +++ b/e2e-tests/upgrade-consistency-sharded-tls/compare/statefulset_some-name-rs0-1210-oc.yml @@ -2,7 +2,7 @@ apiVersion: apps/v1 kind: StatefulSet metadata: annotations: {} - generation: 7 + generation: 8 labels: app.kubernetes.io/component: mongod app.kubernetes.io/instance: some-name @@ -116,6 +116,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3 diff --git a/e2e-tests/upgrade-consistency-sharded-tls/compare/statefulset_some-name-rs0-1210.yml b/e2e-tests/upgrade-consistency-sharded-tls/compare/statefulset_some-name-rs0-1210.yml index 148a09afe..d1a8625ce 100644 --- a/e2e-tests/upgrade-consistency-sharded-tls/compare/statefulset_some-name-rs0-1210.yml +++ b/e2e-tests/upgrade-consistency-sharded-tls/compare/statefulset_some-name-rs0-1210.yml @@ -2,7 +2,7 @@ apiVersion: apps/v1 kind: StatefulSet metadata: annotations: {} - generation: 7 + generation: 8 labels: app.kubernetes.io/component: mongod app.kubernetes.io/instance: some-name @@ -116,6 +116,12 @@ spec: - readiness - --component - mongod + - --ssl + - --sslInsecure + - --sslCAFile + - /etc/mongodb-ssl/ca.crt + - --sslPEMKeyFile + - /tmp/tls.pem failureThreshold: 8 initialDelaySeconds: 10 periodSeconds: 3