From 6efdaac8f57a5046eb68e7af9faae6f18b1b3bc4 Mon Sep 17 00:00:00 2001 From: Dan Pock Date: Wed, 20 Nov 2024 12:47:36 -0500 Subject: [PATCH 1/2] drop s390x image builds --- .github/workflows/release.yml | 9 +++------ Makefile | 2 +- hack/make/deps.mk | 11 +++-------- package/Dockerfile | 6 +++--- 4 files changed, 10 insertions(+), 18 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6a5a0ee..08f5657 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,19 +19,16 @@ jobs: matrix: include: # Four images are created: - # - Multi-arch manifest for amd64, arm64 and s390x + # - Multi-arch manifest for: amd64 and arm64 - tag-suffix: "" - platforms: linux/amd64,linux/arm64,linux/s390x + platforms: linux/amd64,linux/arm64 # - arm64 manifest - tag-suffix: "-arm64" platforms: linux/arm64 # - amd64 manifest - tag-suffix: "-amd64" platforms: linux/amd64 - # - s390x manifest - - tag-suffix: "-s390x" - platforms: linux/s390x - + steps: - name: Checkout code uses: actions/checkout@v4 diff --git a/Makefile b/Makefile index cfafdbb..b6efc0d 100644 --- 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 = $(REPO)/shell:$(TAG) diff --git a/hack/make/deps.mk b/hack/make/deps.mk index 1480a36..ab7a180 100644 --- a/hack/make/deps.mk +++ b/hack/make/deps.mk @@ -4,7 +4,6 @@ HELM_VERSION := v3.16.1-rancher1 KUBECTL_VERSION := v1.29.10 KUBECTL_SUM_arm64 ?= $(shell curl -L "https://dl.k8s.io/release/$(KUBECTL_VERSION)/bin/linux/arm64/kubectl.sha256") KUBECTL_SUM_amd64 ?= $(shell curl -L "https://dl.k8s.io/release/$(KUBECTL_VERSION)/bin/linux/amd64/kubectl.sha256") -KUBECTL_SUM_s390x ?= $(shell curl -L "https://dl.k8s.io/release/$(KUBECTL_VERSION)/bin/linux/s390x/kubectl.sha256") # renovate: datasource=github-release-attachments depName=kubernetes-sigs/kustomize extractVersion=kustomize/v(?\d+\.\d+\.\d+) KUSTOMIZE_VERSION := v5.5.0 @@ -12,8 +11,6 @@ KUSTOMIZE_VERSION := v5.5.0 KUSTOMIZE_SUM_arm64 := b4170d1acb8cfacace9f72884bef957ff56efdcd4813b66e7604aabc8b57e93d # renovate: datasource=github-release-attachments depName=kubernetes-sigs/kustomize versioning=regex:^kustomize/v(?\d+)\.(?\d+)\.(?\d+)$ digestVersion=kustomize/v5.5.0 KUSTOMIZE_SUM_amd64 := 6703a3a70a0c47cf0b37694030b54f1175a9dfeb17b3818b623ed58b9dbc2a77 -# renovate: datasource=github-release-attachments depName=kubernetes-sigs/kustomize versioning=regex:^kustomize/v(?\d+)\.(?\d+)\.(?\d+)$ digestVersion=kustomize/v5.5.0 -KUSTOMIZE_SUM_s390x := 37dcd2429ef93886319b39671071b2e1c5307993cdb6a5c097cfefc97177d296 # renovate: datasource=github-release-attachments depName=derailed/k9s K9S_VERSION := v0.32.6 @@ -21,11 +18,9 @@ K9S_VERSION := v0.32.6 K9S_SUM_arm64 := dfe0bb78e17a4b72ff151e18e548467b6073608e1af4e2efb30a884eed772ea0 # renovate: datasource=github-release-attachments depName=derailed/k9s digestVersion=v0.32.6 K9S_SUM_amd64 := 3f5fa5b3563cf2962ecd78381df59a72a01d824d87f3c70493f7748807243755 -# renovate: datasource=github-release-attachments depName=derailed/k9s digestVersion=v0.32.6 -K9S_SUM_s390x := 261074c92d1d2e9b181700b2cf8d7166acff30d2bb425437c9f5027815de44b6 # Reduces the code duplication on Makefile by keeping all args into a single variable. IMAGE_ARGS := --build-arg HELM_VERSION=$(HELM_VERSION) \ - --build-arg KUBECTL_VERSION=$(KUBECTL_VERSION) --build-arg KUBECTL_SUM_arm64=$(KUBECTL_SUM_arm64) --build-arg KUBECTL_SUM_amd64=$(KUBECTL_SUM_amd64) --build-arg KUBECTL_SUM_s390x=$(KUBECTL_SUM_s390x) \ - --build-arg KUSTOMIZE_VERSION=$(KUSTOMIZE_VERSION) --build-arg KUSTOMIZE_SUM_arm64=$(KUSTOMIZE_SUM_arm64) --build-arg KUSTOMIZE_SUM_amd64=$(KUSTOMIZE_SUM_amd64) --build-arg KUSTOMIZE_SUM_s390x=$(KUSTOMIZE_SUM_s390x) \ - --build-arg K9S_VERSION=$(K9S_VERSION) --build-arg K9S_SUM_arm64=$(K9S_SUM_arm64) --build-arg K9S_SUM_amd64=$(K9S_SUM_amd64) --build-arg K9S_SUM_s390x=$(K9S_SUM_s390x) + --build-arg KUBECTL_VERSION=$(KUBECTL_VERSION) --build-arg KUBECTL_SUM_arm64=$(KUBECTL_SUM_arm64) --build-arg KUBECTL_SUM_amd64=$(KUBECTL_SUM_amd64) \ + --build-arg KUSTOMIZE_VERSION=$(KUSTOMIZE_VERSION) --build-arg KUSTOMIZE_SUM_arm64=$(KUSTOMIZE_SUM_arm64) --build-arg KUSTOMIZE_SUM_amd64=$(KUSTOMIZE_SUM_amd64) \ + --build-arg K9S_VERSION=$(K9S_VERSION) --build-arg K9S_SUM_arm64=$(K9S_SUM_arm64) --build-arg K9S_SUM_amd64=$(K9S_SUM_amd64) diff --git a/package/Dockerfile b/package/Dockerfile index 4a0993a..29b6e96 100644 --- a/package/Dockerfile +++ b/package/Dockerfile @@ -24,9 +24,9 @@ FROM --platform=$BUILDPLATFORM registry.suse.com/bci/bci-base:${BCI_VERSION} AS RUN zypper -n install curl gzip tar # Define build arguments -ARG KUBECTL_VERSION KUBECTL_SUM_arm64 KUBECTL_SUM_amd64 KUBECTL_SUM_s390x \ - KUSTOMIZE_VERSION KUSTOMIZE_SUM_arm64 KUSTOMIZE_SUM_amd64 KUSTOMIZE_SUM_s390x \ - K9S_VERSION K9S_SUM_arm64 K9S_SUM_amd64 K9S_SUM_s390x +ARG KUBECTL_VERSION KUBECTL_SUM_arm64 KUBECTL_SUM_amd64 \ + KUSTOMIZE_VERSION KUSTOMIZE_SUM_arm64 KUSTOMIZE_SUM_amd64 \ + K9S_VERSION K9S_SUM_arm64 K9S_SUM_amd64 ARG TARGETARCH # Stage kubectl into build From 525c49498583210cf196a732ce803f134e0140b9 Mon Sep 17 00:00:00 2001 From: Dan Pock Date: Wed, 20 Nov 2024 12:49:18 -0500 Subject: [PATCH 2/2] fix whitespace --- .github/workflows/release.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 08f5657..2312032 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,7 +14,6 @@ jobs: # - OIDC for cosign's use in ecm-distro-tools/publish-image. # - Read vault secrets in rancher-eio/read-vault-secrets. id-token: write - strategy: matrix: include: @@ -28,7 +27,6 @@ jobs: # - amd64 manifest - tag-suffix: "-amd64" platforms: linux/amd64 - steps: - name: Checkout code uses: actions/checkout@v4