Skip to content

Commit

Permalink
Merge branch 'K8SPSMDB-921_add_test_for_irsa' of github.com:percona/p…
Browse files Browse the repository at this point in the history
…ercona-server-mongodb-operator into K8SPSMDB-921_add_test_for_irsa
  • Loading branch information
nmarukovich committed Nov 10, 2024
2 parents 8313fc4 + 9b6ba68 commit 4ae49e4
Show file tree
Hide file tree
Showing 12 changed files with 153 additions and 55 deletions.
12 changes: 4 additions & 8 deletions build/ps-entry.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#!/bin/bash
set -Eeuo pipefail
set -o xtrace

if [ "${1:0:1}" = '-' ]; then
set -- mongod "$@"
Expand Down Expand Up @@ -421,13 +420,10 @@ if [[ $originalArgOne == mongo* ]]; then
tlsMode="preferTLS"
fi

# don't add --tlsMode if TLS is disabled
if clusterAuthMode="$(_mongod_hack_get_arg_val --clusterAuthMode "${mongodHackedArgs[@]}")"; then
if [[ ${clusterAuthMode} != "keyFile" ]]; then
_mongod_hack_ensure_arg_val --tlsMode "${tlsMode}" "${mongodHackedArgs[@]}"
else
_mongod_hack_ensure_no_arg --sslAllowInvalidCertificates "${mongodHackedArgs[@]}"
fi
_mongod_hack_ensure_arg_val --tlsMode "${tlsMode}" "${mongodHackedArgs[@]}"

if [[ ${tlsMode} == "disabled" ]]; then
_mongod_hack_ensure_no_arg --sslAllowInvalidCertificates "${mongodHackedArgs[@]}"
fi

if [[ ${tlsMode} != "disabled" ]]; then
Expand Down
1 change: 1 addition & 0 deletions deploy/bundle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19634,6 +19634,7 @@ rules:
resources:
- issuers
- certificates
- certificaterequests
verbs:
- get
- list
Expand Down
1 change: 1 addition & 0 deletions deploy/cw-bundle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19654,6 +19654,7 @@ rules:
resources:
- issuers
- certificates
- certificaterequests
verbs:
- get
- list
Expand Down
1 change: 1 addition & 0 deletions deploy/cw-rbac.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ rules:
resources:
- issuers
- certificates
- certificaterequests
verbs:
- get
- list
Expand Down
1 change: 1 addition & 0 deletions deploy/rbac.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ rules:
resources:
- issuers
- certificates
- certificaterequests
verbs:
- get
- list
Expand Down
2 changes: 1 addition & 1 deletion e2e-tests/functions
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ SKIP_BACKUPS_TO_AWS_GCP_AZURE=${SKIP_BACKUPS_TO_AWS_GCP_AZURE:-1}
PMM_SERVER_VER=${PMM_SERVER_VER:-"9.9.9"}
IMAGE_PMM_CLIENT=${IMAGE_PMM_CLIENT:-"perconalab/pmm-client:dev-latest"}
IMAGE_PMM_SERVER=${IMAGE_PMM_SERVER:-"perconalab/pmm-server:dev-latest"}
CERT_MANAGER_VER="1.15.3"
CERT_MANAGER_VER="1.16.1"
tmp_dir=$(mktemp -d)
sed=$(which gsed || which sed)
date=$(which gdate || which date)
Expand Down
7 changes: 7 additions & 0 deletions e2e-tests/release_images
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
IMAGE_OPERATOR=percona/percona-server-mongodb-operator:1.18.0
IMAGE_MONGOD70=percona/percona-server-mongodb:7.0.14-8
IMAGE_MONGOD60=percona/percona-server-mongodb:6.0.17-14
IMAGE_MONGOD50=percona/percona-server-mongodb:5.0.29-25
IMAGE_BACKUP=percona/percona-backup-mongodb:2.6.0
IMAGE_PMM_CLIENT=percona/pmm-client:2.43.2
IMAGE_PMM_SERVER=percona/pmm-server:2.43.2
33 changes: 20 additions & 13 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.22.6
require (
github.com/Percona-Lab/percona-version-service v0.0.0-20230216094301-f9489c81b52a
github.com/alecthomas/kingpin v2.2.6+incompatible
github.com/cert-manager/cert-manager v1.15.3
github.com/cert-manager/cert-manager v1.16.1
github.com/go-logr/logr v1.4.2
github.com/go-openapi/errors v0.22.0
github.com/go-openapi/runtime v0.28.0
Expand All @@ -23,23 +23,30 @@ require (
golang.org/x/sync v0.8.0
google.golang.org/grpc v1.67.1
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.31.1
k8s.io/apimachinery v0.31.1
k8s.io/client-go v0.31.1
sigs.k8s.io/controller-runtime v0.19.0
k8s.io/api v0.31.2
k8s.io/apimachinery v0.31.2
k8s.io/client-go v0.31.2
sigs.k8s.io/controller-runtime v0.19.1
sigs.k8s.io/mcs-api v0.1.0
sigs.k8s.io/yaml v1.4.0
)

require (
github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 // indirect
github.com/blang/semver/v4 v4.0.0 // indirect
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
github.com/go-asn1-ber/asn1-ber v1.5.6 // indirect
github.com/go-ldap/ldap/v3 v3.4.8 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/spf13/cobra v1.8.1 // indirect
github.com/x448/float16 v0.8.4 // indirect
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
k8s.io/component-base v0.31.1 // indirect
)

require (
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.12.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/internal v1.9.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.14.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.3.1 // indirect
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect
github.com/alecthomas/units v0.0.0-20231202071711-9a357b53e9c9 // indirect
Expand All @@ -63,7 +70,7 @@ require (
github.com/golang/protobuf v1.5.4 // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/go-cmp v0.6.0
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/gorilla/websocket v1.5.1 // indirect
Expand Down Expand Up @@ -96,9 +103,9 @@ require (
github.com/xdg-go/scram v1.1.2 // indirect
github.com/xdg-go/stringprep v1.0.4 // indirect
github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect
go.opentelemetry.io/otel v1.28.0 // indirect
go.opentelemetry.io/otel/metric v1.28.0 // indirect
go.opentelemetry.io/otel/trace v1.28.0 // indirect
go.opentelemetry.io/otel v1.29.0 // indirect
go.opentelemetry.io/otel/metric v1.29.0 // indirect
go.opentelemetry.io/otel/trace v1.29.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/crypto v0.27.0 // indirect
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
Expand All @@ -110,8 +117,8 @@ require (
golang.org/x/text v0.18.0 // indirect
golang.org/x/time v0.6.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240827150818-7e3bb234dfed // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
google.golang.org/protobuf v1.34.2 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.2.1
Expand Down
Loading

0 comments on commit 4ae49e4

Please sign in to comment.