Merge pull request #80 from oracle-quickstart/image-short-names-fix

Support image short names for v1.34+

Author: arnaudfroidmont

files/oke-ubuntu-cloud-init.sh

@@ -8,9 +8,33 @@ else
     exit 1
 fi
 
+version_ge() {
+    local v1="$1"
+    local v2="$2"
+
+    [[ -n "$v1" ]] || return 1
+    [[ "$(printf '%s\n' "$v1" "$v2" | sort -V | tail -n1)" == "$v1" ]]
+}
+
+# Fix for CRI-O short name mode not being disabled for Kubernetes versions >= 1.34
+configure_crio_defaults() {
+    local version="$1"
+
+    if version_ge "$version" "v1.34"; then
+        echo "Configuring CRI-O defaults for Kubernetes version $version"
+        mkdir -p /etc/crio/crio.conf.d
+        cat >/etc/crio/crio.conf.d/11-default.conf <<'EOF'
+[crio.image]
+short_name_mode = "disabled"
+EOF
+    fi
+}
+
 # Disable nvidia-imex.service for GB200 and GB300 shapes for Dynamic Resource Allocation (DRA) compatibility
-SHAPE=$(curl -H "Authorization: Bearer Oracle" -L http://169.254.169.254/opc/v2/instance/shape)
-if [[ "$SHAPE" == BM.GPU.GB200* ]] || [[ "$SHAPE" == BM.GPU.GB300* ]]; then
+SHAPE=$(curl -H "Authorization: Bearer Oracle" -L http://169.254.169.254/opc/v2/instance/shape 2>/dev/null) || true
+if [[ -z "$SHAPE" ]]; then
+    echo "Warning: Unable to fetch instance shape from metadata service, skipping nvidia-imex check" >&2
+elif [[ "$SHAPE" == BM.GPU.GB200* ]] || [[ "$SHAPE" == BM.GPU.GB300* ]]; then
     echo "Disabling nvidia-imex.service for shape: $SHAPE"
     if systemctl list-unit-files | grep -q nvidia-imex.service; then
         systemctl disable --now nvidia-imex.service && systemctl mask nvidia-imex.service
@@ -23,11 +47,13 @@ case "$ID" in
     ubuntu)
         echo "Detected Ubuntu"
         if command -v oke >/dev/null 2>&1; then
-            echo "[Ubuntu] oke binary already present → running bootstrap only"
+            echo "[Ubuntu] oke binary already present, running bootstrap only"
+            kubernetes_version="${1-}"
+            configure_crio_defaults "$kubernetes_version"
             oke bootstrap
         else
-            echo "[Ubuntu] oke binary not found → installing package"
-            kubernetes_version="$1"
+            echo "[Ubuntu] oke binary not found, installing package"
+            kubernetes_version="${1-}"
             oke_package_version="${kubernetes_version:1}"
             oke_package_repo_version="${oke_package_version:0:4}"
             oke_package_name="oci-oke-node-all-$oke_package_version"
@@ -51,13 +77,16 @@ EOF
             apt-get -y install "$oke_package_name"
 
             echo "[Ubuntu] Running bootstrap"
+            configure_crio_defaults "$kubernetes_version"
             oke bootstrap
         fi
         ;;
     ol)
         echo "Detected Oracle Linux"
         if command -v oke >/dev/null 2>&1; then
-            echo "[Oracle Linux] oke binary already present → running bootstrap only"
+            echo "[Oracle Linux] oke binary already present, running bootstrap only"
+            kubernetes_version="${1-}"
+            configure_crio_defaults "$kubernetes_version"
             oke bootstrap
         else
             echo "[Oracle Linux] oke binary not found, fetching init script"
@@ -66,6 +95,8 @@ EOF
             | base64 --decode >/var/run/oke-init.sh
 
             echo "[Oracle Linux] Running init script"
+            kubernetes_version="${1-}"
+            configure_crio_defaults "$kubernetes_version"
             bash /var/run/oke-init.sh
         fi
         ;;