PR#6: Rebase to 1.20.5 - rpms/kubernetes

rpms / kubernetes

#6 Rebase to 1.20.5

Merged 3 years ago by ngompa. Opened 3 years ago by ngompa.

rpms/ ngompa/kubernetes update-to-k8s-1.20.5 into rawhide

Neal Gompa • 3 years ago

e04890d

.gitignore

file modified

		`@@ -1,2 +1,3 @@`
		`/kubernetes-1e11e4a.tar.gz`
		`/kubernetes-fbf646b.tar.gz`
		`+ /kubernetes-6b1d87a.tar.gz`

kubelet.service

file modified

+1 -1

		`@@ -1,7 +1,7 @@`
		`[Unit]`
		`Description=Kubernetes Kubelet Server`
		`Documentation=https://kubernetes.io/docs/concepts/overview/components/#kubelet https://kubernetes.io/docs/reference/generated/kubelet/`
		`- After=docker.service crio.service`
		`+ After=containerd.service crio.service docker.service`

		`[Service]`
		`WorkingDirectory=/var/lib/kubelet`

kubernetes.spec

file modified

+12 -8

		`@@ -15,7 +15,7 @@`

		`%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}`
		`%global import_path k8s.io/kubernetes`
		`- %global commit fbf646b339dc52336b55d8ec85c181981b86331a`
		`+ %global commit 6b1d87acf3c8253c123756b9e61dac642678305f`
		`%global shortcommit %(c=%{commit}; echo ${c:0:7})`

		`# Needed otherwise "version_ldflags=$(kube::version_ldflags)" doesn't work`
		`@@ -24,8 +24,8 @@`

		`##############################################`
		`Name: kubernetes`
		`- Version: 1.19.6`
		`- Release: 3%{?dist}`
		`+ Version: 1.20.5`
		`+ Release: 1%{?dist}`
		`Summary: Container cluster management`
		`License: ASL 2.0`
		`URL: https://%{import_path}`
		`@@ -65,7 +65,7 @@`
		`%package master`
		`Summary: Kubernetes services for master host`

		`- BuildRequires: golang >= 1.2-7`
		`+ BuildRequires: golang >= 1.15`
		`BuildRequires: systemd`
		`BuildRequires: rsync`
		`BuildRequires: go-md2man`
		`@@ -85,11 +85,11 @@`
		`%package node`
		`Summary: Kubernetes services for node host`

		`- Requires: (docker or docker-ce or moby-engine or cri-o)`
		`- Suggests: docker`
		`+ Requires: (containerd or cri-o or docker or docker-ce or moby-engine)`
		`+ Suggests: containerd`
		`Requires: conntrack-tools`

		`- BuildRequires: golang >= 1.2-7`
		`+ BuildRequires: golang >= 1.15`
		`BuildRequires: systemd`
		`BuildRequires: rsync`
		`BuildRequires: go-md2man`
		`@@ -120,7 +120,7 @@`
		`%package client`
		`Summary: Kubernetes client tools`

		`- BuildRequires: golang >= 1.2-7`
		`+ BuildRequires: golang >= 1.15`
		`BuildRequires: go-bindata`
		`BuildRequires: make`

		`@@ -369,6 +369,10 @@`

		`############################################`
		`%changelog`
		`+ * Tue Mar 30 2021 Neal Gompa <ngompa13@gmail.com> - 1.20.5-1`
		`+ - Rebase to 1.20.5`
		`+ - Update node subpackage to correct CRI options`
		`+`
		`* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.19.6-3`
		`- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild`

sources

file modified

+1 -1

		`@@ -1,1 +1,1 @@`
		`- SHA512 (kubernetes-fbf646b.tar.gz) = 2b20201db234d2e3611379eac8f01b5152d275dce5ce4fc13107776a52ae083d338d8f521795379a1238a037b95914e0dd6cb7cfaf5f286e8fe2bb846174bdc6`
		`+ SHA512 (kubernetes-6b1d87a.tar.gz) = a75423fe6f23d61ec5c7be506d60e33cd350be297c7fa39e083973190a7c25a7ef22403cc8cced95c4b8d7a492c9fefc8e3f54578a06888a29b3ee39e3905fd7`