Merge pull request #11 from mallardduck/update/main-drop-s390

Drop s390x builds
rancher · Sep 3, 2024 · c60a509 · c60a509
2 parents d1a86f9 + a2e2e55
commit c60a509
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 14 deletions.
diff --git a/.github/workflows/head-build.yml b/.github/workflows/head-build.yml
@@ -58,7 +58,7 @@ jobs:
         with:
           image: ${{ vars.IMAGE_NAME || 'kuberlr-kubectl' }}
           tag: ${{ needs.prebuild-env.outputs.branch_static_tag }}
-          platforms: "linux/amd64,linux/arm64,linux/s390x"
+          platforms: "linux/amd64,linux/arm64"
 
           public-registry: ${{ env.PUBLIC_REGISTRY }}
           public-repo: ${{ vars.REPO || github.repository_owner }}

diff --git a/.github/workflows/release-publish.yml b/.github/workflows/release-publish.yml
@@ -49,7 +49,7 @@ jobs:
         with:
           image: kuberlr-kubectl
           tag: ${{ github.ref_name }}
-          platforms: "linux/amd64,linux/arm64,linux/s390x"
+          platforms: "linux/amd64,linux/arm64"
 
           public-registry: ${{ env.PUBLIC_REGISTRY }}
           public-repo: ${{ vars.REPO || github.repository_owner }}

diff --git a/Makefile b/Makefile
@@ -6,7 +6,7 @@ include hack/make/deps.mk
 include hack/make/build.mk
 
 # Define target platforms, image builder and the fully qualified image name.
-TARGET_PLATFORMS ?= linux/amd64,linux/arm64,linux/s390x
+TARGET_PLATFORMS ?= linux/amd64,linux/arm64
 
 REPO ?= rancher
 IMAGE ?= kuberlr-kubectl

diff --git a/hack/make/deps.mk b/hack/make/deps.mk
@@ -1,28 +1,24 @@
 KUBECTL28_VERSION := v1.28.13
 KUBECTL28_SUM_arm64 ?= $(shell curl -L "https://dl.k8s.io/release/$(KUBECTL28_VERSION)/bin/linux/arm64/kubectl.sha256")
 KUBECTL28_SUM_amd64 ?= $(shell curl -L "https://dl.k8s.io/release/$(KUBECTL28_VERSION)/bin/linux/amd64/kubectl.sha256")
-KUBECTL28_SUM_s390x ?= $(shell curl -L "https://dl.k8s.io/release/$(KUBECTL28_VERSION)/bin/linux/s390x/kubectl.sha256")
 
 KUBECTL29_VERSION := v1.29.8
 KUBECTL29_SUM_arm64 ?= $(shell curl -L "https://dl.k8s.io/release/$(KUBECTL29_VERSION)/bin/linux/arm64/kubectl.sha256")
 KUBECTL29_SUM_amd64 ?= $(shell curl -L "https://dl.k8s.io/release/$(KUBECTL29_VERSION)/bin/linux/amd64/kubectl.sha256")
-KUBECTL29_SUM_s390x ?= $(shell curl -L "https://dl.k8s.io/release/$(KUBECTL29_VERSION)/bin/linux/s390x/kubectl.sha256")
 
 KUBECTL30_VERSION := v1.30.4
 KUBECTL30_SUM_arm64 ?= $(shell curl -L "https://dl.k8s.io/release/$(KUBECTL30_VERSION)/bin/linux/arm64/kubectl.sha256")
 KUBECTL30_SUM_amd64 ?= $(shell curl -L "https://dl.k8s.io/release/$(KUBECTL30_VERSION)/bin/linux/amd64/kubectl.sha256")
-KUBECTL30_SUM_s390x ?= $(shell curl -L "https://dl.k8s.io/release/$(KUBECTL30_VERSION)/bin/linux/s390x/kubectl.sha256")
 
 KUBECTL31_VERSION := v1.31.0
-KUBECTL31_SUM_arm64 ?= $(shell curl -L "https://dl.k8s.io/release/$(KUBECTL27_VERSION)/bin/linux/arm64/kubectl.sha256")
-KUBECTL31_SUM_amd64 ?= $(shell curl -L "https://dl.k8s.io/release/$(KUBECTL27_VERSION)/bin/linux/amd64/kubectl.sha256")
-KUBECTL31_SUM_s390x ?= $(shell curl -L "https://dl.k8s.io/release/$(KUBECTL27_VERSION)/bin/linux/s390x/kubectl.sha256")
+KUBECTL31_SUM_arm64 ?= $(shell curl -L "https://dl.k8s.io/release/$(KUBECTL31_VERSION)/bin/linux/arm64/kubectl.sha256")
+KUBECTL31_SUM_amd64 ?= $(shell curl -L "https://dl.k8s.io/release/$(KUBECTL31_VERSION)/bin/linux/amd64/kubectl.sha256")
 
 
-KUBECTL28 := "$(KUBECTL28_VERSION):$(KUBECTL28_SUM_arm64):$(KUBECTL28_SUM_amd64):$(KUBECTL28_SUM_s390x)"
-KUBECTL29 := "$(KUBECTL29_VERSION):$(KUBECTL29_SUM_arm64):$(KUBECTL29_SUM_amd64):$(KUBECTL29_SUM_s390x)"
-KUBECTL30 := "$(KUBECTL30_VERSION):$(KUBECTL30_SUM_arm64):$(KUBECTL30_SUM_amd64):$(KUBECTL30_SUM_s390x)"
-KUBECTL31 := "$(KUBECTL31_VERSION):$(KUBECTL31_SUM_arm64):$(KUBECTL31_SUM_amd64):$(KUBECTL31_SUM_s390x)"
+KUBECTL28 := "$(KUBECTL28_VERSION):$(KUBECTL28_SUM_arm64):$(KUBECTL28_SUM_amd64)"
+KUBECTL29 := "$(KUBECTL29_VERSION):$(KUBECTL29_SUM_arm64):$(KUBECTL29_SUM_amd64)"
+KUBECTL30 := "$(KUBECTL30_VERSION):$(KUBECTL30_SUM_arm64):$(KUBECTL30_SUM_amd64)"
+KUBECTL31 := "$(KUBECTL31_VERSION):$(KUBECTL31_SUM_arm64):$(KUBECTL31_SUM_amd64)"
 
 KUBECTL_VERSION_INFO := "$(KUBECTL28) $(KUBECTL29) $(KUBECTL30) $(KUBECTL31)"
 

diff --git a/package/Dockerfile b/package/Dockerfile
@@ -27,7 +27,6 @@ RUN set -fx; versions=($KUBECTL_VERSION_INFO); \
         version=$(echo ${versions[$i]} | cut -d: -f1); \
         arm64_sum=$(echo ${versions[$i]} | cut -d: -f2); \
         amd64_sum=$(echo ${versions[$i]} | cut -d: -f3); \
-        s390x_sum=$(echo ${versions[$i]} | cut -d: -f4); \
         kubectl_target="/tmp/kubectl${version:1}"; \
         KUBE_SUM_NAME="${TARGETARCH}_sum"; \
         KUBE_SUM=${!KUBE_SUM_NAME}; \