Skip to content

Commit

Permalink
Bump kind version to 0.24.0 and fix git-patch.
Browse files Browse the repository at this point in the history
  • Loading branch information
kishen-v committed Sep 13, 2024
1 parent d238857 commit 0aeb961
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 11 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/docker-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,7 @@ jobs:
- name: Build kind-node image - ${{ env.K8S-VERSION}}
run: |
mkdir -p tmp/kubernetes
git clone --single-branch --filter=tree:0 --branch ${{ env.K8S-VERSION }} https://github.com/kubernetes/kubernetes tmp/kubernetes
kind build node-image $PWD/tmp/kubernetes --arch ppc64le --image ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.K8S-VERSION }} --base-image ${{ env.BASE_IMAGE }}
kind build node-image --type url https://dl.k8s.io/${{ env.K8S-VERSION }}/kubernetes-server-linux-ppc64le.tar.gz --arch ppc64le --image ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.K8S-VERSION }} --base-image ${{ env.BASE_IMAGE }}
- name: Publish node image - ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.K8S-VERSION }}
# Modifying or adding new changes to the workflow does not necessarily require the built image to be pushed.
Expand Down
2 changes: 1 addition & 1 deletion KIND_VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v0.23.0
v0.24.0
14 changes: 7 additions & 7 deletions build-ppc64le.patch
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/hack/build/init-buildx.sh b/hack/build/init-buildx.sh
index fddb7c7..962e00c 100755
index bb0d5bd..1550a82 100755
--- a/hack/build/init-buildx.sh
+++ b/hack/build/init-buildx.sh
@@ -23,7 +23,8 @@ current_builder="$(docker buildx inspect)"
@@ -21,7 +21,8 @@ current_builder="$(docker buildx inspect)"
# linux/amd64, linux/arm64, linux/riscv64, linux/ppc64le, linux/s390x, linux/386, linux/arm/v7, linux/arm/v6
if ! grep -q "^Driver: docker$" <<<"${current_builder}" && \
grep -q "linux/amd64" <<<"${current_builder}" && \
Expand All @@ -13,7 +13,7 @@ index fddb7c7..962e00c 100755
fi

diff --git a/images/base/Dockerfile b/images/base/Dockerfile
index 6a04799..31d9455 100644
index 63060ae..215ba1d 100644
--- a/images/base/Dockerfile
+++ b/images/base/Dockerfile
@@ -108,10 +108,10 @@ COPY --chmod=0755 scripts/third_party/gimme/gimme /usr/local/bin/
Expand Down Expand Up @@ -45,27 +45,27 @@ index f8226e1..dc9980f 100755
exit 1 ;;
esac
diff --git a/pkg/build/nodeimage/const_cni.go b/pkg/build/nodeimage/const_cni.go
index 6715884..f7a8e88 100644
index 1d06e05..4568afb 100644
--- a/pkg/build/nodeimage/const_cni.go
+++ b/pkg/build/nodeimage/const_cni.go
@@ -20,7 +20,7 @@ package nodeimage
The default CNI manifest and images are our own tiny kindnet
*/

-const kindnetdImage = "docker.io/kindest/kindnetd:v20240513-cd2ac642"
-const kindnetdImage = "docker.io/kindest/kindnetd:v20240813-c6f155d6"
+const kindnetdImage = "quay.io/powercloud/kind-kindnetd:v20240626-0296c52"

var defaultCNIImages = []string{kindnetdImage}

diff --git a/pkg/build/nodeimage/const_storage.go b/pkg/build/nodeimage/const_storage.go
index 7ddb8a6..03815e0 100644
index d62c4ab..03815e0 100644
--- a/pkg/build/nodeimage/const_storage.go
+++ b/pkg/build/nodeimage/const_storage.go
@@ -25,8 +25,8 @@ NOTE: we have customized it in the following ways:
- install as the default storage class
*/

-const storageProvisionerImage = "docker.io/kindest/local-path-provisioner:v20240513-b9bba138"
-const storageProvisionerImage = "docker.io/kindest/local-path-provisioner:v20240813-c6f155d6"
-const storageHelperImage = "docker.io/kindest/local-path-helper:v20230510-486859a6"
+const storageProvisionerImage = "quay.io/powercloud/kind-local-path-provisioner:v20240626-0296c52"
+const storageHelperImage = "quay.io/powercloud/kind-local-path-helper:v20240626-0296c52"
Expand Down

0 comments on commit 0aeb961

Please sign in to comment.