Merge pull request #29 from bashtools/0.8.28

kubernetes 1.32.4

Author: mclarkson

Makefile

@@ -1,4 +1,4 @@
-VERSION = 0.8.27
+VERSION = 0.8.28
 
 .PHONY: all
 all: mok.deploy tags

README.md

@@ -3,9 +3,9 @@
 ![image](https://github.com/user-attachments/assets/0750910e-d6da-4c65-92ea-f7bc64b116cc)
 
 
-Default kubernetes version: 1.32.3
+Default kubernetes version: 1.32.4
 
-Available kubernetes versions: 1.32.0, 1.32.1, 1.32.2, 1.32.3
+Available kubernetes versions: 1.32.0, 1.32.1, 1.32.2, 1.32.3, 1.32.4
 
 ## TL;DR Quick Start
 

mok-image/Dockerfile

@@ -24,7 +24,7 @@ ARG BASE_IMAGE=debian:bookworm-slim
 FROM $BASE_IMAGE AS base
 
 ARG KUBERNETES_VERSION=v1.32
-ARG CRIO_VERSION=v1.31
+ARG CRIO_VERSION=v1.32
 
 # copy in static files
 # all scripts and directories are 0755 (rwx r-x r-x)
@@ -134,7 +134,7 @@ RUN eval "$(gimme "${GO_VERSION}")" \
 # stage for building runc
 FROM go-build AS build-runc
 ARG TARGETARCH GO_VERSION
-ARG RUNC_VERSION="v1.2.4"
+ARG RUNC_VERSION="v1.2.6"
 ARG RUNC_CLONE_URL="https://github.com/opencontainers/runc"
 RUN git clone --filter=tree:0 "${RUNC_CLONE_URL}" /runc \
     && cd /runc \

package/mok

@@ -17,6 +17,9 @@ set_arch() {
     elif [[ $(uname -m) == "arm64" ]]; then
       export __mokarch=arm64
     fi
+  else
+    printf 'ERROR: Unknown OS type: %s\n' "${__mokostype}" >"${STDERR}"
+    exit "${ERROR}"
   fi
 }
 

src/arch.sh

@@ -43,8 +43,8 @@ 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
+  --k8sver VERSION - The Kubernetes version, e.g. "1.32.0"
+         A previous version cannot be built from scratch hence 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.

src/buildimage.sh

@@ -137,7 +137,7 @@ 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 - The Kubernetes version, e.g. "1.32.0" or "1.32.1".
+  --k8sver VERSION - The Kubernetes version, e.g. "1.32.0".
          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.

src/createcluster.sh

@@ -10,8 +10,8 @@
 # Args: None expected.
 _GL_new() {
 
-  declare -rg MOKVERSION="0.8.27"
-  declare -rg K8SVERSION="1.32.3"
+  declare -rg MOKVERSION="0.8.28"
+  declare -rg K8SVERSION="1.32.4"
   declare -rg GO_VERSION="1.23.4"
 
   # Returns, exit codes

src/globals.sh

@@ -17,6 +17,7 @@ MA_program_args() {
 # MA_arg_1 getter outputs the first argument sent by the user.
 # Used by _CU_podman_checks so it doesn't check for a podman machine
 # if we're running 'machine' commands
+# FIXME: The command might not be the first argument. It could be '-p'
 MA_arg_1() {
   printf '%s' "${_MA[arg_1]}"
 }