Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop s390x builds #11

Merged
merged 1 commit into from
Sep 3, 2024
Merged

Drop s390x builds #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/head-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 6 additions & 10 deletions hack/make/deps.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)"

Expand Down
1 change: 0 additions & 1 deletion package/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}; \
Expand Down