Accepting request 1137979 from home:bmwiedemann:branches:devel:kubic

Add kubernetes-sort-custom-column-print-flags.patch for reproducible builds

OBS-URL: https://build.opensuse.org/request/show/1137979
OBS-URL: https://build.opensuse.org/package/show/devel:kubic/kubernetes1.22?expand=0&rev=20

kubernetes-sort-custom-column-print-flags.patch

@@ -0,0 +1,33 @@
+From 0a594d9c858958078463954d10bfc17736910da9 Mon Sep 17 00:00:00 2001
+From: kkkkun <scuzk373x@gmail.com>
+Date: Thu, 3 Mar 2022 22:31:58 +0800
+Subject: [PATCH] sort custom column print flags
+
+(cherry picked from commit 36ed148761cb5a30c21b45a64d95cabd1a9d07ff)
+---
+ staging/src/k8s.io/kubectl/pkg/cmd/get/customcolumn_flags.go | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/get/customcolumn_flags.go b/staging/src/k8s.io/kubectl/pkg/cmd/get/customcolumn_flags.go
+index eee919b49b3..efd7fcf7524 100644
+--- a/staging/src/k8s.io/kubectl/pkg/cmd/get/customcolumn_flags.go
++++ b/staging/src/k8s.io/kubectl/pkg/cmd/get/customcolumn_flags.go
+@@ -19,6 +19,7 @@ package get
+ import (
+ 	"fmt"
+ 	"os"
++	"sort"
+ 	"strings"
+ 
+ 	"github.com/spf13/cobra"
+@@ -45,6 +46,7 @@ func (f *CustomColumnsPrintFlags) AllowedFormats() []string {
+ 	for format := range columnsFormats {
+ 		formats = append(formats, format)
+ 	}
++	sort.Strings(formats)
+ 	return formats
+ }
+ 
+-- 
+2.35.3
+

kubernetes1.22.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jan 10 17:43:49 UTC 2024 - Bernhard Wiedemann <bwiedemann@suse.com>
+
+- Add kubernetes-sort-custom-column-print-flags.patch
+  for reproducible builds
+
 -------------------------------------------------------------------
 Mon Mar 27 09:24:52 UTC 2023 - Robert Munteanu <rombert@apache.org>
 

kubernetes1.22.spec

@@ -49,6 +49,7 @@ Patch3:         opensuse-version-checks.patch
 Patch4:         kubeadm-opensuse-flexvolume.patch
 # Patch to revert renaming of coredns image location to match how it's done on download.opensuse.org
 Patch5:         revert-coredns-image-renaming.patch
+Patch6:         kubernetes-sort-custom-column-print-flags.patch
 BuildRequires:  bash-completion
 BuildRequires:  fdupes
 BuildRequires:  git
@@ -202,6 +203,7 @@ Kubernetes client tools common files
 %patch3 -p1
 %patch4 -p0
 %patch5 -p1
+%patch6 -p1
 
 %build
 # This is fixing bug bsc#1065972