Skip to content

Commit

Permalink
kubernetes version 1.32.0
Browse files Browse the repository at this point in the history
  • Loading branch information
mclarkson committed Dec 14, 2024
1 parent e179718 commit d6db7d9
Show file tree
Hide file tree
Showing 7 changed files with 220 additions and 177 deletions.
43 changes: 43 additions & 0 deletions BUILD.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
Update versions in:
- `Makefile`
- `VERSION = 0.8.21`
- `README.md`
- `Current kubernetes version: 1.x.x`
- `src/globals.sh`
- `declare -rg MOKVERSION="0.8.x"`
+ - `declare -rg K8SVERSION="1.x.x"`

Check versions in:
- https://github.com/cri-o/cri-o/tags
- https://github.com/opencontainers/runc/tags
- https://github.com/kubernetes-sigs/cri-tools/tags

and update `mok-image/Dockerfile`

For kubernetes MINOR version upgrades, update:
- `src/createcluster.sh`
- `_CC_set_up_master_node()`
- `"1.31."* | "1.32."*)`
- `_CC_set_up_worker_node()`
- `"1.31."* | "1.32."*)`

Remove all images:
```
sudo podman images | tail -n +2 | awk '{ print $3 }' | xargs sudo podman rmi --force
```
Update mok
```
touch mok-image/Dockerfile
sudo make install
make package
```
Build prebuilt image for upload and check version as it's building:
```
mok build image --tailf
```
Tag and upload:
```
sudo podman tag localhost/local/mok-image:1.32.0 docker.io/myownkind/mok-image:1.32.0
sudo podman login docker.io
sudo podman push docker.io/myownkind/mok-image:1.32.0
```
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
VERSION = 0.8.21
VERSION = 0.8.22

.PHONY: all
all: mok.deploy tags
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
![image](https://github.com/user-attachments/assets/0750910e-d6da-4c65-92ea-f7bc64b116cc)


Current kubernetes version: 1.31.4
Current kubernetes version: 1.32.0

## Requirements

Expand Down
6 changes: 3 additions & 3 deletions mok-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
ARG BASE_IMAGE=debian:bookworm-slim
FROM $BASE_IMAGE AS base

ARG KUBERNETES_VERSION=v1.31
ARG KUBERNETES_VERSION=v1.32
ARG CRIO_VERSION=v1.31

# copy in static files
Expand Down Expand Up @@ -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.1.13"
ARG RUNC_VERSION="v1.2.3"
ARG RUNC_CLONE_URL="https://github.com/opencontainers/runc"
RUN git clone --filter=tree:0 "${RUNC_CLONE_URL}" /runc \
&& cd /runc \
Expand All @@ -149,7 +149,7 @@ RUN git clone --filter=tree:0 "${RUNC_CLONE_URL}" /runc \
FROM go-build AS build-crictl
ARG TARGETARCH GO_VERSION
ARG CRI_TOOLS_CLONE_URL="https://github.com/kubernetes-sigs/cri-tools"
ARG CRICTL_VERSION="v1.31.1"
ARG CRICTL_VERSION="v1.32.0"
RUN git clone --filter=tree:0 "${CRI_TOOLS_CLONE_URL}" /cri-tools \
&& cd /cri-tools \
&& git checkout "${CRICTL_VERSION}" \
Expand Down
336 changes: 168 additions & 168 deletions package/mok

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/createcluster.sh
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,7 @@ _CC_setup_master_nodes() {
_CC_set_up_master_node() {

case "${_CC[k8sver]}" in
"1.31."*)
"1.31."* | "1.32."*)
_CC_set_up_master_node_v1_30_0 "$@"
;;
*)
Expand Down Expand Up @@ -747,7 +747,7 @@ EnD
_CC_set_up_worker_node() {

case "${_CC[k8sver]}" in
"1.31."*)
"1.31."* | "1.32."*)
_CC_set_up_worker_node_v1_30_0 "$@"
;;
*)
Expand Down
4 changes: 2 additions & 2 deletions src/globals.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
# Args: None expected.
_GL_new() {

declare -rg MOKVERSION="0.8.21"
declare -rg K8SVERSION="1.31.4"
declare -rg MOKVERSION="0.8.22"
declare -rg K8SVERSION="1.32.0"
declare -rg GO_VERSION="1.23.2"

# Returns, exit codes
Expand Down

0 comments on commit d6db7d9

Please sign in to comment.