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.

Sign up for GitHub

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

K8SPSMDB-958 fix mongos metrics #1289

Merged
merged 13 commits into from
Aug 30, 2023
Merged

K8SPSMDB-958 fix mongos metrics #1289

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
78345f1
K8SPSMDB-958 fix mongos metrics
nmarukovich Aug 15, 2023
7de0ed4
fix indents
nmarukovich Aug 15, 2023
9bd9d21
Merge branch 'main' into K8SPSMDB-958
nmarukovich Aug 16, 2023
57b279f
fix monitoring test
nmarukovich Aug 16, 2023
df6c23e
Merge branch 'K8SPSMDB-958' of https://github.com/percona/percona-ser…
nmarukovich Aug 16, 2023
30b5bec
Merge branch 'main' into K8SPSMDB-958
nmarukovich Aug 17, 2023
4c4d10b
add security context to the tests
nmarukovich Aug 18, 2023
0652cff
fix serviceless test
nmarukovich Aug 18, 2023
5cdcbb0
add condition for operator version
nmarukovich Aug 21, 2023
4004ca7
add condition for operator version
nmarukovich Aug 21, 2023
a027df5
Merge branch 'main' into K8SPSMDB-958
nmarukovich Aug 22, 2023
b567ba3
Update pkg/apis/psmdb/v1/psmdb_defaults.go
nmarukovich Aug 22, 2023
b24a013
Merge branch 'main' into K8SPSMDB-958
nmarukovich Aug 29, 2023
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: 2 additions & 0 deletions e2e-tests/demand-backup-sharded/compare/statefulset_some-name-mongos-4-oc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,8 @@ spec:
successThreshold: 1
timeoutSeconds: 1
resources: {}
securityContext:
runAsNonRoot: true
terminationMessagePath: /dev/termination-log
terminationMessagePolicy: File
volumeMounts:
Expand Down
2 changes: 2 additions & 0 deletions e2e-tests/demand-backup-sharded/compare/statefulset_some-name-mongos-oc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,8 @@ spec:
successThreshold: 1
timeoutSeconds: 1
resources: {}
securityContext:
runAsNonRoot: true
terminationMessagePath: /dev/termination-log
terminationMessagePolicy: File
volumeMounts:
Expand Down
6 changes: 5 additions & 1 deletion e2e-tests/demand-backup-sharded/compare/statefulset_some-name-mongos-secret.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,9 @@ spec:
successThreshold: 1
timeoutSeconds: 1
resources: {}
securityContext:
runAsNonRoot: true
runAsUser: 1001
terminationMessagePath: /dev/termination-log
terminationMessagePolicy: File
volumeMounts:
Expand Down Expand Up @@ -166,7 +169,8 @@ spec:
restartPolicy: Always
runtimeClassName: container-rc
schedulerName: default-scheduler
securityContext: {}
securityContext:
fsGroup: 1001
terminationGracePeriodSeconds: 30
volumes:
- name: some-name-mongodb-keyfile
Expand Down
6 changes: 5 additions & 1 deletion e2e-tests/demand-backup-sharded/compare/statefulset_some-name-mongos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,9 @@ spec:
successThreshold: 1
timeoutSeconds: 1
resources: {}
securityContext:
runAsNonRoot: true
runAsUser: 1001
terminationMessagePath: /dev/termination-log
terminationMessagePolicy: File
volumeMounts:
Expand Down Expand Up @@ -166,7 +169,8 @@ spec:
restartPolicy: Always
runtimeClassName: container-rc
schedulerName: default-scheduler
securityContext: {}
securityContext:
fsGroup: 1001
terminationGracePeriodSeconds: 30
volumes:
- name: some-name-mongodb-keyfile
Expand Down
2 changes: 2 additions & 0 deletions e2e-tests/expose-sharded/compare/statefulset_some-name-mongos-4-oc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,8 @@ spec:
successThreshold: 1
timeoutSeconds: 1
resources: {}
securityContext:
runAsNonRoot: true
terminationMessagePath: /dev/termination-log
terminationMessagePolicy: File
volumeMounts:
Expand Down
2 changes: 2 additions & 0 deletions e2e-tests/expose-sharded/compare/statefulset_some-name-mongos-oc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,8 @@ spec:
imagePullPolicy: Always
name: mongos-sidecar-1
resources: {}
securityContext:
runAsNonRoot: true
terminationMessagePath: /dev/termination-log
terminationMessagePolicy: File
dnsPolicy: ClusterFirst
Expand Down
6 changes: 5 additions & 1 deletion e2e-tests/expose-sharded/compare/statefulset_some-name-mongos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,9 @@ spec:
successThreshold: 1
timeoutSeconds: 1
resources: {}
securityContext:
runAsNonRoot: true
runAsUser: 1001
terminationMessagePath: /dev/termination-log
terminationMessagePolicy: File
volumeMounts:
Expand Down Expand Up @@ -166,7 +169,8 @@ spec:
restartPolicy: Always
runtimeClassName: container-rc
schedulerName: default-scheduler
securityContext: {}
securityContext:
fsGroup: 1001
terminationGracePeriodSeconds: 30
volumes:
- name: some-name-mongodb-keyfile
Expand Down
2 changes: 2 additions & 0 deletions e2e-tests/monitoring-2-0/compare/statefulset_monitoring-mongos-oc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,8 @@ spec:
requests:
cpu: 300m
memory: 500M
securityContext:
runAsNonRoot: true
terminationMessagePath: /dev/termination-log
terminationMessagePolicy: File
volumeMounts:
Expand Down
6 changes: 5 additions & 1 deletion e2e-tests/monitoring-2-0/compare/statefulset_monitoring-mongos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,9 @@ spec:
requests:
cpu: 300m
memory: 500M
securityContext:
runAsNonRoot: true
runAsUser: 1001
terminationMessagePath: /dev/termination-log
terminationMessagePolicy: File
volumeMounts:
Expand Down Expand Up @@ -295,7 +298,8 @@ spec:
name: bin
restartPolicy: Always
schedulerName: default-scheduler
securityContext: {}
securityContext:
fsGroup: 1001
terminationGracePeriodSeconds: 30
volumes:
- name: monitoring-mongodb-keyfile
Expand Down
6 changes: 5 additions & 1 deletion e2e-tests/pitr-sharded/compare/statefulset_some-name-mongos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,9 @@ spec:
successThreshold: 1
timeoutSeconds: 1
resources: {}
securityContext:
runAsNonRoot: true
runAsUser: 1001
terminationMessagePath: /dev/termination-log
terminationMessagePolicy: File
volumeMounts:
Expand Down Expand Up @@ -163,7 +166,8 @@ spec:
restartPolicy: Always
runtimeClassName: container-rc
schedulerName: default-scheduler
securityContext: {}
securityContext:
fsGroup: 1001
terminationGracePeriodSeconds: 30
volumes:
- name: some-name-mongodb-keyfile
Expand Down
11 changes: 4 additions & 7 deletions e2e-tests/serviceless-external-nodes/run
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,8 @@ set -o xtrace
test_dir=$(realpath "$(dirname "$0")")
. "${test_dir}/../functions"

