From 197b62ea4511df61656c61a8879efe8e0545a02b Mon Sep 17 00:00:00 2001 From: George Kechagias Date: Tue, 18 Feb 2025 17:02:40 +0200 Subject: [PATCH 01/16] K8SPSMDB-1256 refactor pbm mongo uri construction --- build/pbm-entry.sh | 7 +-- .../perconaservermongodb/statefulset.go | 12 +++- .../perconaservermongodb/statefulset_test.go | 5 ++ .../reconcile-statefulset/cfg-arbiter.yaml | 2 +- .../reconcile-statefulset/cfg-mongod.yaml | 2 +- .../reconcile-statefulset/cfg-nv.yaml | 2 +- .../reconcile-statefulset/rs0-mongod.yaml | 2 +- .../reconcile-statefulset/rs0-nv.yaml | 2 +- pkg/psmdb/statefulset.go | 55 +++++++++++++++++-- 9 files changed, 70 insertions(+), 19 deletions(-) diff --git a/build/pbm-entry.sh b/build/pbm-entry.sh index e85e3eaef2..c40cf7ef62 100755 --- a/build/pbm-entry.sh +++ b/build/pbm-entry.sh @@ -1,15 +1,10 @@ #!/bin/bash -PBM_MONGODB_URI="mongodb://${PBM_AGENT_MONGODB_USERNAME}:${PBM_AGENT_MONGODB_PASSWORD}@localhost:${PBM_MONGODB_PORT}/?replicaSet=${PBM_MONGODB_REPLSET}" - if [[ -z ${PBM_AGENT_TLS_ENABLED} ]] || [[ ${PBM_AGENT_TLS_ENABLED} == "true" ]]; then MONGO_SSL_DIR=/etc/mongodb-ssl - if [[ -f "${MONGO_SSL_DIR}/tls.crt" ]] && [[ -f "${MONGO_SSL_DIR}/tls.key" ]]; then - PBM_MONGODB_URI="${PBM_MONGODB_URI}&tls=true&tlsCertificateKeyFile=%2Ftmp%2Ftls.pem&tlsCAFile=${MONGO_SSL_DIR}%2Fca.crt&tlsInsecure=true" + if [[ -e "${MONGO_SSL_DIR}/tls.crt" ]] && [[ -e "${MONGO_SSL_DIR}/tls.key" ]]; then cat "${MONGO_SSL_DIR}/tls.key" "${MONGO_SSL_DIR}/tls.crt" >/tmp/tls.pem fi fi -export PBM_MONGODB_URI - exec "$@" diff --git a/pkg/controller/perconaservermongodb/statefulset.go b/pkg/controller/perconaservermongodb/statefulset.go index f2be71b513..d71d221e74 100644 --- a/pkg/controller/perconaservermongodb/statefulset.go +++ b/pkg/controller/perconaservermongodb/statefulset.go @@ -106,13 +106,19 @@ func (r *ReconcilePerconaServerMongoDB) getStatefulsetFromReplset(ctx context.Co return nil, errors.Wrap(err, "check if mongod custom configuration exists") } - secret := new(corev1.Secret) - err = r.client.Get(ctx, types.NamespacedName{Name: api.UserSecretName(cr), Namespace: cr.Namespace}, secret) + usersSecret := new(corev1.Secret) + err = r.client.Get(ctx, types.NamespacedName{Name: api.UserSecretName(cr), Namespace: cr.Namespace}, usersSecret) if client.IgnoreNotFound(err) != nil { return nil, errors.Wrap(err, "check pmm secrets") } - sfsSpec, err := psmdb.StatefulSpec(ctx, cr, rs, ls, r.initImage, customConfig, secret) + sslSecret := new(corev1.Secret) + err = r.client.Get(ctx, types.NamespacedName{Name: api.SSLSecretName(cr), Namespace: cr.Namespace}, sslSecret) + if client.IgnoreNotFound(err) != nil { + return nil, errors.Wrap(err, "check ssl secrets") + } + + sfsSpec, err := psmdb.StatefulSpec(ctx, cr, rs, ls, r.initImage, customConfig, psmdb.StatefulSpecSecretParams{UsersSecret: usersSecret, SSLSecret: sslSecret}) if err != nil { return nil, errors.Wrapf(err, "create StatefulSet.Spec %s", sfs.Name) } diff --git a/pkg/controller/perconaservermongodb/statefulset_test.go b/pkg/controller/perconaservermongodb/statefulset_test.go index ca07689f90..f2d7b9b374 100644 --- a/pkg/controller/perconaservermongodb/statefulset_test.go +++ b/pkg/controller/perconaservermongodb/statefulset_test.go @@ -95,6 +95,11 @@ func TestReconcileStatefulSet(t *testing.T) { Name: crName + "-ssl", Namespace: tt.cr.Namespace, }, + Data: map[string][]byte{ + "ca.crt": []byte("fake-ca-cert"), + "tls.crt": []byte("fake-tls-cert"), + "tls.key": []byte("fake-tls-key"), + }, }, &corev1.Secret{ ObjectMeta: metav1.ObjectMeta{ Name: crName + "-ssl-internal", diff --git a/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/cfg-arbiter.yaml b/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/cfg-arbiter.yaml index a0ceb771ce..20fa6acadf 100644 --- a/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/cfg-arbiter.yaml +++ b/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/cfg-arbiter.yaml @@ -182,7 +182,7 @@ spec: fieldRef: fieldPath: metadata.name - name: PBM_MONGODB_URI - value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME) + value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME)/?replicaSet=$(PBM_MONGODB_REPLSET)&tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true - name: PBM_AGENT_TLS_ENABLED value: "true" image: perconalab/percona-server-mongodb-operator:main-backup diff --git a/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/cfg-mongod.yaml b/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/cfg-mongod.yaml index a0ceb771ce..20fa6acadf 100644 --- a/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/cfg-mongod.yaml +++ b/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/cfg-mongod.yaml @@ -182,7 +182,7 @@ spec: fieldRef: fieldPath: metadata.name - name: PBM_MONGODB_URI - value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME) + value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME)/?replicaSet=$(PBM_MONGODB_REPLSET)&tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true - name: PBM_AGENT_TLS_ENABLED value: "true" image: perconalab/percona-server-mongodb-operator:main-backup diff --git a/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/cfg-nv.yaml b/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/cfg-nv.yaml index a0ceb771ce..20fa6acadf 100644 --- a/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/cfg-nv.yaml +++ b/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/cfg-nv.yaml @@ -182,7 +182,7 @@ spec: fieldRef: fieldPath: metadata.name - name: PBM_MONGODB_URI - value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME) + value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME)/?replicaSet=$(PBM_MONGODB_REPLSET)&tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true - name: PBM_AGENT_TLS_ENABLED value: "true" image: perconalab/percona-server-mongodb-operator:main-backup diff --git a/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/rs0-mongod.yaml b/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/rs0-mongod.yaml index e2be9a2c6f..716e26935f 100644 --- a/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/rs0-mongod.yaml +++ b/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/rs0-mongod.yaml @@ -182,7 +182,7 @@ spec: fieldRef: fieldPath: metadata.name - name: PBM_MONGODB_URI - value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME) + value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME)/?replicaSet=$(PBM_MONGODB_REPLSET)&tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true - name: PBM_AGENT_TLS_ENABLED value: "true" image: perconalab/percona-server-mongodb-operator:main-backup diff --git a/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/rs0-nv.yaml b/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/rs0-nv.yaml index da0d5137d2..3eeae8a7d0 100644 --- a/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/rs0-nv.yaml +++ b/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/rs0-nv.yaml @@ -181,7 +181,7 @@ spec: fieldRef: fieldPath: metadata.name - name: PBM_MONGODB_URI - value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME) + value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME)/?replicaSet=$(PBM_MONGODB_REPLSET)&tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true - name: PBM_AGENT_TLS_ENABLED value: "true" image: perconalab/percona-server-mongodb-operator:main-backup diff --git a/pkg/psmdb/statefulset.go b/pkg/psmdb/statefulset.go index 381958e69c..53ab45c72b 100644 --- a/pkg/psmdb/statefulset.go +++ b/pkg/psmdb/statefulset.go @@ -31,10 +31,16 @@ func NewStatefulSet(name, namespace string) *appsv1.StatefulSet { var secretFileMode int32 = 288 +// StatefulSpecSecretParams contains secrets params for the StatefulSpec. +type StatefulSpecSecretParams struct { + UsersSecret *corev1.Secret + SSLSecret *corev1.Secret +} + // StatefulSpec returns spec for stateful set // TODO: Unify Arbiter and Node. Shoudn't be 100500 parameters func StatefulSpec(ctx context.Context, cr *api.PerconaServerMongoDB, replset *api.ReplsetSpec, - ls map[string]string, initImage string, customConf CustomConfig, usersSecret *corev1.Secret, + ls map[string]string, initImage string, customConf CustomConfig, secrets StatefulSpecSecretParams, ) (appsv1.StatefulSetSpec, error) { log := logf.FromContext(ctx) size := replset.Size @@ -259,10 +265,10 @@ func StatefulSpec(ctx context.Context, cr *api.PerconaServerMongoDB, replset *ap if name, err := replset.CustomReplsetName(); err == nil { rsName = name } - containers = append(containers, backupAgentContainer(cr, rsName, replset.GetPort(), cr.TLSEnabled())) + containers = append(containers, backupAgentContainer(ctx, cr, rsName, replset.GetPort(), cr.TLSEnabled(), secrets.SSLSecret)) } - pmmC := AddPMMContainer(cr, usersSecret, replset.GetPort(), cr.Spec.PMM.MongodParams) + pmmC := AddPMMContainer(cr, secrets.UsersSecret, replset.GetPort(), cr.Spec.PMM.MongodParams) if pmmC != nil { containers = append(containers, *pmmC) } @@ -323,7 +329,7 @@ func StatefulSpec(ctx context.Context, cr *api.PerconaServerMongoDB, replset *ap } // backupAgentContainer creates the container object for a backup agent -func backupAgentContainer(cr *api.PerconaServerMongoDB, replsetName string, port int32, tlsEnabled bool) corev1.Container { +func backupAgentContainer(ctx context.Context, cr *api.PerconaServerMongoDB, replsetName string, port int32, tlsEnabled bool, sslSecret *corev1.Secret) corev1.Container { fvar := false usersSecretName := api.UserSecretName(cr) @@ -419,7 +425,7 @@ func backupAgentContainer(cr *api.PerconaServerMongoDB, replsetName string, port }, { Name: "PBM_MONGODB_URI", - Value: "mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME)", + Value: buildMongoDBURI(ctx, tlsEnabled, sslSecret), }, }...) @@ -446,6 +452,45 @@ func backupAgentContainer(cr *api.PerconaServerMongoDB, replsetName string, port return c } +func buildMongoDBURI(ctx context.Context, tlsEnabled bool, sslSecret *corev1.Secret) string { + uri := "mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME)/?replicaSet=$(PBM_MONGODB_REPLSET)" + if tlsEnabled { + if ok := sslSecretDataExist(ctx, sslSecret); ok { + // the certificate tmp/tls.pem is created on the fly during the execution of build/pbm-entry.sh + uri += fmt.Sprintf( + "&tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=%s/ca.crt&tlsInsecure=true", + SSLDir, + ) + } + } + return uri +} + +func sslSecretDataExist(ctx context.Context, secret *corev1.Secret) bool { + log := logf.FromContext(ctx) + + requiredKeys := map[string]struct{}{ + "ca.crt": {}, + "tls.crt": {}, + "tls.key": {}, + } + + var missingKeys []string + + for key := range requiredKeys { + if _, exists := secret.Data[key]; !exists { + missingKeys = append(missingKeys, key) + } + } + + if len(missingKeys) > 0 { + log.Error(fmt.Errorf("SSL Secret is missing required keys: %v", missingKeys), "") + return false + } + + return true +} + func MongodCustomConfigName(clusterName, replicaSetName string) string { return fmt.Sprintf("%s-%s-mongod", clusterName, replicaSetName) } From e4543fe2b7a140759da900eb3d58cf5298b0a11c Mon Sep 17 00:00:00 2001 From: George Kechagias Date: Thu, 20 Feb 2025 13:08:35 +0200 Subject: [PATCH 02/16] cr: fix localhost, bring back port env usage and drop replicaset param from uri --- .../testdata/reconcile-statefulset/cfg-arbiter.yaml | 2 +- .../testdata/reconcile-statefulset/cfg-mongod.yaml | 2 +- .../testdata/reconcile-statefulset/cfg-nv.yaml | 2 +- .../testdata/reconcile-statefulset/rs0-mongod.yaml | 2 +- .../testdata/reconcile-statefulset/rs0-nv.yaml | 2 +- pkg/psmdb/statefulset.go | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/cfg-arbiter.yaml b/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/cfg-arbiter.yaml index 20fa6acadf..026813419b 100644 --- a/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/cfg-arbiter.yaml +++ b/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/cfg-arbiter.yaml @@ -182,7 +182,7 @@ spec: fieldRef: fieldPath: metadata.name - name: PBM_MONGODB_URI - value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME)/?replicaSet=$(PBM_MONGODB_REPLSET)&tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true + value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true - name: PBM_AGENT_TLS_ENABLED value: "true" image: perconalab/percona-server-mongodb-operator:main-backup diff --git a/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/cfg-mongod.yaml b/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/cfg-mongod.yaml index 20fa6acadf..026813419b 100644 --- a/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/cfg-mongod.yaml +++ b/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/cfg-mongod.yaml @@ -182,7 +182,7 @@ spec: fieldRef: fieldPath: metadata.name - name: PBM_MONGODB_URI - value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME)/?replicaSet=$(PBM_MONGODB_REPLSET)&tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true + value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true - name: PBM_AGENT_TLS_ENABLED value: "true" image: perconalab/percona-server-mongodb-operator:main-backup diff --git a/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/cfg-nv.yaml b/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/cfg-nv.yaml index 20fa6acadf..026813419b 100644 --- a/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/cfg-nv.yaml +++ b/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/cfg-nv.yaml @@ -182,7 +182,7 @@ spec: fieldRef: fieldPath: metadata.name - name: PBM_MONGODB_URI - value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME)/?replicaSet=$(PBM_MONGODB_REPLSET)&tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true + value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true - name: PBM_AGENT_TLS_ENABLED value: "true" image: perconalab/percona-server-mongodb-operator:main-backup diff --git a/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/rs0-mongod.yaml b/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/rs0-mongod.yaml index 716e26935f..d890459871 100644 --- a/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/rs0-mongod.yaml +++ b/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/rs0-mongod.yaml @@ -182,7 +182,7 @@ spec: fieldRef: fieldPath: metadata.name - name: PBM_MONGODB_URI - value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME)/?replicaSet=$(PBM_MONGODB_REPLSET)&tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true + value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true - name: PBM_AGENT_TLS_ENABLED value: "true" image: perconalab/percona-server-mongodb-operator:main-backup diff --git a/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/rs0-nv.yaml b/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/rs0-nv.yaml index 3eeae8a7d0..d688d64abd 100644 --- a/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/rs0-nv.yaml +++ b/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/rs0-nv.yaml @@ -181,7 +181,7 @@ spec: fieldRef: fieldPath: metadata.name - name: PBM_MONGODB_URI - value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME)/?replicaSet=$(PBM_MONGODB_REPLSET)&tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true + value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true - name: PBM_AGENT_TLS_ENABLED value: "true" image: perconalab/percona-server-mongodb-operator:main-backup diff --git a/pkg/psmdb/statefulset.go b/pkg/psmdb/statefulset.go index 53ab45c72b..534ff128d5 100644 --- a/pkg/psmdb/statefulset.go +++ b/pkg/psmdb/statefulset.go @@ -453,12 +453,12 @@ func backupAgentContainer(ctx context.Context, cr *api.PerconaServerMongoDB, rep } func buildMongoDBURI(ctx context.Context, tlsEnabled bool, sslSecret *corev1.Secret) string { - uri := "mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME)/?replicaSet=$(PBM_MONGODB_REPLSET)" + uri := "mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)" if tlsEnabled { if ok := sslSecretDataExist(ctx, sslSecret); ok { // the certificate tmp/tls.pem is created on the fly during the execution of build/pbm-entry.sh uri += fmt.Sprintf( - "&tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=%s/ca.crt&tlsInsecure=true", + "?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=%s/ca.crt&tlsInsecure=true", SSLDir, ) } From e565f6d0e274eb3ed67078e48f00d47904571723 Mon Sep 17 00:00:00 2001 From: George Kechagias Date: Thu, 20 Feb 2025 13:45:55 +0200 Subject: [PATCH 03/16] add / to the uri before params --- .../testdata/reconcile-statefulset/cfg-arbiter.yaml | 2 +- .../testdata/reconcile-statefulset/cfg-mongod.yaml | 2 +- .../testdata/reconcile-statefulset/cfg-nv.yaml | 2 +- .../testdata/reconcile-statefulset/rs0-mongod.yaml | 2 +- .../testdata/reconcile-statefulset/rs0-nv.yaml | 2 +- pkg/psmdb/statefulset.go | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/cfg-arbiter.yaml b/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/cfg-arbiter.yaml index 026813419b..1aeba53a1a 100644 --- a/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/cfg-arbiter.yaml +++ b/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/cfg-arbiter.yaml @@ -182,7 +182,7 @@ spec: fieldRef: fieldPath: metadata.name - name: PBM_MONGODB_URI - value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true + value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true - name: PBM_AGENT_TLS_ENABLED value: "true" image: perconalab/percona-server-mongodb-operator:main-backup diff --git a/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/cfg-mongod.yaml b/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/cfg-mongod.yaml index 026813419b..1aeba53a1a 100644 --- a/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/cfg-mongod.yaml +++ b/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/cfg-mongod.yaml @@ -182,7 +182,7 @@ spec: fieldRef: fieldPath: metadata.name - name: PBM_MONGODB_URI - value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true + value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true - name: PBM_AGENT_TLS_ENABLED value: "true" image: perconalab/percona-server-mongodb-operator:main-backup diff --git a/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/cfg-nv.yaml b/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/cfg-nv.yaml index 026813419b..1aeba53a1a 100644 --- a/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/cfg-nv.yaml +++ b/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/cfg-nv.yaml @@ -182,7 +182,7 @@ spec: fieldRef: fieldPath: metadata.name - name: PBM_MONGODB_URI - value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true + value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true - name: PBM_AGENT_TLS_ENABLED value: "true" image: perconalab/percona-server-mongodb-operator:main-backup diff --git a/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/rs0-mongod.yaml b/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/rs0-mongod.yaml index d890459871..5db729bfad 100644 --- a/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/rs0-mongod.yaml +++ b/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/rs0-mongod.yaml @@ -182,7 +182,7 @@ spec: fieldRef: fieldPath: metadata.name - name: PBM_MONGODB_URI - value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true + value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true - name: PBM_AGENT_TLS_ENABLED value: "true" image: perconalab/percona-server-mongodb-operator:main-backup diff --git a/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/rs0-nv.yaml b/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/rs0-nv.yaml index d688d64abd..e32e6998c6 100644 --- a/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/rs0-nv.yaml +++ b/pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/rs0-nv.yaml @@ -181,7 +181,7 @@ spec: fieldRef: fieldPath: metadata.name - name: PBM_MONGODB_URI - value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true + value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true - name: PBM_AGENT_TLS_ENABLED value: "true" image: perconalab/percona-server-mongodb-operator:main-backup diff --git a/pkg/psmdb/statefulset.go b/pkg/psmdb/statefulset.go index 534ff128d5..c805fb41ed 100644 --- a/pkg/psmdb/statefulset.go +++ b/pkg/psmdb/statefulset.go @@ -458,7 +458,7 @@ func buildMongoDBURI(ctx context.Context, tlsEnabled bool, sslSecret *corev1.Sec if ok := sslSecretDataExist(ctx, sslSecret); ok { // the certificate tmp/tls.pem is created on the fly during the execution of build/pbm-entry.sh uri += fmt.Sprintf( - "?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=%s/ca.crt&tlsInsecure=true", + "/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=%s/ca.crt&tlsInsecure=true", SSLDir, ) } From e4add83e7d80d5f347a38c7db8e3b6fd7b28c384 Mon Sep 17 00:00:00 2001 From: George Kechagias Date: Mon, 24 Feb 2025 11:02:57 +0200 Subject: [PATCH 04/16] fix e2e-tests/data-at-rest-encryption --- .../compare/statefulset_some-name-cfg-oc.yml | 2 +- .../compare/statefulset_some-name-cfg.yml | 2 +- .../compare/statefulset_some-name-rs0-oc.yml | 2 +- .../compare/statefulset_some-name-rs0.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) 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 6e5ddd977d..d4d352c3ec 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 @@ -166,7 +166,7 @@ spec: apiVersion: v1 fieldPath: metadata.name - name: PBM_MONGODB_URI - value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME) + value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true - name: PBM_AGENT_TLS_ENABLED value: "true" imagePullPolicy: Always 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 c4efd8c751..81bfea05f9 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 @@ -167,7 +167,7 @@ spec: apiVersion: v1 fieldPath: metadata.name - name: PBM_MONGODB_URI - value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME) + value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true - name: PBM_AGENT_TLS_ENABLED value: "true" imagePullPolicy: Always 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 25743202d7..87c7757d7a 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 @@ -173,7 +173,7 @@ spec: apiVersion: v1 fieldPath: metadata.name - name: PBM_MONGODB_URI - value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME) + value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true - name: PBM_AGENT_TLS_ENABLED value: "true" imagePullPolicy: Always 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 518c9fc0d2..f02736c7da 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 @@ -174,7 +174,7 @@ spec: apiVersion: v1 fieldPath: metadata.name - name: PBM_MONGODB_URI - value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME) + value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true - name: PBM_AGENT_TLS_ENABLED value: "true" imagePullPolicy: Always From b96a2e74fc6dddef36ed5611fa06ec5a340e957e Mon Sep 17 00:00:00 2001 From: George Kechagias Date: Mon, 24 Feb 2025 11:05:23 +0200 Subject: [PATCH 05/16] fix e2e-tests/demand-backup --- .../demand-backup/compare/statefulset_some-name-rs0-oc.yml | 2 +- e2e-tests/demand-backup/compare/statefulset_some-name-rs0.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 b4fb0d75df..cdb987280b 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 @@ -172,7 +172,7 @@ spec: apiVersion: v1 fieldPath: metadata.name - name: PBM_MONGODB_URI - value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME) + value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true - name: PBM_AGENT_TLS_ENABLED value: "true" imagePullPolicy: Always 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 0f781ccac0..34bbd119b3 100644 --- a/e2e-tests/demand-backup/compare/statefulset_some-name-rs0.yml +++ b/e2e-tests/demand-backup/compare/statefulset_some-name-rs0.yml @@ -173,7 +173,7 @@ spec: apiVersion: v1 fieldPath: metadata.name - name: PBM_MONGODB_URI - value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME) + value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true - name: PBM_AGENT_TLS_ENABLED value: "true" imagePullPolicy: Always From 2d84e0671fee9fde4cd805f4a42467712a7a5995 Mon Sep 17 00:00:00 2001 From: George Kechagias Date: Mon, 24 Feb 2025 11:06:22 +0200 Subject: [PATCH 06/16] fix e2e-tests/demand-backup-fs --- .../demand-backup-fs/compare/statefulset_some-name-rs0.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 6dbd4992bb..e4cf4aac76 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 @@ -182,7 +182,7 @@ spec: apiVersion: v1 fieldPath: metadata.name - name: PBM_MONGODB_URI - value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME) + value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true - name: PBM_AGENT_TLS_ENABLED value: "true" imagePullPolicy: Always From a55fceee60e2d4f28e2ab69595336cfd41b9bf83 Mon Sep 17 00:00:00 2001 From: George Kechagias Date: Mon, 24 Feb 2025 11:08:48 +0200 Subject: [PATCH 07/16] fix e2e-tests/demand-backup-sharded --- .../compare/statefulset_some-name-cfg-4-oc.yml | 2 +- .../compare/statefulset_some-name-cfg-oc.yml | 2 +- .../demand-backup-sharded/compare/statefulset_some-name-cfg.yml | 2 +- .../compare/statefulset_some-name-rs0-4-oc.yml | 2 +- .../compare/statefulset_some-name-rs0-oc.yml | 2 +- .../demand-backup-sharded/compare/statefulset_some-name-rs0.yml | 2 +- .../compare/statefulset_some-name-rs1-oc.yml | 2 +- .../demand-backup-sharded/compare/statefulset_some-name-rs1.yml | 2 +- .../compare/statefulset_some-name-rs2-oc.yml | 2 +- .../demand-backup-sharded/compare/statefulset_some-name-rs2.yml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) 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 4a9801f703..42e79c1d5b 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 @@ -190,7 +190,7 @@ spec: apiVersion: v1 fieldPath: metadata.name - name: PBM_MONGODB_URI - value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME) + value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true - name: PBM_AGENT_TLS_ENABLED value: "true" imagePullPolicy: Always 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 ffc395ab64..e5bcd8c4e1 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 @@ -190,7 +190,7 @@ spec: apiVersion: v1 fieldPath: metadata.name - name: PBM_MONGODB_URI - value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME) + value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true - name: PBM_AGENT_TLS_ENABLED value: "true" imagePullPolicy: Always 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 32757b47cf..c8841f11b2 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 @@ -191,7 +191,7 @@ spec: apiVersion: v1 fieldPath: metadata.name - name: PBM_MONGODB_URI - value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME) + value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true - name: PBM_AGENT_TLS_ENABLED value: "true" imagePullPolicy: Always 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 001a586e31..6356b63c3d 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 @@ -175,7 +175,7 @@ spec: apiVersion: v1 fieldPath: metadata.name - name: PBM_MONGODB_URI - value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME) + value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true - name: PBM_AGENT_TLS_ENABLED value: "true" imagePullPolicy: Always 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 c7adabbb9f..3698a079cc 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 @@ -175,7 +175,7 @@ spec: apiVersion: v1 fieldPath: metadata.name - name: PBM_MONGODB_URI - value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME) + value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true - name: PBM_AGENT_TLS_ENABLED value: "true" imagePullPolicy: Always 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 4d85e97e3c..c8d6f12f76 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 @@ -176,7 +176,7 @@ spec: apiVersion: v1 fieldPath: metadata.name - name: PBM_MONGODB_URI - value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME) + value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true - name: PBM_AGENT_TLS_ENABLED value: "true" imagePullPolicy: Always 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 ae398cf209..02b94ae13d 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 @@ -175,7 +175,7 @@ spec: apiVersion: v1 fieldPath: metadata.name - name: PBM_MONGODB_URI - value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME) + value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true - name: PBM_AGENT_TLS_ENABLED value: "true" imagePullPolicy: Always 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 d7f1e9eb79..ce0eb59747 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 @@ -176,7 +176,7 @@ spec: apiVersion: v1 fieldPath: metadata.name - name: PBM_MONGODB_URI - value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME) + value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true - name: PBM_AGENT_TLS_ENABLED value: "true" imagePullPolicy: Always 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 a2dbe65286..578a719bba 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 @@ -185,7 +185,7 @@ spec: apiVersion: v1 fieldPath: metadata.name - name: PBM_MONGODB_URI - value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME) + value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true - name: PBM_AGENT_TLS_ENABLED value: "true" imagePullPolicy: Always 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 3060b76644..2564242230 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 @@ -186,7 +186,7 @@ spec: apiVersion: v1 fieldPath: metadata.name - name: PBM_MONGODB_URI - value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME) + value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true - name: PBM_AGENT_TLS_ENABLED value: "true" imagePullPolicy: Always From 6ada3231296c74d0946ec3003b8404dc24c1b4bb Mon Sep 17 00:00:00 2001 From: George Kechagias Date: Mon, 24 Feb 2025 11:11:00 +0200 Subject: [PATCH 08/16] fix e2e-tests/liveness --- .../liveness/compare/statefulset_liveness-rs0-changed-oc.yml | 2 +- e2e-tests/liveness/compare/statefulset_liveness-rs0-changed.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/e2e-tests/liveness/compare/statefulset_liveness-rs0-changed-oc.yml b/e2e-tests/liveness/compare/statefulset_liveness-rs0-changed-oc.yml index ba90fcdf20..17cb0bbfeb 100644 --- a/e2e-tests/liveness/compare/statefulset_liveness-rs0-changed-oc.yml +++ b/e2e-tests/liveness/compare/statefulset_liveness-rs0-changed-oc.yml @@ -167,7 +167,7 @@ spec: apiVersion: v1 fieldPath: metadata.name - name: PBM_MONGODB_URI - value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME) + value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true - name: PBM_AGENT_TLS_ENABLED value: "true" imagePullPolicy: Always diff --git a/e2e-tests/liveness/compare/statefulset_liveness-rs0-changed.yml b/e2e-tests/liveness/compare/statefulset_liveness-rs0-changed.yml index d4e53c0894..9591a7fc74 100644 --- a/e2e-tests/liveness/compare/statefulset_liveness-rs0-changed.yml +++ b/e2e-tests/liveness/compare/statefulset_liveness-rs0-changed.yml @@ -168,7 +168,7 @@ spec: apiVersion: v1 fieldPath: metadata.name - name: PBM_MONGODB_URI - value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME) + value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true - name: PBM_AGENT_TLS_ENABLED value: "true" imagePullPolicy: Always From 8a35d1e316907c6f33033a0d34a28977fa6fc33d Mon Sep 17 00:00:00 2001 From: George Kechagias Date: Mon, 24 Feb 2025 11:18:56 +0200 Subject: [PATCH 09/16] fix e2e-tests/expose-sharded --- .../expose-sharded/compare/statefulset_some-name-cfg-4-oc.yml | 2 +- .../expose-sharded/compare/statefulset_some-name-cfg-oc.yml | 2 +- e2e-tests/expose-sharded/compare/statefulset_some-name-cfg.yml | 2 +- .../expose-sharded/compare/statefulset_some-name-rs0-4-oc.yml | 2 +- .../expose-sharded/compare/statefulset_some-name-rs0-oc.yml | 2 +- .../compare/statefulset_some-name-rs0-sharding-disabled-oc.yml | 2 +- .../compare/statefulset_some-name-rs0-sharding-disabled.yml | 2 +- .../compare/statefulset_some-name-rs0-sharding-enabled-oc.yml | 2 +- .../compare/statefulset_some-name-rs0-sharding-enabled.yml | 2 +- e2e-tests/expose-sharded/compare/statefulset_some-name-rs0.yml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) 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 45b359662f..35d73eea04 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 @@ -187,7 +187,7 @@ spec: apiVersion: v1 fieldPath: metadata.name - name: PBM_MONGODB_URI - value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME) + value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true - name: PBM_AGENT_TLS_ENABLED value: "true" imagePullPolicy: Always 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 c883f54598..b58c2103f9 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 @@ -187,7 +187,7 @@ spec: apiVersion: v1 fieldPath: metadata.name - name: PBM_MONGODB_URI - value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME) + value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true - name: PBM_AGENT_TLS_ENABLED value: "true" imagePullPolicy: Always 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 c461a21ab0..ef1556cff0 100644 --- a/e2e-tests/expose-sharded/compare/statefulset_some-name-cfg.yml +++ b/e2e-tests/expose-sharded/compare/statefulset_some-name-cfg.yml @@ -188,7 +188,7 @@ spec: apiVersion: v1 fieldPath: metadata.name - name: PBM_MONGODB_URI - value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME) + value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true - name: PBM_AGENT_TLS_ENABLED value: "true" imagePullPolicy: Always 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 23f09200f0..a8c18d088b 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 @@ -185,7 +185,7 @@ spec: apiVersion: v1 fieldPath: metadata.name - name: PBM_MONGODB_URI - value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME) + value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true - name: PBM_AGENT_TLS_ENABLED value: "true" imagePullPolicy: Always 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 23f09200f0..a8c18d088b 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 @@ -185,7 +185,7 @@ spec: apiVersion: v1 fieldPath: metadata.name - name: PBM_MONGODB_URI - value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME) + value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true - name: PBM_AGENT_TLS_ENABLED value: "true" imagePullPolicy: Always 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 149138432b..b1e02dafc0 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 @@ -182,7 +182,7 @@ spec: apiVersion: v1 fieldPath: metadata.name - name: PBM_MONGODB_URI - value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME) + value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true - name: PBM_AGENT_TLS_ENABLED value: "true" imagePullPolicy: Always 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 599510d3e9..49e3b62c12 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 @@ -183,7 +183,7 @@ spec: apiVersion: v1 fieldPath: metadata.name - name: PBM_MONGODB_URI - value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME) + value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true - name: PBM_AGENT_TLS_ENABLED value: "true" imagePullPolicy: Always 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 993b7d60c2..f86321352f 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 @@ -185,7 +185,7 @@ spec: apiVersion: v1 fieldPath: metadata.name - name: PBM_MONGODB_URI - value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME) + value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true - name: PBM_AGENT_TLS_ENABLED value: "true" imagePullPolicy: Always 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 92721accb9..ea8576114e 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 @@ -186,7 +186,7 @@ spec: apiVersion: v1 fieldPath: metadata.name - name: PBM_MONGODB_URI - value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME) + value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true - name: PBM_AGENT_TLS_ENABLED value: "true" imagePullPolicy: Always 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 b048e56140..5775d500ef 100644 --- a/e2e-tests/expose-sharded/compare/statefulset_some-name-rs0.yml +++ b/e2e-tests/expose-sharded/compare/statefulset_some-name-rs0.yml @@ -186,7 +186,7 @@ spec: apiVersion: v1 fieldPath: metadata.name - name: PBM_MONGODB_URI - value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME) + value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true - name: PBM_AGENT_TLS_ENABLED value: "true" imagePullPolicy: Always From 636ed474551722a20c054830f9706f58089bad96 Mon Sep 17 00:00:00 2001 From: George Kechagias Date: Mon, 24 Feb 2025 11:22:25 +0200 Subject: [PATCH 10/16] fix e2e-tests/pitr-sharded --- .../pitr-sharded/compare/statefulset_some-name-cfg-4-oc.yml | 2 +- e2e-tests/pitr-sharded/compare/statefulset_some-name-cfg-oc.yml | 2 +- e2e-tests/pitr-sharded/compare/statefulset_some-name-cfg.yml | 2 +- .../pitr-sharded/compare/statefulset_some-name-rs0-4-oc.yml | 2 +- e2e-tests/pitr-sharded/compare/statefulset_some-name-rs0-oc.yml | 2 +- e2e-tests/pitr-sharded/compare/statefulset_some-name-rs0.yml | 2 +- .../pitr-sharded/compare/statefulset_some-name-rs1-4-oc.yml | 2 +- e2e-tests/pitr-sharded/compare/statefulset_some-name-rs1-oc.yml | 2 +- e2e-tests/pitr-sharded/compare/statefulset_some-name-rs1.yml | 2 +- .../pitr-sharded/compare/statefulset_some-name-rs2-4-oc.yml | 2 +- e2e-tests/pitr-sharded/compare/statefulset_some-name-rs2-oc.yml | 2 +- e2e-tests/pitr-sharded/compare/statefulset_some-name-rs2.yml | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) 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 45b359662f..35d73eea04 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 @@ -187,7 +187,7 @@ spec: apiVersion: v1 fieldPath: metadata.name - name: PBM_MONGODB_URI - value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME) + value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true - name: PBM_AGENT_TLS_ENABLED value: "true" imagePullPolicy: Always 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 c883f54598..b58c2103f9 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 @@ -187,7 +187,7 @@ spec: apiVersion: v1 fieldPath: metadata.name - name: PBM_MONGODB_URI - value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME) + value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true - name: PBM_AGENT_TLS_ENABLED value: "true" imagePullPolicy: Always 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 c461a21ab0..ef1556cff0 100644 --- a/e2e-tests/pitr-sharded/compare/statefulset_some-name-cfg.yml +++ b/e2e-tests/pitr-sharded/compare/statefulset_some-name-cfg.yml @@ -188,7 +188,7 @@ spec: apiVersion: v1 fieldPath: metadata.name - name: PBM_MONGODB_URI - value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME) + value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true - name: PBM_AGENT_TLS_ENABLED value: "true" imagePullPolicy: Always 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 3635363d53..549a6c93cc 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 @@ -175,7 +175,7 @@ spec: apiVersion: v1 fieldPath: metadata.name - name: PBM_MONGODB_URI - value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME) + value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true - name: PBM_AGENT_TLS_ENABLED value: "true" imagePullPolicy: Always 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 7f01ca26ca..71d78af040 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 @@ -175,7 +175,7 @@ spec: apiVersion: v1 fieldPath: metadata.name - name: PBM_MONGODB_URI - value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME) + value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true - name: PBM_AGENT_TLS_ENABLED value: "true" imagePullPolicy: Always 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 3b81ccfc22..98cba043d2 100644 --- a/e2e-tests/pitr-sharded/compare/statefulset_some-name-rs0.yml +++ b/e2e-tests/pitr-sharded/compare/statefulset_some-name-rs0.yml @@ -176,7 +176,7 @@ spec: apiVersion: v1 fieldPath: metadata.name - name: PBM_MONGODB_URI - value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME) + value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true - name: PBM_AGENT_TLS_ENABLED value: "true" imagePullPolicy: Always 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 3838034b9f..e67e34372a 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 @@ -175,7 +175,7 @@ spec: apiVersion: v1 fieldPath: metadata.name - name: PBM_MONGODB_URI - value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME) + value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true - name: PBM_AGENT_TLS_ENABLED value: "true" imagePullPolicy: Always 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 2771671f2a..b9582d7041 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 @@ -173,7 +173,7 @@ spec: apiVersion: v1 fieldPath: metadata.name - name: PBM_MONGODB_URI - value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME) + value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true - name: PBM_AGENT_TLS_ENABLED value: "true" imagePullPolicy: Always 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 dda4712463..63079e11d4 100644 --- a/e2e-tests/pitr-sharded/compare/statefulset_some-name-rs1.yml +++ b/e2e-tests/pitr-sharded/compare/statefulset_some-name-rs1.yml @@ -176,7 +176,7 @@ spec: apiVersion: v1 fieldPath: metadata.name - name: PBM_MONGODB_URI - value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME) + value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true - name: PBM_AGENT_TLS_ENABLED value: "true" imagePullPolicy: Always 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 984320a552..29313c060e 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 @@ -185,7 +185,7 @@ spec: apiVersion: v1 fieldPath: metadata.name - name: PBM_MONGODB_URI - value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME) + value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true - name: PBM_AGENT_TLS_ENABLED value: "true" imagePullPolicy: Always 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 9346ce17f0..54c274c7db 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 @@ -183,7 +183,7 @@ spec: apiVersion: v1 fieldPath: metadata.name - name: PBM_MONGODB_URI - value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME) + value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true - name: PBM_AGENT_TLS_ENABLED value: "true" imagePullPolicy: Always 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 02599deb4a..69c54f13bd 100644 --- a/e2e-tests/pitr-sharded/compare/statefulset_some-name-rs2.yml +++ b/e2e-tests/pitr-sharded/compare/statefulset_some-name-rs2.yml @@ -186,7 +186,7 @@ spec: apiVersion: v1 fieldPath: metadata.name - name: PBM_MONGODB_URI - value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME) + value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true - name: PBM_AGENT_TLS_ENABLED value: "true" imagePullPolicy: Always From f15ad555d91a844770572e9ba6f84c7d650a6b71 Mon Sep 17 00:00:00 2001 From: George Kechagias Date: Mon, 24 Feb 2025 11:22:50 +0200 Subject: [PATCH 11/16] fix e2e-tests/pitr --- e2e-tests/pitr/compare/statefulset_some-name-rs0-oc.yml | 2 +- e2e-tests/pitr/compare/statefulset_some-name-rs0.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 b4fb0d75df..cdb987280b 100644 --- a/e2e-tests/pitr/compare/statefulset_some-name-rs0-oc.yml +++ b/e2e-tests/pitr/compare/statefulset_some-name-rs0-oc.yml @@ -172,7 +172,7 @@ spec: apiVersion: v1 fieldPath: metadata.name - name: PBM_MONGODB_URI - value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME) + value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true - name: PBM_AGENT_TLS_ENABLED value: "true" imagePullPolicy: Always diff --git a/e2e-tests/pitr/compare/statefulset_some-name-rs0.yml b/e2e-tests/pitr/compare/statefulset_some-name-rs0.yml index 0f781ccac0..34bbd119b3 100644 --- a/e2e-tests/pitr/compare/statefulset_some-name-rs0.yml +++ b/e2e-tests/pitr/compare/statefulset_some-name-rs0.yml @@ -173,7 +173,7 @@ spec: apiVersion: v1 fieldPath: metadata.name - name: PBM_MONGODB_URI - value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME) + value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true - name: PBM_AGENT_TLS_ENABLED value: "true" imagePullPolicy: Always From 20bb2ec1ccba81155e34aa67c15d755f1668eafd Mon Sep 17 00:00:00 2001 From: George Kechagias Date: Mon, 24 Feb 2025 11:23:10 +0200 Subject: [PATCH 12/16] fix e2e-tests/one-pod --- e2e-tests/one-pod/compare/statefulset_one-pod-rs0-oc.yml | 2 +- e2e-tests/one-pod/compare/statefulset_one-pod-rs0-secret-oc.yml | 2 +- e2e-tests/one-pod/compare/statefulset_one-pod-rs0-secret.yml | 2 +- e2e-tests/one-pod/compare/statefulset_one-pod-rs0.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) 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 ff3937b7cf..a69081bbd8 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 @@ -178,7 +178,7 @@ spec: apiVersion: v1 fieldPath: metadata.name - name: PBM_MONGODB_URI - value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME) + value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true - name: PBM_AGENT_TLS_ENABLED value: "true" imagePullPolicy: Always 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 80c3b60076..eac7a7fdb2 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 @@ -178,7 +178,7 @@ spec: apiVersion: v1 fieldPath: metadata.name - name: PBM_MONGODB_URI - value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME) + value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true - name: PBM_AGENT_TLS_ENABLED value: "true" imagePullPolicy: Always 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 73f9b9a9b2..9d948e2ff1 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 @@ -179,7 +179,7 @@ spec: apiVersion: v1 fieldPath: metadata.name - name: PBM_MONGODB_URI - value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME) + value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true - name: PBM_AGENT_TLS_ENABLED value: "true" imagePullPolicy: Always 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 1180803aee..4b8e87d2f3 100644 --- a/e2e-tests/one-pod/compare/statefulset_one-pod-rs0.yml +++ b/e2e-tests/one-pod/compare/statefulset_one-pod-rs0.yml @@ -179,7 +179,7 @@ spec: apiVersion: v1 fieldPath: metadata.name - name: PBM_MONGODB_URI - value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME) + value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true - name: PBM_AGENT_TLS_ENABLED value: "true" imagePullPolicy: Always From 1549636228a7a2faa14b6967e358d9cab30a38fb Mon Sep 17 00:00:00 2001 From: George Kechagias Date: Mon, 24 Feb 2025 11:56:00 +0200 Subject: [PATCH 13/16] fix e2e-tests/service-per-pod/ --- .../service-per-pod/compare/statefulset_cluster-ip-rs0-oc.yml | 2 +- .../service-per-pod/compare/statefulset_cluster-ip-rs0.yml | 2 +- .../compare/statefulset_local-balancer-rs0-oc.yml | 2 +- .../service-per-pod/compare/statefulset_local-balancer-rs0.yml | 2 +- .../service-per-pod/compare/statefulset_node-port-rs0-oc.yml | 2 +- e2e-tests/service-per-pod/compare/statefulset_node-port-rs0.yml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) 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 c5cbf500c5..3ac1b8465a 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 @@ -165,7 +165,7 @@ spec: apiVersion: v1 fieldPath: metadata.name - name: PBM_MONGODB_URI - value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME) + value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true - name: PBM_AGENT_TLS_ENABLED value: "true" imagePullPolicy: Always 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 65b85632ef..a91ad55e0c 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 @@ -166,7 +166,7 @@ spec: apiVersion: v1 fieldPath: metadata.name - name: PBM_MONGODB_URI - value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME) + value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true - name: PBM_AGENT_TLS_ENABLED value: "true" imagePullPolicy: Always 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 f666bd0ed1..fc580935e5 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 @@ -165,7 +165,7 @@ spec: apiVersion: v1 fieldPath: metadata.name - name: PBM_MONGODB_URI - value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME) + value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true - name: PBM_AGENT_TLS_ENABLED value: "true" imagePullPolicy: Always 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 073476605e..b478f4cbdb 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 @@ -166,7 +166,7 @@ spec: apiVersion: v1 fieldPath: metadata.name - name: PBM_MONGODB_URI - value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME) + value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true - name: PBM_AGENT_TLS_ENABLED value: "true" imagePullPolicy: Always 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 593e9768f7..4ef403c3fe 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 @@ -165,7 +165,7 @@ spec: apiVersion: v1 fieldPath: metadata.name - name: PBM_MONGODB_URI - value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME) + value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true - name: PBM_AGENT_TLS_ENABLED value: "true" imagePullPolicy: Always 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 f6ebbc1a70..2486c1041b 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 @@ -166,7 +166,7 @@ spec: apiVersion: v1 fieldPath: metadata.name - name: PBM_MONGODB_URI - value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME) + value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true - name: PBM_AGENT_TLS_ENABLED value: "true" imagePullPolicy: Always From 9e97e016a560cbcb8fdd91bf4f197b0ed4082767 Mon Sep 17 00:00:00 2001 From: George Kechagias Date: Mon, 24 Feb 2025 11:56:14 +0200 Subject: [PATCH 14/16] fix e2e-tests/security-context/compare/statefulset_sec-context-rs0-changed.yml --- .../compare/statefulset_sec-context-rs0-changed.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 30118519ff..9b4d28c18b 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 @@ -173,7 +173,7 @@ spec: apiVersion: v1 fieldPath: metadata.name - name: PBM_MONGODB_URI - value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME) + value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true - name: PBM_AGENT_TLS_ENABLED value: "true" imagePullPolicy: Always From db7c7c735c905cf0e4eed3cbdec7dee64b54c27b Mon Sep 17 00:00:00 2001 From: George Kechagias Date: Mon, 24 Feb 2025 11:56:30 +0200 Subject: [PATCH 15/16] fix e2e-tests/scheduled-backup --- .../scheduled-backup/compare/statefulset_some-name-rs0-oc.yml | 2 +- .../scheduled-backup/compare/statefulset_some-name-rs0.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 53da082309..c46a600949 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 @@ -172,7 +172,7 @@ spec: apiVersion: v1 fieldPath: metadata.name - name: PBM_MONGODB_URI - value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME) + value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true - name: PBM_AGENT_TLS_ENABLED value: "true" imagePullPolicy: Always 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 49832e53a9..e1592119c0 100644 --- a/e2e-tests/scheduled-backup/compare/statefulset_some-name-rs0.yml +++ b/e2e-tests/scheduled-backup/compare/statefulset_some-name-rs0.yml @@ -173,7 +173,7 @@ spec: apiVersion: v1 fieldPath: metadata.name - name: PBM_MONGODB_URI - value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME) + value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true - name: PBM_AGENT_TLS_ENABLED value: "true" imagePullPolicy: Always From 1a907dfccac5d96d212e7203517f0d82ed55ba82 Mon Sep 17 00:00:00 2001 From: George Kechagias Date: Tue, 25 Feb 2025 11:23:35 +0200 Subject: [PATCH 16/16] handle 1.20 uri --- pkg/psmdb/statefulset.go | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkg/psmdb/statefulset.go b/pkg/psmdb/statefulset.go index c805fb41ed..c4aab9968d 100644 --- a/pkg/psmdb/statefulset.go +++ b/pkg/psmdb/statefulset.go @@ -423,12 +423,18 @@ func backupAgentContainer(ctx context.Context, cr *api.PerconaServerMongoDB, rep }, }, }, - { - Name: "PBM_MONGODB_URI", - Value: buildMongoDBURI(ctx, tlsEnabled, sslSecret), - }, }...) + mongoDBURI := "mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME)" + if cr.CompareVersion("1.20.0") >= 0 { + mongoDBURI = buildMongoDBURI(ctx, tlsEnabled, sslSecret) + } + + c.Env = append(c.Env, corev1.EnvVar{ + Name: "PBM_MONGODB_URI", + Value: mongoDBURI, + }) + c.VolumeMounts = append(c.VolumeMounts, []corev1.VolumeMount{ { Name: "mongod-data",