From da9c99290715037647a3d782e01960da18863bbc Mon Sep 17 00:00:00 2001 From: Aleksandr Proklov Date: Thu, 25 Feb 2021 15:39:23 +0900 Subject: [PATCH 1/4] newpkg --- kubernetes.spec | 63 ++++++++++++++++++++++++++----------------------- 1 file changed, 34 insertions(+), 29 deletions(-) diff --git a/kubernetes.spec b/kubernetes.spec index 99b7c04..d751688 100644 --- a/kubernetes.spec +++ b/kubernetes.spec @@ -5,14 +5,14 @@ Name: kubernetes Version: 1.20.2 Release: 1 Summary: Production-Grade Container Scheduling and Management +Group: Development/Other License: ASL 2.0 URL: https://kubernetes.io Source0: https://github.com/kubernetes/kubernetes/archive/v%{version}/%{name}-%{version}.tar.gz -Source1: https://raw.githubusercontent.com/kubernetes/release/master/packages/rpm/kubelet.service -Source2: https://raw.githubusercontent.com/kubernetes/release/master/packages/rpm/10-kubeadm-post-1.11.conf -Source3: https://raw.githubusercontent.com/kubernetes/release/master/packages/rpm/kubelet.env -Source1000: %{name}.rpmlintrc -Group: Development/Other +Source1: https://raw.githubusercontent.com/kubernetes/release/master/packages/rpm/kubelet.service +Source2: https://raw.githubusercontent.com/kubernetes/release/master/packages/rpm/10-kubeadm-post-1.11.conf +Source3: https://raw.githubusercontent.com/kubernetes/release/master/packages/rpm/kubelet.env +Source10: %{name}.rpmlintrc BuildRequires: go >= 1.15 BuildRequires: git-core BuildRequires: upx @@ -24,23 +24,25 @@ for deployment, maintenance, and scaling of applications. #------------------------------------------------------------ -%package -n kubectl -Summary: Container Cluster Manager - Kubernetes client tools +%package -n kubectl +Summary: Container Cluster Manager - Kubernetes client tools +Group: Development/Other -%description -n kubectl +%description -n kubectl Command-line utility for interacting with a Kubernetes cluster -%files -n kubectl +%files -n kubectl %{_bindir}/kubectl #------------------------------------------------------------ %package -n kubeadm -Summary: Command-line utility for administering a Kubernetes cluster -Requires: kubelet >= 1.20.0 -Requires: kubectl >= 1.20.0 -Requires: cni-plugins >= 0.8.6 -Requires: cri-tools >= 1.20.0 +Summary: Command-line utility for administering a Kubernetes cluster +Group: Development/Other +Requires: kubelet >= 1.20.0 +Requires: kubectl >= 1.20.0 +Requires: cni-plugins >= 0.8.6 +Requires: cri-tools >= 1.20.0 %description -n kubeadm Command-line utility for deploying a Kubernetes cluster @@ -50,22 +52,23 @@ Command-line utility for deploying a Kubernetes cluster #------------------------------------------------------------ -%package -n kubelet -Summary: Container Cluster Manager - Kubernetes Node Agent -Requires: conntrack-tools -Requires: ebtables -Requires: ethtool -Requires: iproute -Requires: iptables >= 1.4.21 -Requires: cni-plugins >= 0.8.6 -Requires: socat -Requires: util-linux -Requires: systemd +%package -n kubelet +Summary: Container Cluster Manager - Kubernetes Node Agent +Group: Development/Other +Requires: conntrack-tools +Requires: ebtables +Requires: ethtool +Requires: iproute +Requires: iptables >= 1.4.21 +Requires: cni-plugins >= 0.8.6 +Requires: socat +Requires: util-linux +Requires: systemd -%description -n kubelet +%description -n kubelet The node agent of Kubernetes, the container cluster manager -%files -n kubelet +%files -n kubelet %{_bindir}/kubelet %{_unitdir}/kubelet.service %{_unitdir}/kubelet.service.d/10-kubeadm.conf @@ -75,7 +78,8 @@ The node agent of Kubernetes, the container cluster manager #------------------------------------------------------------ %package tools -Summary: Kubernetes tools +Summary: Kubernetes tools +Group: Development/Other %description tools Kubernetes tools @@ -86,7 +90,8 @@ Kubernetes tools #------------------------------------------------------------ %package docs -Summary: Documentation for Kubernetes +Summary: Documentation for Kubernetes +Group: Documentation %description docs Documentation for Kubernetes From 893640a85c90e8a95954262bd0182f4bb8a81192 Mon Sep 17 00:00:00 2001 From: Aleksandr Proklov Date: Thu, 25 Feb 2021 15:42:29 +0900 Subject: [PATCH 2/4] remove upx --- kubernetes.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubernetes.spec b/kubernetes.spec index d751688..794cf50 100644 --- a/kubernetes.spec +++ b/kubernetes.spec @@ -15,7 +15,7 @@ Source3: https://raw.githubusercontent.com/kubernetes/release/master/packages/rp Source10: %{name}.rpmlintrc BuildRequires: go >= 1.15 BuildRequires: git-core -BuildRequires: upx +#BuildRequires: upx %description Kubernetes is an open source system for managing containerized From 39a422e7b6839e370e22ac1a77f05350e62f0cad Mon Sep 17 00:00:00 2001 From: Aleksandr Proklov Date: Thu, 25 Feb 2021 16:54:03 +0900 Subject: [PATCH 3/4] update version 1.20.4 --- .abf.yml | 2 +- kubernetes.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.abf.yml b/.abf.yml index fd90c86..0b093c9 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,2 @@ sources: - kubernetes-1.20.2.tar.gz: 06d562409795c779a4826a71e50228f6eb969493 + kubernetes-1.20.4.tar.gz: e6800d3acfd892fa062e22b23c3c8b85bc3bfc93 diff --git a/kubernetes.spec b/kubernetes.spec index 794cf50..0f31943 100644 --- a/kubernetes.spec +++ b/kubernetes.spec @@ -2,7 +2,7 @@ %define debug_package %nil Name: kubernetes -Version: 1.20.2 +Version: 1.20.4 Release: 1 Summary: Production-Grade Container Scheduling and Management Group: Development/Other From 45f9143386b4b9e4273e9cc52666263646497638 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80?= Date: Fri, 26 Feb 2021 08:24:07 +0000 Subject: [PATCH 4/4] use macros for sysctl --- kubernetes.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubernetes.spec b/kubernetes.spec index 0f31943..1eb03ee 100644 --- a/kubernetes.spec +++ b/kubernetes.spec @@ -126,7 +126,7 @@ install -dm0755 %{buildroot}%{_sysconfdir}/kubernetes/manifests install -dm0755 %{buildroot}%{_sysconfdir}/sysconfig/kubelet install -dm0755 %{buildroot}%{_sysconfdir}/cni/net.d install -dm0755 %{buildroot}%{_libexecdir}/modules-load.d -install -dm0755 %{buildroot}/usr/lib/sysctl.d +install -dm0755 %{buildroot}%{_sysctldir} install -dm0755 %{buildroot}%{_mandir}/man1 # kubeadm