if [[ ${IMAGE_MONGOD} == *"percona-server-mongodb-operator"* ]]; then
MONGO_VER=$(echo -n "${IMAGE_MONGOD}" | $sed -r 's/.*([0-9].[0-9])$/\1/')
else
MONGO_VER=$(echo -n "${IMAGE_MONGOD}" | $sed -r 's/.*:([0-9]+\.[0-9]+).*$/\1/')
fi
FULL_VER=$(get_mongod_ver_from_image ${IMAGE_MONGOD})
MONGO_VER=${FULL_VER:0:3}
unset OPERATOR_NS

desc "Create main cluster"
Expand Down Expand Up @@ -59,8 +56,8 @@ cat "${test_dir}/compare/rs.txt" \

diff $tmp_dir/rs-expected.txt "$tmp_dir/rs.txt"

destroy "$namespace" "true"

kubectl_bin -n ${replica_namespace} delete psmdb/${cluster}
destroy $replica_namespace "true"
destroy $namespace "true"

desc "test passed"
20 changes: 20 additions & 0 deletions pkg/apis/psmdb/v1/psmdb_defaults.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,26 @@ func (cr *PerconaServerMongoDB) CheckNSetDefaults(platform version.Platform, log
}
}

var fsgroup *int64
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we need to set it only for >- 1.15

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agree.

if platform == version.PlatformKubernetes {
var tp int64 = 1001
fsgroup = &tp
}

if cr.Spec.Sharding.Mongos.ContainerSecurityContext == nil {
tvar := true
cr.Spec.Sharding.Mongos.ContainerSecurityContext = &corev1.SecurityContext{
RunAsNonRoot: &tvar,
RunAsUser: fsgroup,
}
}

if cr.Spec.Sharding.Mongos.PodSecurityContext == nil {
cr.Spec.Sharding.Mongos.PodSecurityContext = &corev1.PodSecurityContext{
FSGroup: fsgroup,
}
}

cr.Spec.Sharding.ConfigsvrReplSet.Name = ConfigReplSetName

if cr.Spec.Sharding.Mongos.Port == 0 {
Expand Down