Merge remote-tracking branch 'upstream/release-0.11.1'

OWNERS

@@ -1,18 +1,24 @@
 approvers:
   - anishasthana
   - danielezonca
+  - davidesalerno
   - heyselbi
   - israel-hdez
   - Jooho
+  - rpancham
+  - spolti
   - vaibhavjainwiz
   - VedantMahabaleshwarkar
   - Xaenalt
 reviewers:
   - anishasthana
   - danielezonca
+  - davidesalerno
   - heyselbi
   - israel-hdez
   - Jooho
+  - rpancham
+  - spolti
   - vaibhavjainwiz
   - VedantMahabaleshwarkar
   - Xaenalt

config/README.md

@@ -8,7 +8,7 @@ The `examples` directory contains example Kustomization overlays to demonstrate
 
 - `custom-example` is an example of an overlay to deploy model-mesh with a custom model-serving runtime image
 - `custom-example-uds` extends `custom-example` to use a unix domain socket for intra-pod communication
-- `type-constraints-example` is an example of a heterogeneous model-mesh deployment comprising two kubernetes Deployments with a single Service. It employs type constraints to control assignments of models to pod subsets based on laebels.
+- `type-constraints-example` is an example of a heterogeneous model-mesh deployment comprising two kubernetes Deployments with a single Service. It employs type constraints to control assignments of models to pod subsets based on labels.
 
 The following patches are provided in `base/patches` and can be selectively included/modified in your custom overlay:
 

src/main/scripts/start.sh

@@ -309,11 +309,15 @@ fi
 echo $$ > ${ANCHOR_FILE}
 
 if [ "$MEM_LIMIT_MB" = "" ]; then
-	DOCKER_LIM_FILE="/sys/fs/cgroup/memory/memory.limit_in_bytes"
-
-	if [ -e "${DOCKER_LIM_FILE}" ]; then
-		MEM_LIMIT_MB=$(($(cat ${DOCKER_LIM_FILE})/1024/1024))
-		echo "Using process mem limit of ${MEM_LIMIT_MB}MiB from ${DOCKER_LIM_FILE}"
+	CGROUP_V1_LIM_FILE="/sys/fs/cgroup/memory/memory.limit_in_bytes"
+	CGROUP_V2_LIM_FILE="/sys/fs/cgroup/memory.max"
+
+	if [ -e "${CGROUP_V1_LIM_FILE}" ]; then
+		MEM_LIMIT_MB=$(($(cat ${CGROUP_V1_LIM_FILE})/1024/1024))
+		echo "Using process mem limit of ${MEM_LIMIT_MB}MiB from ${CGROUP_V1_LIM_FILE}"
+	elif [ -e "${CGROUP_V2_LIM_FILE}" ]; then
+		MEM_LIMIT_MB=$(($(cat ${CGROUP_V2_LIM_FILE})/1024/1024))
+		echo "Using process mem limit of ${MEM_LIMIT_MB}MiB from ${CGROUP_V2_LIM_FILE}"
 	else
     	MEM_LIMIT_MB="1536"
     	echo "No process mem limit provided or found, defaulting to ${MEM_LIMIT_MB}MiB"