Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge 1.18.0 #1733

Closed
wants to merge 17 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion deploy/cr-minimal.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: PerconaServerMongoDB
metadata:
name: minimal-cluster
spec:
crVersion: 1.18.0
crVersion: 1.19.0
image: perconalab/percona-server-mongodb-operator:main-mongod7.0
unsafeFlags:
replsetSize: true
Expand Down
122 changes: 122 additions & 0 deletions e2e-tests/custom-users-roles-sharded/compare/role-one-50.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,122 @@
switched to db admin
{
"_id" : "admin.role-one",
"role" : "role-one",
"db" : "admin",
"privileges" : [
{
"resource" : {
"cluster" : true
},
"actions" : [
"addShard"
]
},
{
"resource" : {
"db" : "config",
"collection" : ""
},
"actions" : [
"find",
"insert",
"remove",
"update"
]
}
],
"roles" : [
{
"role" : "read",
"db" : "admin"
}
],
"authenticationRestrictions" : [
[
{
"clientSource" : [
"127.0.0.1"
],
"serverAddress" : [
"127.0.0.1"
]
}
]
],
"inheritedRoles" : [
{
"role" : "read",
"db" : "admin"
}
],
"inheritedPrivileges" : [
{
"resource" : {
"cluster" : true
},
"actions" : [
"addShard"
]
},
{
"resource" : {
"db" : "config",
"collection" : ""
},
"actions" : [
"find",
"insert",
"remove",
"update"
]
},
{
"resource" : {
"db" : "admin",
"collection" : ""
},
"actions" : [
"changeStream",
"collStats",
"dbHash",
"dbStats",
"find",
"killCursors",
"listCollections",
"listIndexes",
"planCacheRead"
]
},
{
"resource" : {
"db" : "admin",
"collection" : "system.js"
},
"actions" : [
"changeStream",
"collStats",
"dbHash",
"dbStats",
"find",
"killCursors",
"listCollections",
"listIndexes",
"planCacheRead"
]
}
],
"inheritedAuthenticationRestrictions" : [
[
{
"clientSource" : [
"127.0.0.1"
],
"serverAddress" : [
"127.0.0.1"
]
}
]
],
"isBuiltin" : false
}
bye
78 changes: 78 additions & 0 deletions e2e-tests/custom-users-roles-sharded/compare/role-two-50.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
switched to db admin
{
"_id" : "admin.role-two",
"role" : "role-two",
"db" : "admin",
"privileges" : [
{
"resource" : {
"db" : "config",
"collection" : ""
},
"actions" : [
"find"
]
}
],
"roles" : [
{
"role" : "read",
"db" : "admin"
}
],
"authenticationRestrictions" : [ ],
"inheritedRoles" : [
{
"role" : "read",
"db" : "admin"
}
],
"inheritedPrivileges" : [
{
"resource" : {
"db" : "config",
"collection" : ""
},
"actions" : [
"find"
]
},
{
"resource" : {
"db" : "admin",
"collection" : ""
},
"actions" : [
"changeStream",
"collStats",
"dbHash",
"dbStats",
"find",
"killCursors",
"listCollections",
"listIndexes",
"planCacheRead"
]
},
{
"resource" : {
"db" : "admin",
"collection" : "system.js"
},
"actions" : [
"changeStream",
"collStats",
"dbHash",
"dbStats",
"find",
"killCursors",
"listCollections",
"listIndexes",
"planCacheRead"
]
}
],
"inheritedAuthenticationRestrictions" : [ ],
"isBuiltin" : false
}
bye
4 changes: 4 additions & 0 deletions e2e-tests/custom-users-roles-sharded/run
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ compare() {
local uri="$3"
local target="$4"

if [[ $IMAGE_MONGOD =~ 5\.0 ]] && [ -f ${test_dir}/compare/$target-50.json ]; then
target=$target-50
fi

run_mongos "use ${database}\n ${command}" "$uri" "mongodb" \
| egrep -v 'I NETWORK|W NETWORK|F NETWORK|Error saving history file|Percona Server for MongoDB|connecting to:|Unable to reach primary for set|Implicit session:|versions do not match|Error saving history file:' \
| $sed -re 's/ObjectId\("[0-9a-f]+"\)//; s/-[0-9]+.svc/-xxxesvc/' \
Expand Down
122 changes: 122 additions & 0 deletions e2e-tests/custom-users-roles/compare/role-one-50.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,122 @@
switched to db admin
{
"_id" : "admin.role-one",
"role" : "role-one",
"db" : "admin",
"privileges" : [
{
"resource" : {
"cluster" : true
},
"actions" : [
"addShard"
]
},
{
"resource" : {
"db" : "config",
"collection" : ""
},
"actions" : [
"find",
"insert",
"remove",
"update"
]
}
],
"roles" : [
{
"role" : "read",
"db" : "admin"
}
],
"authenticationRestrictions" : [
[
{
"clientSource" : [
"127.0.0.1"
],
"serverAddress" : [
"127.0.0.1"
]
}
]
],
"inheritedRoles" : [
{
"role" : "read",
"db" : "admin"
}
],
"inheritedPrivileges" : [
{
"resource" : {
"cluster" : true
},
"actions" : [
"addShard"
]
},
{
"resource" : {
"db" : "config",
"collection" : ""
},
"actions" : [
"find",
"insert",
"remove",
"update"
]
},
{
"resource" : {
"db" : "admin",
"collection" : ""
},
"actions" : [
"changeStream",
"collStats",
"dbHash",
"dbStats",
"find",
"killCursors",
"listCollections",
"listIndexes",
"planCacheRead"
]
},
{
"resource" : {
"db" : "admin",
"collection" : "system.js"
},
"actions" : [
"changeStream",
"collStats",
"dbHash",
"dbStats",
"find",
"killCursors",
"listCollections",
"listIndexes",
"planCacheRead"
]
}
],
"inheritedAuthenticationRestrictions" : [
[
{
"clientSource" : [
"127.0.0.1"
],
"serverAddress" : [
"127.0.0.1"
]
}
]
],
"isBuiltin" : false
}
bye
Loading
Loading