Merge pull request #26 from bashtools/0.8.25

Run previous k8s version and support Intel Mac

Author: mclarkson

BUILD.md

@@ -34,16 +34,18 @@ Build prebuilt image for upload and check version as it's building:
 ```
 mok build image --tailf
 ```
-Tag and upload:
+Tag and upload for Arm:
 ```
-sudo podman tag localhost/local/mok-image_linux:1.32.0 docker.io/myownkind/mok-image_linux:1.32.0
+VERSION=1.32.2
+sudo podman tag localhost/local/mok-image_arm64:${VERSION} docker.io/myownkind/mok-image_arm64:${VERSION}
 sudo podman login docker.io
-sudo podman push docker.io/myownkind/mok-image_linux:1.32.0
+sudo podman push docker.io/myownkind/mok-image_linux:${VERSION}
 ```
-or
+Tag and upload for Intel:
 ```
-podman -c mok-machine tag localhost/local/mok-image_macos:1.32.0 docker.io/myownkind/mok-image_macos:1.32.0
-podman -c mok-machine login docker.io
-podman -c mok-machine push docker.io/myownkind/mok-image_macos:1.32.0
+VERSION=1.32.2
+podman tag localhost/local/mok-image_x86_64:${VERSION} docker.io/myownkind/mok-image_x86_64:${VERSION}
+podman login docker.io
+podman push docker.io/myownkind/mok-image_x86_64:${VERSION}
 ```
 

Makefile

