Notification time stamped 2023-03-31 16:55:08 UTC
From ec079c4a8a4fe1c88618300e4da83932d2465117 Mon Sep 17 00:00:00 2001
From: Bradley G Smith <bradley.g.smith(a)gmail.com>
Date: Mar 31 2023 16:52:12 +0000
Subject: Change How Go Compiler Is Used
With K*S 1.26.3/1.25.8/1.24.12 upstream now builds with an explicit version of go and will try to fetch that version if not present. FORCE_HOTS_GO=y overrides that specification by using the host's version of go. This spec file continues to use built requires to require as a minimum the 'built with' go version from upstream.
Also adds missing dotfiles to src directory during build.
---
diff --git a/.gitignore b/.gitignore
index c41faa2..d51bc29 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
/kubernetes-b46a3f8.tar.gz
/kubernetes-8f94681.tar.gz
/kubernetes-fc04e73.tar.gz
+/kubernetes-9e64410.tar.gz
diff --git a/kubernetes.spec b/kubernetes.spec
index 1d4262e..c9db541 100644
--- a/kubernetes.spec
+++ b/kubernetes.spec
@@ -15,7 +15,7 @@
%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
%global import_path k8s.io/kubernetes
-%global commit fc04e732bb3e7198d2fa44efa5457c7c6f8c0f5b
+%global commit 9e644106593f3f4aa98f8a84b23db5fa378900bd
%global shortcommit %(c=%{commit}; echo ${c:0:7})
# Needed otherwise "version_ldflags=$(kube::version_ldflags)" doesn't work
@@ -24,7 +24,7 @@
##############################################
Name: kubernetes
-Version: 1.26.2
+Version: 1.26.3
Release: %autorelease
Summary: Container cluster management
License: ASL 2.0
@@ -66,7 +66,7 @@ Requires: kubernetes-node = %{version}-%{release}
%package master
Summary: Kubernetes services for control plane host
-BuildRequires: golang >= 1.19.6
+BuildRequires: golang >= 1.19.7
BuildRequires: systemd
BuildRequires: rsync
BuildRequires: go-md2man
@@ -90,7 +90,7 @@ Requires: (containerd or cri-o)
Suggests: containerd
Requires: conntrack-tools
-BuildRequires: golang >= 1.19.6
+BuildRequires: golang >= 1.19.7
BuildRequires: systemd
BuildRequires: rsync
BuildRequires: go-md2man
@@ -122,7 +122,7 @@ Kubernetes tool for standing up clusters
%package client
Summary: Kubernetes client tools
-BuildRequires: golang >= 1.19.6
+BuildRequires: golang >= 1.19.7
BuildRequires: go-bindata
BuildRequires: make
@@ -154,9 +154,22 @@ done
mkdir -p src/k8s.io/kubernetes
mv $(ls | grep -v "^src$") src/k8s.io/kubernetes/.
+# mv command above skips all dot files. Move .generated_files and all
+#.go* files
+mv .generated_files src/k8s.io/kubernetes/.
+mv .go* src/k8s.io/kubernetes/.
+
###############
%build
+
+# With K*S 1.26.3/1.25.8/1.24.12 upstream now builds with an explicit
+# version of go and will try to fetch that version if not present.
+# FORCE_HOTS_GO=y overrides that specification by using the host's
+# version of go. This spec file continues to use built requires to
+# require as a minimum the 'built with' go version from upstream.
+export FORCE_HOST_GO=y
+
pushd src/k8s.io/kubernetes/
source hack/lib/init.sh
kube::golang::setup_env
diff --git a/sources b/sources
index 6e0ec43..518d199 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (kubernetes-fc04e73.tar.gz) = fe0420753094216163b4af789f97702e4836a13ceb12f54180e6369fb40168d9f279c303540ba15294dc26d70728a7865f1184b9a22f30ca52d3c849ed71fb59
+SHA512 (kubernetes-9e64410.tar.gz) = 774e580feead78994fe38ca3a1af8e8498f5a8de1e6048a76134f82438445a3a331edd4e59ae75f13b4a30b74a356f49ee19c5df7592c7b3ad671a042f8a282d
https://src.fedoraproject.org/rpms/kubernetes/c/ec079c4a8a4fe1c88618300e4da…