Merge pull request #16662 from linux-on-ibm-z/master

Auto commit by PR queue bot

cluster/get-kube.sh

@@ -96,9 +96,11 @@ elif [[ "${machine}" == "i686" ]]; then
   arch="386"
 elif [[ "${machine}" == "arm*" ]]; then
   arch="arm"
+elif [[ "${machine}" == "s390x*" ]]; then
+  arch="s390x"
 else
   echo "Unknown, unsupported architecture (${machine})."
-  echo "Supported architectures x86_64, i686, arm*"
+  echo "Supported architectures x86_64, i686, arm, s390x."
   echo "Bailing out."
   exit 3
 fi

cluster/kubectl.sh

@@ -70,8 +70,11 @@ case "$(uname -m)" in
   i?86*)
     host_arch=386
     ;;
+  s390x*)
+    host_arch=s390x
+    ;;
   *)
-    echo "Unsupported host arch. Must be x86_64, 386 or arm." >&2
+    echo "Unsupported host arch. Must be x86_64, 386, arm or s390x." >&2
     exit 1
     ;;
 esac

hack/lib/util.sh

@@ -150,8 +150,11 @@ kube::util::host_platform() {
     i?86*)
       host_arch=x86
       ;;
-    *)
-      kube::log::error "Unsupported host arch. Must be x86_64, 386 or arm."
+    s390x*)
+      host_arch=s390x
+      ;;
+    *)	
+      kube::log::error "Unsupported host arch. Must be x86_64, 386, arm or s390x."
       exit 1
       ;;
   esac

hack/local-up-cluster.sh

@@ -135,8 +135,11 @@ function detect_binary {
       i?86*)
         host_arch=x86
         ;;
+      s390x*)
+        host_arch=s390x
+        ;;
       *)
-        echo "Unsupported host arch. Must be x86_64, 386 or arm." >&2
+        echo "Unsupported host arch. Must be x86_64, 386, arm or s390x." >&2
         exit 1
         ;;
     esac