@@ -1,11 +1,11 @@
-VERSION = 0.8.24
+VERSION = 0.8.25
 
 .PHONY: all
 all: mok.deploy tags
 
 mok.deploy: src/*.sh src/lib/*.sh mok-image mok-image/* mok-image/files/*
 	bash src/embed-dockerfile.sh
-	cd src && ( echo '#!/usr/bin/env bash'; cat macos.sh \
+	cd src && ( echo '#!/usr/bin/env bash'; cat macos.sh arch.sh \
 		lib/parser.sh globals.sh error.sh util.sh getcluster.sh machine.sh machinestop.sh \
 		machinestart.sh machinecreate.sh machinelist.sh machinedestroy.sh machinesetup.sh \
 		exec.sh deletecluster.sh createcluster.sh versions.sh containerutils.sh \
@@ -21,7 +21,7 @@ package: mok.deploy
 
 .PHONY: install
 install: all
-	install mok.deploy /usr/local/bin/mok
+	sudo install mok.deploy /usr/local/bin/mok
 
 .PHONY: uninstall
 uninstall:

README.md

@@ -7,24 +7,39 @@ Current kubernetes version: 1.32.1
 
 ## TL;DR Quick Start
 
+Install:
+
 ```bash
 curl -O https://raw.githubusercontent.com/bashtools/mok/refs/heads/master/package/mok
 chmod +x mok
 sudo mv mok /usr/local/bin/
+```
+
+Create cluster:
+
+```
 mok build image --get-prebuilt-image
 mok create cluster myk8s --masters 1 --publish
+```
+
+Use cluser:
+
+```
 export KUBECONFIG=/var/tmp/admin-myk8s.conf
 kubectl get nodes
 kubectl get pods --all-namespaces
 kubectl run --privileged --rm -ti alpine --image alpine /bin/sh
-mok delete cluster myk8s
 ```
 
-To ensure no resources are used on Mac OS afterwards, run `mok machine destroy`.
+Delete cluster:
+
+```
+mok delete cluster myk8s
+```
 
 ## Requirements
 
-**MacOS on Apple Silicon (M1, M2, ...)**
+**MacOS**
 * Mok will will install any required packages using Homebrew, and will prompt you before doing so.
 * To see exactly how and what will be installed, see `src/macos.sh`.
 
@@ -45,16 +60,6 @@ sudo mv mok /usr/local/bin/
 
 ## Using Mok
 
-### Add an alias (Linux only)
-
-On Linux only, use `sudo mok ...` or create an alias so that only `mok` is needed:
-
-```bash
-alias mok="sudo /usr/local/bin/mok"
-```
-
-Note: Add the alias to your shell startup file (`.bash_profile` or `.zshrc`) to make it persistent
-
 ### Build a container image
 
 ```bash
@@ -100,6 +105,8 @@ mok machine -h
 mok delete cluster myk8s
 ```
 
+On Mac OS do, `mok machine stop`, to stop the podman machine and free up resources.
+
 ## To Uninstall mok completely
 
 ### Mac

package/mok

@@ -0,0 +1,23 @@
+# shellcheck shell=bash disable=SC2148
+
+declare __mokostype
+
+set_arch() {
+  if [[ ${__mokostype} == "linux" ]]; then
+    # Is this machine x86 or arm?
+    if [[ $(uname -m) == "x86_64" ]]; then
+      export __mokarch=x86_64
+    elif [[ $(uname -m) == "aarch64" ]]; then
+      export __mokarch=arm64
+    fi
+  elif [[ ${__mokostype} == "macos" ]]; then
+    # Is this machine x86 or arm?
+    if [[ $(uname -m) == "x86_64" ]]; then
+      export __mokarch=x86_64
+    elif [[ $(uname -m) == "arm64" ]]; then
+      export __mokarch=arm64
+    fi
+  fi
+}
+
+set_arch

src/arch.sh

@@ -43,6 +43,11 @@ build image options:
  Flags:
   --get-prebuilt-image - Instead of building a 'node' image
          locally, download it from a container registry instead.
+  --k8sver VERSION - The Kubernetes version, e.g. "1.32.0" or "1.32.1".
+         A previous version cannot be built from scratch. This option
+         must be used with '--get-prebuilt-image'. To build a previous
+         version of kubernetes it must be built with a previous version
+         of mok.
   --tailf - Show the build output whilst building.
 
 EnD
@@ -77,6 +82,10 @@ BI_process_options() {
     _BI[tailf]="${TRUE}"
     return "${OK}"
     ;;
+  --k8sver)
+    _BI[k8sver]="$2"
+    return "$(PA_shift)"
+    ;;
   --get-prebuilt-image)
     _BI[useprebuiltimage]="${TRUE}"
     return "${OK}"
@@ -124,6 +133,7 @@ _BI_new() {
   _BI[baseimagename]="mok-image"
   _BI[useprebuiltimage]="${FALSE}"
   _BI[dockerbuildtmpdir]=
+  _BI[k8sver]="${K8SVERSION}"
 
   # Program the parser's state machine
   PA_add_state "COMMAND" "build" "SUBCOMMAND" ""
@@ -163,12 +173,15 @@ _BI_build_container_image() {
   _BI_create_docker_build_dir || return
 
   buildargs=$(_BI_get_build_args_for_latest) || return
-  basename="${_BI[baseimagename]}_$(MA_ostype)"
-  tagname="${K8SVERSION}"
+  basename="${_BI[baseimagename]}_$(MA_arch)"
+  tagname="${_BI[k8sver]}"
 
   local imgprefix
   imgprefix=$(CU_imgprefix) || err || return
   if [[ ${_BI[useprebuiltimage]} == "${FALSE}" ]]; then
+    # Each mok release can build the hardcoded version only
+    # so reset the tagname to that version
+    tagname="${K8SVERSION}"
     buildtype="create"
     cmd="docker build \
       -t "${imgprefix}local/${basename}:${tagname}" \
@@ -177,6 +190,7 @@ _BI_build_container_image() {
       ${_BI[dockerbuildtmpdir]}/${_BI[baseimagename]}"
     text="Creating"
   else
+    # We can download and run any available version
     buildtype="download"
     cmd="docker pull docker.io/myownkind/${basename}:${tagname}"
     text="Downloading"
@@ -254,7 +268,7 @@ _BI_modify_container_image() {
   # Write image
   local imgprefix tagname basename
   imgprefix=$(CU_imgprefix) || err || return
-  basename="${_BI[baseimagename]}_$(MA_ostype)"
+  basename="${_BI[baseimagename]}_$(MA_arch)"
   tagname="${K8SVERSION}"
   docker commit mok-build-modify "${imgprefix}local/${basename}:${tagname}" || err || return
 

src/buildimage.sh

@@ -137,7 +137,7 @@ CU_create_container() {
     err || return
   }
 
-  img="$(BI_baseimagename)_$(MA_ostype)"
+  img="$(BI_baseimagename)_$(MA_arch)"
 
   local imglocal="${_CU[imgprefix]}local/${img}"
   local imgremote="myownkind/${img}"

src/containerutils.sh

@@ -137,7 +137,9 @@ create cluster [flags] options:
   --with-lb - Add a haproxy load balancer. The software will be installed
          and set up to reverse proxy to the master node(s), unless
          --skiplbsetup is used.
-  --k8sver VERSION - Unimplemented.
+  --k8sver VERSION - The Kubernetes version, e.g. "1.32.0" or "1.32.1".
+         A previous version will need to be downloaded first with:
+           mok build image --get-prebuilt-image --k8sver VERSION
   --masters NUM - The number of master containers to create.
   --workers NUM - The number of worker containers to create. When workers
                   is zero then the master node taint will be removed from

src/createcluster.sh

@@ -10,7 +10,7 @@
 # Args: None expected.
 _GL_new() {
 
-  declare -rg MOKVERSION="0.8.24"
+  declare -rg MOKVERSION="0.8.25"
   declare -rg K8SVERSION="1.32.1"
   declare -rg GO_VERSION="1.23.4"
 

src/globals.sh

@@ -5,7 +5,7 @@
 declare -A _MA
 
 # Defined in GL (globals.sh)
-declare OK ERROR STOP STDERR TRUE __mokostype
+declare OK ERROR STOP STDERR TRUE __mokostype __mokarch
 
 # Getters/Setters -------------------------------------------------------------
 
@@ -31,6 +31,11 @@ MA_ostype() {
   printf '%s' "${_MA[ostype]}"
 }
 
+# MA_ostype getter outputs the machine architecture.
+MA_arch() {
+  printf '%s' "${_MA[arch]}"
+}
+
 # Public Functions ------------------------------------------------------------
 
 # main is the start point for this application.
@@ -144,6 +149,7 @@ _MA_new() {
   _MA[arg_0]="$0"
   _MA[arg_1]="$1"
   _MA[ostype]="${__mokostype}" # linux or macos
+  _MA[arch]="${__mokarch}" # x86_64 or arm64
 
   # Program the parser's state machine
   PA_add_state "COMMAND" "version" "END" "MA_version"

src/main.sh

@@ -125,6 +125,7 @@ etcd:
     dataDir: /var/lib/etcd
 imageRepository: registry.k8s.io
 kind: ClusterConfiguration
+kubernetesVersion: v${_CC[k8sver]}
 networking:
   dnsDomain: cluster.local
   podSubnet: \${podsubnet}