From 8934b2cb17f3005f8d4bbdadeb43daa348754dee Mon Sep 17 00:00:00 2001
From: Pandurang Khandeparker <PANDURANG.KHANDEPARKER@ibm.com>
Date: Fri, 4 Apr 2025 14:39:01 +0100
Subject: [PATCH] Add s390x binary support (#7505)

Signed-off-by: Pandurang Alias Aradhya Khandeparker <PANDURANG.KHANDEPARKER@ibm.com>
Signed-off-by: Rishi Misra <rishi@ca.ibm.com>
Co-authored-by: Rishi Misra <rishi@ca.ibm.com>
---
 .goreleaser.yml                                  | 7 ++++++-
 Makefile                                         | 4 ++--
 changelogs/unreleased/7505-pandurangkhandeparker | 1 +
 3 files changed, 9 insertions(+), 3 deletions(-)
 create mode 100644 changelogs/unreleased/7505-pandurangkhandeparker

diff --git a/.goreleaser.yml b/.goreleaser.yml
index 5f51dcfda..0ff87e36a 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -26,18 +26,23 @@ builds:
       - arm
       - arm64
       - ppc64le
+      - s390x
     ignore:
       # don't build arm for darwin and arm/arm64 for windows
       - goos: darwin
         goarch: arm
       - goos: darwin
         goarch: ppc64le
+      - goos: darwin
+        goarch: s390x
       - goos: windows
         goarch: arm
       - goos: windows
         goarch: arm64
       - goos: windows
         goarch: ppc64le
+      - goos: windows
+        goarch: s390x
     ldflags:
       - -X "github.com/vmware-tanzu/velero/pkg/buildinfo.Version={{ .Tag }}" -X "github.com/vmware-tanzu/velero/pkg/buildinfo.GitSHA={{ .FullCommit }}" -X "github.com/vmware-tanzu/velero/pkg/buildinfo.GitTreeState={{ .Env.GIT_TREE_STATE }}" -X "github.com/vmware-tanzu/velero/pkg/buildinfo.ImageRegistry={{ .Env.REGISTRY }}"
 archives:
@@ -60,4 +65,4 @@ git:
   # tags if there are more than one tag in the same commit.
   #
   # Default: `-version:refname`
-  tag_sort: -version:creatordate
\ No newline at end of file
+  tag_sort: -version:creatordate
diff --git a/Makefile b/Makefile
index 472970c4f..175cfbd53 100644
--- a/Makefile
+++ b/Makefile
@@ -112,7 +112,7 @@ comma=,
 # The version of restic binary to be downloaded
 RESTIC_VERSION ?= 0.15.0
 
-CLI_PLATFORMS ?= linux-amd64 linux-arm linux-arm64 darwin-amd64 darwin-arm64 windows-amd64 linux-ppc64le
+CLI_PLATFORMS ?= linux-amd64 linux-arm linux-arm64 darwin-amd64 darwin-arm64 windows-amd64 linux-ppc64le linux-s390x
 BUILD_OUTPUT_TYPE ?= docker
 BUILD_OS ?= linux
 BUILD_ARCH ?= amd64
@@ -495,4 +495,4 @@ new-changelog:
 	fi
 	@mkdir -p ./changelogs/unreleased/ && \
 	echo $(CHANGELOG_BODY) > ./changelogs/unreleased/$(GH_PR_NUMBER)-$(GH_LOGIN) && \
-	echo \"$(CHANGELOG_BODY)\" added to "./changelogs/unreleased/$(GH_PR_NUMBER)-$(GH_LOGIN)"
+	echo \"$(CHANGELOG_BODY)\" added to "./changelogs/unreleased/$(GH_PR_NUMBER)-$(GH_LOGIN)"
\ No newline at end of file
diff --git a/changelogs/unreleased/7505-pandurangkhandeparker b/changelogs/unreleased/7505-pandurangkhandeparker
new file mode 100644
index 000000000..a5eacb4a6
--- /dev/null
+++ b/changelogs/unreleased/7505-pandurangkhandeparker
@@ -0,0 +1 @@
+This PR aims to add s390x support to Velero binary.