Merge branch 'main' into appProtocol

Author: hors

build/ps-entry.sh

@@ -19,15 +19,15 @@ if [[ $originalArgOne == mongo* ]] && [ "$(id -u)" = '0' ]; then
 	chown --dereference mongodb "/proc/$$/fd/1" "/proc/$$/fd/2" || :
 	# ignore errors thanks to https://github.com/docker-library/mongo/issues/149
 
-	exec gosu mongodb:1001 "$BASH_SOURCE" "$@"
+	exec gosu mongodb:1001 "${BASH_SOURCE[0]}" "$@"
 fi
 
 # you should use numactl to start your mongod instances, including the config servers, mongos instances, and any clients.
 # https://docs.mongodb.com/manual/administration/production-notes/#configuring-numa-on-linux
 if [[ $originalArgOne == mongo* ]]; then
-	numa='numactl --interleave=all'
-	if $numa true &>/dev/null; then
-		set -- "$numa" "$@"
+	numa=(numactl --interleave=all)
+	if "${numa[@]}" true &>/dev/null; then
+		set -- "${numa[@]}" "$@"
 	fi
 fi
 
@@ -88,7 +88,7 @@ _mongod_hack_get_arg_val() {
 				return 0
 				;;
 			"$checkArg"=*)
-				echo "${arg#$checkArg=}"
+				echo "${arg#"$checkArg"=}"
 				return 0
 				;;
 		esac
@@ -398,6 +398,7 @@ if [ "$originalArgOne" = 'mongod' ]; then
 			case "$f" in
 				*.sh)
 					echo "$0: running $f"
+					# shellcheck source=/dev/null
 					. "$f"
 					;;
 				*.js)

e2e-tests/functions

@@ -1040,6 +1040,7 @@ cat_config() {
 	cat "$1" \
 		| yq eval '(.spec | select(.image == null)).image = "'"$IMAGE_MONGOD"'"' \
 		| yq eval '(.spec | select(has("pmm"))).pmm.image = "'"$IMAGE_PMM_CLIENT"'"' \
+		| yq eval '(.spec | select(has("initImage"))).initImage = "'"$IMAGE"'"' \
 		| yq eval '(.spec | select(has("backup"))).backup.image = "'"$IMAGE_BACKUP"'"' \
 		| yq eval '.spec.upgradeOptions.apply="Never"'
 }

e2e-tests/upgrade-consistency-sharded/compare/statefulset_some-name-cfg-1160-oc.yml

@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   annotations: {}
-  generation: 3
+  generation: 2
   labels:
     app.kubernetes.io/component: mongod
     app.kubernetes.io/instance: some-name

e2e-tests/upgrade-consistency-sharded/compare/statefulset_some-name-cfg-1160.yml

@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   annotations: {}
-  generation: 3
+  generation: 2
   labels:
     app.kubernetes.io/component: cfg
     app.kubernetes.io/instance: some-name

e2e-tests/upgrade-consistency-sharded/compare/statefulset_some-name-rs0-1160-oc.yml

@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   annotations: {}
-  generation: 3
+  generation: 2
   labels:
     app.kubernetes.io/component: mongod
     app.kubernetes.io/instance: some-name

e2e-tests/upgrade-consistency-sharded/compare/statefulset_some-name-rs0-1160.yml

@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   annotations: {}
-  generation: 3
+  generation: 2
   labels:
     app.kubernetes.io/component: mongod
     app.kubernetes.io/instance: some-name

e2e-tests/upgrade-consistency-sharded/conf/some-name.yml

@@ -10,6 +10,7 @@ spec:
   #platform: openshift
   image:
   imagePullPolicy: Always
+  initImage: -init
   allowUnsafeConfigurations: false
   updateStrategy: SmartUpdate
   secrets:

e2e-tests/upgrade-consistency/compare/statefulset_some-name-rs0-1160-oc.yml

@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   annotations: {}
-  generation: 3
+  generation: 2
   labels:
     app.kubernetes.io/component: mongod
     app.kubernetes.io/instance: some-name

e2e-tests/upgrade-consistency/compare/statefulset_some-name-rs0-1160.yml

@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   annotations: {}
-  generation: 3
+  generation: 2
   labels:
     app.kubernetes.io/component: mongod
     app.kubernetes.io/instance: some-name

e2e-tests/upgrade-consistency/conf/some-name-rs0.yml

@@ -7,6 +7,7 @@ spec:
   #platform: openshift
   image:
   imagePullPolicy: Always
+  initImage: -init
   allowUnsafeConfigurations: false
   backup:
     enabled: false