From a58bb80be874d1f848158288eae4d0e7e66b03dd Mon Sep 17 00:00:00 2001 From: Bradley G Smith Date: Sep 14 2023 17:48:03 +0000 Subject: Adds golang BuildRequires To Kubeadm RPM Adds the BuildRequires >= xxx.xx to the kubeadm rpm definition. For some reason it was missing. This creates a consistent golang requirement for all (sub-) packages. --- diff --git a/.gitignore b/.gitignore index db128e6..fe1a538 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /kubernetes-25b4e43.tar.gz /kubernetes-fa3d799.tar.gz /kubernetes-8dc49c4.tar.gz +/kubernetes-89a4ea3.tar.gz diff --git a/kubernetes.spec b/kubernetes.spec index e978546..22d484b 100644 --- a/kubernetes.spec +++ b/kubernetes.spec @@ -15,7 +15,7 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path kubernetes.io/ -%global commit 8dc49c4b984b897d423aab4971090e1879eb4f23 +%global commit 89a4ea3e1e4ddd7f7572286090359983e0387b2f %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.28.1 +Version: 1.28.2 Release: %autorelease Summary: Open Source Production-Grade Container Scheduling And Management Platform License: ASL 2.0 @@ -68,7 +68,7 @@ Requires: kubernetes-node = %{version}-%{release} %package master Summary: Kubernetes services for control plane host -BuildRequires: golang >= 1.20.6 +BuildRequires: golang >= 1.20.8 BuildRequires: systemd BuildRequires: rsync BuildRequires: go-md2man @@ -94,7 +94,7 @@ Requires: (containerd or cri-o) Suggests: containerd Requires: conntrack-tools -BuildRequires: golang >= 1.20.6 +BuildRequires: golang >= 1.20.8 BuildRequires: systemd BuildRequires: rsync BuildRequires: go-md2man @@ -118,6 +118,7 @@ Kubernetes services for worker node host Summary: Kubernetes tool for standing up clusters Requires: kubernetes-node = %{version}-%{release} +BuildRequires: golang >= 1.20.8 Requires: containernetworking-plugins Requires: cri-tools @@ -128,7 +129,7 @@ Kubernetes tool for standing up clusters %package client Summary: Kubernetes client tools -BuildRequires: golang >= 1.20.6 +BuildRequires: golang >= 1.20.8 #BuildRequires: go-bindata BuildRequires: make diff --git a/sources b/sources index dcbde09..3fcc2bc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kubernetes-8dc49c4.tar.gz) = 86b0e7fd7cf48ddc69bc7fb02ea4af060015016726bc61bb5e2e3d67e7585cdec332c944ec2b922ac84923417326e7a33a7b29365a6fa71a56a25f5ebc56762d +SHA512 (kubernetes-89a4ea3.tar.gz) = 3ec628baa4b4b327338c7ad2c5ca9d0f57bf2c5b2a117ff963960c6527fb02f79065d07c753baac6f39b730fc283026fbd5862e1d22762e2c6c1e61c793b242c