From df3b902e6bfbafe8114889323dcadfe1debf572e Mon Sep 17 00:00:00 2001 From: Chris Friesen Date: Fri, 7 Jan 2022 20:49:31 -0500 Subject: [PATCH] Replace K8s 1.21.3 with 1.21.8 In testing K8s 1.21.8 used less CPU than 1.21.3, so we are moving to the newer version. This has been booted in vbox and a basic pod has been started. A full regression will be performed. Depends-On: https://review.opendev.org/c/starlingx/compile/+/824802 Partial-Bug: 1957994 Signed-off-by: Chris Friesen Change-Id: I64e4a64c90ef7591aeee52742dfcba9fdd8e5063 --- centos_iso_image.inc | 6 +++--- centos_pkg_dirs | 2 +- centos_tarball-dl.lst | 2 +- debian_pkg_dirs | 2 +- .../kubernetes-1.21.3-client.install | 3 --- .../deb_folder/kubernetes-1.21.3-kubeadm.dirs | 1 - .../kubernetes-1.21.3-kubeadm.install | 2 -- .../deb_folder/kubernetes-1.21.3-master.dirs | 5 ----- .../kubernetes-1.21.3-master.install | 8 -------- .../deb_folder/kubernetes-1.21.3-node.install | 2 -- .../centos/Readme.rst | 0 .../centos/build_srpm.data | 2 +- .../files/Change-log-level-to-Debug.patch | 0 ...ath-for-coredns-only-for-default-repo.patch | 0 ...ort-for-kubernetes-to-ignore-isolcpus.patch | 0 .../centos/files/genmanpages.sh | 0 ...platform-pods-with-zero-CPU-resources.patch | 0 .../centos/files/kubeadm.conf | 0 .../centos/files/kubelet-cgroup-setup.sh | 0 ...ger-disable-CFS-quota-throttling-for-.patch | 0 ...ger-infrastructure-pods-use-system-re.patch | 0 ...ger-introduce-concept-of-isolated-CPU.patch | 0 ...ger-keep-normal-containers-off-reserv.patch | 0 .../centos/kubernetes.spec | 8 ++++---- .../centos/kubernetes.spec.orig | 0 .../debian/deb_folder/changelog | 2 +- .../debian/deb_folder/control | 18 +++++++++--------- .../debian/deb_folder/copyright | 0 .../debian/deb_folder/genmanpages.sh | 0 .../debian/deb_folder/kubeadm.conf | 0 .../debian/deb_folder/kubelet-cgroup-setup.sh | 0 .../kubernetes-1.21.8-client.install | 3 +++ ...kubernetes-1.21.8-client.lintian-overrides} | 0 .../deb_folder/kubernetes-1.21.8-kubeadm.dirs | 1 + .../kubernetes-1.21.8-kubeadm.install | 2 ++ .../deb_folder/kubernetes-1.21.8-master.dirs | 5 +++++ .../kubernetes-1.21.8-master.install | 8 ++++++++ ...kubernetes-1.21.8-master.lintian-overrides} | 0 .../deb_folder/kubernetes-1.21.8-misc.install} | 0 .../deb_folder/kubernetes-1.21.8-node.install | 2 ++ .../kubernetes-1.21.8-node.lintian-overrides} | 0 .../kubernetes-1.21.8-unit-test.install} | 0 ...ath-for-coredns-only-for-default-repo.patch | 0 ...ort-for-kubernetes-to-ignore-isolcpus.patch | 0 ...platform-pods-with-zero-CPU-resources.patch | 0 ...ger-disable-CFS-quota-throttling-for-.patch | 0 ...ger-infrastructure-pods-use-system-re.patch | 0 ...ger-introduce-concept-of-isolated-CPU.patch | 0 ...ger-keep-normal-containers-off-reserv.patch | 0 .../debian/deb_folder/patches/series | 0 .../debian/deb_folder/rules | 2 +- .../debian/deb_folder/source/format | 0 .../debian/meta_data.yaml | 8 ++++---- 53 files changed, 47 insertions(+), 47 deletions(-) delete mode 100644 kubernetes/kubernetes-1.21.3/debian/deb_folder/kubernetes-1.21.3-client.install delete mode 100644 kubernetes/kubernetes-1.21.3/debian/deb_folder/kubernetes-1.21.3-kubeadm.dirs delete mode 100644 kubernetes/kubernetes-1.21.3/debian/deb_folder/kubernetes-1.21.3-kubeadm.install delete mode 100644 kubernetes/kubernetes-1.21.3/debian/deb_folder/kubernetes-1.21.3-master.dirs delete mode 100644 kubernetes/kubernetes-1.21.3/debian/deb_folder/kubernetes-1.21.3-master.install delete mode 100644 kubernetes/kubernetes-1.21.3/debian/deb_folder/kubernetes-1.21.3-node.install rename kubernetes/{kubernetes-1.21.3 => kubernetes-1.21.8}/centos/Readme.rst (100%) rename kubernetes/{kubernetes-1.21.3 => kubernetes-1.21.8}/centos/build_srpm.data (90%) rename kubernetes/{kubernetes-1.21.3 => kubernetes-1.21.8}/centos/files/Change-log-level-to-Debug.patch (100%) rename kubernetes/{kubernetes-1.21.3 => kubernetes-1.21.8}/centos/files/Revert-use-subpath-for-coredns-only-for-default-repo.patch (100%) rename kubernetes/{kubernetes-1.21.3 => kubernetes-1.21.8}/centos/files/enable-support-for-kubernetes-to-ignore-isolcpus.patch (100%) rename kubernetes/{kubernetes-1.21.3 => kubernetes-1.21.8}/centos/files/genmanpages.sh (100%) rename kubernetes/{kubernetes-1.21.3 => kubernetes-1.21.8}/centos/files/kubeadm-create-platform-pods-with-zero-CPU-resources.patch (100%) rename kubernetes/{kubernetes-1.21.3 => kubernetes-1.21.8}/centos/files/kubeadm.conf (100%) rename kubernetes/{kubernetes-1.21.3 => kubernetes-1.21.8}/centos/files/kubelet-cgroup-setup.sh (100%) rename kubernetes/{kubernetes-1.21.3 => kubernetes-1.21.8}/centos/files/kubelet-cpumanager-disable-CFS-quota-throttling-for-.patch (100%) rename kubernetes/{kubernetes-1.21.3 => kubernetes-1.21.8}/centos/files/kubelet-cpumanager-infrastructure-pods-use-system-re.patch (100%) rename kubernetes/{kubernetes-1.21.3 => kubernetes-1.21.8}/centos/files/kubelet-cpumanager-introduce-concept-of-isolated-CPU.patch (100%) rename kubernetes/{kubernetes-1.21.3 => kubernetes-1.21.8}/centos/files/kubelet-cpumanager-keep-normal-containers-off-reserv.patch (100%) rename kubernetes/{kubernetes-1.21.3 => kubernetes-1.21.8}/centos/kubernetes.spec (99%) rename kubernetes/{kubernetes-1.21.3 => kubernetes-1.21.8}/centos/kubernetes.spec.orig (100%) rename kubernetes/{kubernetes-1.21.3 => kubernetes-1.21.8}/debian/deb_folder/changelog (99%) rename kubernetes/{kubernetes-1.21.3 => kubernetes-1.21.8}/debian/deb_folder/control (87%) rename kubernetes/{kubernetes-1.21.3 => kubernetes-1.21.8}/debian/deb_folder/copyright (100%) rename kubernetes/{kubernetes-1.21.3 => kubernetes-1.21.8}/debian/deb_folder/genmanpages.sh (100%) rename kubernetes/{kubernetes-1.21.3 => kubernetes-1.21.8}/debian/deb_folder/kubeadm.conf (100%) rename kubernetes/{kubernetes-1.21.3 => kubernetes-1.21.8}/debian/deb_folder/kubelet-cgroup-setup.sh (100%) create mode 100644 kubernetes/kubernetes-1.21.8/debian/deb_folder/kubernetes-1.21.8-client.install rename kubernetes/{kubernetes-1.21.3/debian/deb_folder/kubernetes-1.21.3-client.lintian-overrides => kubernetes-1.21.8/debian/deb_folder/kubernetes-1.21.8-client.lintian-overrides} (100%) create mode 100644 kubernetes/kubernetes-1.21.8/debian/deb_folder/kubernetes-1.21.8-kubeadm.dirs create mode 100644 kubernetes/kubernetes-1.21.8/debian/deb_folder/kubernetes-1.21.8-kubeadm.install create mode 100644 kubernetes/kubernetes-1.21.8/debian/deb_folder/kubernetes-1.21.8-master.dirs create mode 100644 kubernetes/kubernetes-1.21.8/debian/deb_folder/kubernetes-1.21.8-master.install rename kubernetes/{kubernetes-1.21.3/debian/deb_folder/kubernetes-1.21.3-master.lintian-overrides => kubernetes-1.21.8/debian/deb_folder/kubernetes-1.21.8-master.lintian-overrides} (100%) rename kubernetes/{kubernetes-1.21.3/debian/deb_folder/kubernetes-1.21.3-misc.install => kubernetes-1.21.8/debian/deb_folder/kubernetes-1.21.8-misc.install} (100%) create mode 100644 kubernetes/kubernetes-1.21.8/debian/deb_folder/kubernetes-1.21.8-node.install rename kubernetes/{kubernetes-1.21.3/debian/deb_folder/kubernetes-1.21.3-node.lintian-overrides => kubernetes-1.21.8/debian/deb_folder/kubernetes-1.21.8-node.lintian-overrides} (100%) rename kubernetes/{kubernetes-1.21.3/debian/deb_folder/kubernetes-1.21.3-unit-test.install => kubernetes-1.21.8/debian/deb_folder/kubernetes-1.21.8-unit-test.install} (100%) rename kubernetes/{kubernetes-1.21.3 => kubernetes-1.21.8}/debian/deb_folder/patches/Revert-use-subpath-for-coredns-only-for-default-repo.patch (100%) rename kubernetes/{kubernetes-1.21.3 => kubernetes-1.21.8}/debian/deb_folder/patches/enable-support-for-kubernetes-to-ignore-isolcpus.patch (100%) rename kubernetes/{kubernetes-1.21.3 => kubernetes-1.21.8}/debian/deb_folder/patches/kubeadm-create-platform-pods-with-zero-CPU-resources.patch (100%) rename kubernetes/{kubernetes-1.21.3 => kubernetes-1.21.8}/debian/deb_folder/patches/kubelet-cpumanager-disable-CFS-quota-throttling-for-.patch (100%) rename kubernetes/{kubernetes-1.21.3 => kubernetes-1.21.8}/debian/deb_folder/patches/kubelet-cpumanager-infrastructure-pods-use-system-re.patch (100%) rename kubernetes/{kubernetes-1.21.3 => kubernetes-1.21.8}/debian/deb_folder/patches/kubelet-cpumanager-introduce-concept-of-isolated-CPU.patch (100%) rename kubernetes/{kubernetes-1.21.3 => kubernetes-1.21.8}/debian/deb_folder/patches/kubelet-cpumanager-keep-normal-containers-off-reserv.patch (100%) rename kubernetes/{kubernetes-1.21.3 => kubernetes-1.21.8}/debian/deb_folder/patches/series (100%) rename kubernetes/{kubernetes-1.21.3 => kubernetes-1.21.8}/debian/deb_folder/rules (99%) rename kubernetes/{kubernetes-1.21.3 => kubernetes-1.21.8}/debian/deb_folder/source/format (100%) rename kubernetes/{kubernetes-1.21.3 => kubernetes-1.21.8}/debian/meta_data.yaml (57%) diff --git a/centos_iso_image.inc b/centos_iso_image.inc index 841d39197..eaa84b46e 100644 --- a/centos_iso_image.inc +++ b/centos_iso_image.inc @@ -165,9 +165,9 @@ kubernetes-1.19.13-client kubernetes-1.20.9-node kubernetes-1.20.9-kubeadm kubernetes-1.20.9-client -kubernetes-1.21.3-node -kubernetes-1.21.3-kubeadm -kubernetes-1.21.3-client +kubernetes-1.21.8-node +kubernetes-1.21.8-kubeadm +kubernetes-1.21.8-client containerd k8s-pod-recovery k8s-cni-cache-cleanup diff --git a/centos_pkg_dirs b/centos_pkg_dirs index 1002f41f3..ec9ffa451 100644 --- a/centos_pkg_dirs +++ b/centos_pkg_dirs @@ -57,7 +57,7 @@ kubernetes/cni/plugins kubernetes/kubernetes-1.18.1 kubernetes/kubernetes-1.19.13 kubernetes/kubernetes-1.20.9 -kubernetes/kubernetes-1.21.3 +kubernetes/kubernetes-1.21.8 kubernetes/kubernetes-unversioned kubernetes/docker-distribution kubernetes/etcd diff --git a/centos_tarball-dl.lst b/centos_tarball-dl.lst index 7d27a63aa..3b16ee476 100644 --- a/centos_tarball-dl.lst +++ b/centos_tarball-dl.lst @@ -45,7 +45,7 @@ kubernetes-contrib-v1.18.1.tar.gz#kubernetes-contrib-1.18.1#https://github.com/k kubernetes-v1.18.1.tar.gz#kubernetes-1.18.1#https://github.com/kubernetes/kubernetes/archive/7879fc12a63337efff607952a323df90cdc7a335.tar.gz#http## kubernetes-v1.19.13.tar.gz#kubernetes-1.19.13#https://github.com/kubernetes/kubernetes/archive/refs/tags/v1.19.13.tar.gz#http## kubernetes-v1.20.9.tar.gz#kubernetes-1.20.9#https://github.com/kubernetes/kubernetes/archive/refs/tags/v1.20.9.tar.gz#http## -kubernetes-v1.21.3.tar.gz#kubernetes-1.21.3#https://github.com/kubernetes/kubernetes/archive/refs/tags/v1.21.3.tar.gz#http## +kubernetes-v1.21.8.tar.gz#kubernetes-1.21.8#https://github.com/kubernetes/kubernetes/archive/refs/tags/v1.21.8.tar.gz#http## kvm-unit-tests.git-4ea7633.tar.bz2#kvm-unit-tests#https://git.kernel.org/pub/scm/virt/kvm/kvm-unit-tests.git/snapshot/kvm-unit-tests-20171020.tar.gz#http## ldapscripts-2.0.8.tgz#ldapscripts-2.0.8#https://sourceforge.net/projects/ldapscripts/files/ldapscripts/ldapscripts-2.0.8/ldapscripts-2.0.8.tgz/download#http## libbpf-0.5.0.tar.gz#libbpf-0.5.0#https://github.com/libbpf/libbpf/archive/v0.5.0.tar.gz#https## diff --git a/debian_pkg_dirs b/debian_pkg_dirs index 1d274038d..960a52523 100644 --- a/debian_pkg_dirs +++ b/debian_pkg_dirs @@ -41,7 +41,7 @@ kubernetes/docker-distribution kubernetes/etcd kubernetes/helm kubernetes/k8s-pod-recovery -kubernetes/kubernetes-1.21.3 +kubernetes/kubernetes-1.21.8 kubernetes/kubernetes-unversioned kubernetes/plugins/isolcpus-device-plugin kubernetes/runc diff --git a/kubernetes/kubernetes-1.21.3/debian/deb_folder/kubernetes-1.21.3-client.install b/kubernetes/kubernetes-1.21.3/debian/deb_folder/kubernetes-1.21.3-client.install deleted file mode 100644 index 31195901a..000000000 --- a/kubernetes/kubernetes-1.21.3/debian/deb_folder/kubernetes-1.21.3-client.install +++ /dev/null @@ -1,3 +0,0 @@ -usr/local/kubernetes/1.21.3/stage2/usr/bin/kubectl -usr/local/kubernetes/1.21.3/stage2/usr/share/bash-completion/completions/kubectl - diff --git a/kubernetes/kubernetes-1.21.3/debian/deb_folder/kubernetes-1.21.3-kubeadm.dirs b/kubernetes/kubernetes-1.21.3/debian/deb_folder/kubernetes-1.21.3-kubeadm.dirs deleted file mode 100644 index 43330f291..000000000 --- a/kubernetes/kubernetes-1.21.3/debian/deb_folder/kubernetes-1.21.3-kubeadm.dirs +++ /dev/null @@ -1 +0,0 @@ -usr/local/kubernetes/1.21.3/stage2/etc/systemd/system/kubelet.service.d/ diff --git a/kubernetes/kubernetes-1.21.3/debian/deb_folder/kubernetes-1.21.3-kubeadm.install b/kubernetes/kubernetes-1.21.3/debian/deb_folder/kubernetes-1.21.3-kubeadm.install deleted file mode 100644 index ead4ddda1..000000000 --- a/kubernetes/kubernetes-1.21.3/debian/deb_folder/kubernetes-1.21.3-kubeadm.install +++ /dev/null @@ -1,2 +0,0 @@ -usr/local/kubernetes/1.21.3/stage1/usr/bin/kubeadm -usr/local/kubernetes/1.21.3/stage2/etc/systemd/system/kubelet.service.d/kubeadm.conf diff --git a/kubernetes/kubernetes-1.21.3/debian/deb_folder/kubernetes-1.21.3-master.dirs b/kubernetes/kubernetes-1.21.3/debian/deb_folder/kubernetes-1.21.3-master.dirs deleted file mode 100644 index 83ae7f18b..000000000 --- a/kubernetes/kubernetes-1.21.3/debian/deb_folder/kubernetes-1.21.3-master.dirs +++ /dev/null @@ -1,5 +0,0 @@ -etc/kubernetes-1.21.3 -etc/kubernetes-1.21.3/addons -etc/kubernetes-1.21.3/addons/volumesnapshots -etc/kubernetes-1.21.3/addons/volumesnapshots/crd -etc/kubernetes-1.21.3/addons/volumesnapshots/volume-snapshot-controller diff --git a/kubernetes/kubernetes-1.21.3/debian/deb_folder/kubernetes-1.21.3-master.install b/kubernetes/kubernetes-1.21.3/debian/deb_folder/kubernetes-1.21.3-master.install deleted file mode 100644 index 902cd5814..000000000 --- a/kubernetes/kubernetes-1.21.3/debian/deb_folder/kubernetes-1.21.3-master.install +++ /dev/null @@ -1,8 +0,0 @@ -usr/bin/kube-apiserver -usr/bin/kube-controller-manager -usr/bin/kube-scheduler -etc/kubernetes-1.21.3/addons/volumesnapshots/crd/snapshot.storage.k8s.io_volumesnapshotcontents.yaml -etc/kubernetes-1.21.3/addons/volumesnapshots/crd/snapshot.storage.k8s.io_volumesnapshotclasses.yaml -etc/kubernetes-1.21.3/addons/volumesnapshots/crd/snapshot.storage.k8s.io_volumesnapshots.yaml -etc/kubernetes-1.21.3/addons/volumesnapshots/volume-snapshot-controller/volume-snapshot-controller-deployment.yaml -etc/kubernetes-1.21.3/addons/volumesnapshots/volume-snapshot-controller/rbac-volume-snapshot-controller.yaml diff --git a/kubernetes/kubernetes-1.21.3/debian/deb_folder/kubernetes-1.21.3-node.install b/kubernetes/kubernetes-1.21.3/debian/deb_folder/kubernetes-1.21.3-node.install deleted file mode 100644 index d6e9f7440..000000000 --- a/kubernetes/kubernetes-1.21.3/debian/deb_folder/kubernetes-1.21.3-node.install +++ /dev/null @@ -1,2 +0,0 @@ -usr/local/kubernetes/1.21.3/stage2/usr/bin/kubelet -usr/local/kubernetes/1.21.3/stage2/usr/bin/kubelet-cgroup-setup.sh diff --git a/kubernetes/kubernetes-1.21.3/centos/Readme.rst b/kubernetes/kubernetes-1.21.8/centos/Readme.rst similarity index 100% rename from kubernetes/kubernetes-1.21.3/centos/Readme.rst rename to kubernetes/kubernetes-1.21.8/centos/Readme.rst diff --git a/kubernetes/kubernetes-1.21.3/centos/build_srpm.data b/kubernetes/kubernetes-1.21.8/centos/build_srpm.data similarity index 90% rename from kubernetes/kubernetes-1.21.3/centos/build_srpm.data rename to kubernetes/kubernetes-1.21.8/centos/build_srpm.data index 6597283fb..be99f3fd3 100644 --- a/kubernetes/kubernetes-1.21.3/centos/build_srpm.data +++ b/kubernetes/kubernetes-1.21.8/centos/build_srpm.data @@ -1,4 +1,4 @@ -VERSION=1.21.3 +VERSION=1.21.8 TAR_NAME=kubernetes TAR="$TAR_NAME-v$VERSION.tar.gz" COPY_LIST="${CGCS_BASE}/downloads/$TAR $FILES_BASE/*" diff --git a/kubernetes/kubernetes-1.21.3/centos/files/Change-log-level-to-Debug.patch b/kubernetes/kubernetes-1.21.8/centos/files/Change-log-level-to-Debug.patch similarity index 100% rename from kubernetes/kubernetes-1.21.3/centos/files/Change-log-level-to-Debug.patch rename to kubernetes/kubernetes-1.21.8/centos/files/Change-log-level-to-Debug.patch diff --git a/kubernetes/kubernetes-1.21.3/centos/files/Revert-use-subpath-for-coredns-only-for-default-repo.patch b/kubernetes/kubernetes-1.21.8/centos/files/Revert-use-subpath-for-coredns-only-for-default-repo.patch similarity index 100% rename from kubernetes/kubernetes-1.21.3/centos/files/Revert-use-subpath-for-coredns-only-for-default-repo.patch rename to kubernetes/kubernetes-1.21.8/centos/files/Revert-use-subpath-for-coredns-only-for-default-repo.patch diff --git a/kubernetes/kubernetes-1.21.3/centos/files/enable-support-for-kubernetes-to-ignore-isolcpus.patch b/kubernetes/kubernetes-1.21.8/centos/files/enable-support-for-kubernetes-to-ignore-isolcpus.patch similarity index 100% rename from kubernetes/kubernetes-1.21.3/centos/files/enable-support-for-kubernetes-to-ignore-isolcpus.patch rename to kubernetes/kubernetes-1.21.8/centos/files/enable-support-for-kubernetes-to-ignore-isolcpus.patch diff --git a/kubernetes/kubernetes-1.21.3/centos/files/genmanpages.sh b/kubernetes/kubernetes-1.21.8/centos/files/genmanpages.sh similarity index 100% rename from kubernetes/kubernetes-1.21.3/centos/files/genmanpages.sh rename to kubernetes/kubernetes-1.21.8/centos/files/genmanpages.sh diff --git a/kubernetes/kubernetes-1.21.3/centos/files/kubeadm-create-platform-pods-with-zero-CPU-resources.patch b/kubernetes/kubernetes-1.21.8/centos/files/kubeadm-create-platform-pods-with-zero-CPU-resources.patch similarity index 100% rename from kubernetes/kubernetes-1.21.3/centos/files/kubeadm-create-platform-pods-with-zero-CPU-resources.patch rename to kubernetes/kubernetes-1.21.8/centos/files/kubeadm-create-platform-pods-with-zero-CPU-resources.patch diff --git a/kubernetes/kubernetes-1.21.3/centos/files/kubeadm.conf b/kubernetes/kubernetes-1.21.8/centos/files/kubeadm.conf similarity index 100% rename from kubernetes/kubernetes-1.21.3/centos/files/kubeadm.conf rename to kubernetes/kubernetes-1.21.8/centos/files/kubeadm.conf diff --git a/kubernetes/kubernetes-1.21.3/centos/files/kubelet-cgroup-setup.sh b/kubernetes/kubernetes-1.21.8/centos/files/kubelet-cgroup-setup.sh similarity index 100% rename from kubernetes/kubernetes-1.21.3/centos/files/kubelet-cgroup-setup.sh rename to kubernetes/kubernetes-1.21.8/centos/files/kubelet-cgroup-setup.sh diff --git a/kubernetes/kubernetes-1.21.3/centos/files/kubelet-cpumanager-disable-CFS-quota-throttling-for-.patch b/kubernetes/kubernetes-1.21.8/centos/files/kubelet-cpumanager-disable-CFS-quota-throttling-for-.patch similarity index 100% rename from kubernetes/kubernetes-1.21.3/centos/files/kubelet-cpumanager-disable-CFS-quota-throttling-for-.patch rename to kubernetes/kubernetes-1.21.8/centos/files/kubelet-cpumanager-disable-CFS-quota-throttling-for-.patch diff --git a/kubernetes/kubernetes-1.21.3/centos/files/kubelet-cpumanager-infrastructure-pods-use-system-re.patch b/kubernetes/kubernetes-1.21.8/centos/files/kubelet-cpumanager-infrastructure-pods-use-system-re.patch similarity index 100% rename from kubernetes/kubernetes-1.21.3/centos/files/kubelet-cpumanager-infrastructure-pods-use-system-re.patch rename to kubernetes/kubernetes-1.21.8/centos/files/kubelet-cpumanager-infrastructure-pods-use-system-re.patch diff --git a/kubernetes/kubernetes-1.21.3/centos/files/kubelet-cpumanager-introduce-concept-of-isolated-CPU.patch b/kubernetes/kubernetes-1.21.8/centos/files/kubelet-cpumanager-introduce-concept-of-isolated-CPU.patch similarity index 100% rename from kubernetes/kubernetes-1.21.3/centos/files/kubelet-cpumanager-introduce-concept-of-isolated-CPU.patch rename to kubernetes/kubernetes-1.21.8/centos/files/kubelet-cpumanager-introduce-concept-of-isolated-CPU.patch diff --git a/kubernetes/kubernetes-1.21.3/centos/files/kubelet-cpumanager-keep-normal-containers-off-reserv.patch b/kubernetes/kubernetes-1.21.8/centos/files/kubelet-cpumanager-keep-normal-containers-off-reserv.patch similarity index 100% rename from kubernetes/kubernetes-1.21.3/centos/files/kubelet-cpumanager-keep-normal-containers-off-reserv.patch rename to kubernetes/kubernetes-1.21.8/centos/files/kubelet-cpumanager-keep-normal-containers-off-reserv.patch diff --git a/kubernetes/kubernetes-1.21.3/centos/kubernetes.spec b/kubernetes/kubernetes-1.21.8/centos/kubernetes.spec similarity index 99% rename from kubernetes/kubernetes-1.21.3/centos/kubernetes.spec rename to kubernetes/kubernetes-1.21.8/centos/kubernetes.spec index a62623189..b106ec723 100644 --- a/kubernetes/kubernetes-1.21.3/centos/kubernetes.spec +++ b/kubernetes/kubernetes-1.21.8/centos/kubernetes.spec @@ -23,12 +23,12 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path k8s.io/kubernetes -%global commit 1.21.3 +%global commit 1.21.8 -%global kube_version 1.21.3 +%global kube_version 1.21.8 %global kube_git_version v%{kube_version} -%global go_version 1.16.6 +%global go_version 1.16.12 %global go_path /usr/lib/golang-%{go_version}-%{go_version}/bin # Needed otherwise "version_ldflags=$(kube::version_ldflags)" doesn't work @@ -903,7 +903,7 @@ pushd admin cp kube-apiserver.md kube-controller-manager.md kube-proxy.md kube-scheduler.md kubelet.md .. popd cp %{SOURCE33} genmanpages.sh -bash genmanpages.sh +#bash genmanpages.sh popd popd diff --git a/kubernetes/kubernetes-1.21.3/centos/kubernetes.spec.orig b/kubernetes/kubernetes-1.21.8/centos/kubernetes.spec.orig similarity index 100% rename from kubernetes/kubernetes-1.21.3/centos/kubernetes.spec.orig rename to kubernetes/kubernetes-1.21.8/centos/kubernetes.spec.orig diff --git a/kubernetes/kubernetes-1.21.3/debian/deb_folder/changelog b/kubernetes/kubernetes-1.21.8/debian/deb_folder/changelog similarity index 99% rename from kubernetes/kubernetes-1.21.3/debian/deb_folder/changelog rename to kubernetes/kubernetes-1.21.8/debian/deb_folder/changelog index 71495d5b8..9c1b91b26 100644 --- a/kubernetes/kubernetes-1.21.3/debian/deb_folder/changelog +++ b/kubernetes/kubernetes-1.21.8/debian/deb_folder/changelog @@ -1,4 +1,4 @@ -kubernetes (1.21.3-1) unstable; urgency=medium +kubernetes (1.21.8-1) unstable; urgency=medium * Updated for stx debian packaging diff --git a/kubernetes/kubernetes-1.21.3/debian/deb_folder/control b/kubernetes/kubernetes-1.21.8/debian/deb_folder/control similarity index 87% rename from kubernetes/kubernetes-1.21.3/debian/deb_folder/control rename to kubernetes/kubernetes-1.21.8/debian/deb_folder/control index 7a6356a17..ad1020c00 100644 --- a/kubernetes/kubernetes-1.21.3/debian/deb_folder/control +++ b/kubernetes/kubernetes-1.21.8/debian/deb_folder/control @@ -13,7 +13,7 @@ Build-Depends: debhelper-compat (= 13), Standards-Version: 4.4.1 Homepage: http://kubernetes.io/ -Package: kubernetes-1.21.3-client +Package: kubernetes-1.21.8-client Provides: kubernetes-utils Architecture: amd64 Depends: ${misc:Depends}, ${shlibs:Depends} @@ -22,13 +22,13 @@ Built-Using: ${misc:Built-Using} Description: Kubernetes Command Line Tool The Kubernetes command line tool for interacting with the Kubernetes API. -Package: kubernetes-1.21.3-master +Package: kubernetes-1.21.8-master Architecture: amd64 Depends: ${misc:Depends}, ${shlibs:Depends}, adduser, lsb-base, etcd -Recommends: ${misc:Recommends}, kubernetes-1.21.3-client +Recommends: ${misc:Recommends}, kubernetes-1.21.8-client Built-Using: ${misc:Built-Using} Description: Kubernetes services for master host Container Cluster Manager from Google. Kubernetes is an open source system @@ -42,7 +42,7 @@ Description: Kubernetes services for master host This package provides "kube-apiserver", "kube-controller-manager" and "kube-scheduler" daemons. -Package: kubernetes-1.21.3-node +Package: kubernetes-1.21.8-node Provides: cadvisor Architecture: amd64 Depends: ${misc:Depends}, ${shlibs:Depends}, @@ -52,7 +52,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, docker.io, lsb-base, socat, -Recommends: ${misc:Recommends}, kubernetes-1.21.3-client +Recommends: ${misc:Recommends}, kubernetes-1.21.8-client Built-Using: ${misc:Built-Using} Description: Kubernetes services for node host Container Cluster Manager from Google. Kubernetes is an open source system @@ -63,15 +63,15 @@ Description: Kubernetes services for node host daemon process, and that any lower versions may have subtle and/or glaring issues. -Package: kubernetes-1.21.3-kubeadm +Package: kubernetes-1.21.8-kubeadm Architecture: amd64 Depends: ${misc:Depends}, containernetworking-plugins -Recommends: ${misc:Recommends}, kubernetes-1.21.3-client +Recommends: ${misc:Recommends}, kubernetes-1.21.8-client Built-Using: ${misc:Built-Using} Description: Kubernetes Cluster Bootstrapping Tool The Kubernetes command line tool for bootstrapping a Kubernetes cluster. -Package: kubernetes-1.21.3-misc +Package: kubernetes-1.21.8-misc Architecture: amd64 Depends: ${misc:Depends}, ${shlibs:Depends} Recommends: ${misc:Recommends} @@ -79,7 +79,7 @@ Built-Using: ${misc:Built-Using} Description: dummy package Kubernetes dummy package for misc stuff we don't want to install in production. -Package: kubernetes-1.21.3-unit-test +Package: kubernetes-1.21.8-unit-test Architecture: amd64 Depends: ${misc:Depends}, ${shlibs:Depends}, hostname, diff --git a/kubernetes/kubernetes-1.21.3/debian/deb_folder/copyright b/kubernetes/kubernetes-1.21.8/debian/deb_folder/copyright similarity index 100% rename from kubernetes/kubernetes-1.21.3/debian/deb_folder/copyright rename to kubernetes/kubernetes-1.21.8/debian/deb_folder/copyright diff --git a/kubernetes/kubernetes-1.21.3/debian/deb_folder/genmanpages.sh b/kubernetes/kubernetes-1.21.8/debian/deb_folder/genmanpages.sh similarity index 100% rename from kubernetes/kubernetes-1.21.3/debian/deb_folder/genmanpages.sh rename to kubernetes/kubernetes-1.21.8/debian/deb_folder/genmanpages.sh diff --git a/kubernetes/kubernetes-1.21.3/debian/deb_folder/kubeadm.conf b/kubernetes/kubernetes-1.21.8/debian/deb_folder/kubeadm.conf similarity index 100% rename from kubernetes/kubernetes-1.21.3/debian/deb_folder/kubeadm.conf rename to kubernetes/kubernetes-1.21.8/debian/deb_folder/kubeadm.conf diff --git a/kubernetes/kubernetes-1.21.3/debian/deb_folder/kubelet-cgroup-setup.sh b/kubernetes/kubernetes-1.21.8/debian/deb_folder/kubelet-cgroup-setup.sh similarity index 100% rename from kubernetes/kubernetes-1.21.3/debian/deb_folder/kubelet-cgroup-setup.sh rename to kubernetes/kubernetes-1.21.8/debian/deb_folder/kubelet-cgroup-setup.sh diff --git a/kubernetes/kubernetes-1.21.8/debian/deb_folder/kubernetes-1.21.8-client.install b/kubernetes/kubernetes-1.21.8/debian/deb_folder/kubernetes-1.21.8-client.install new file mode 100644 index 000000000..017ceaecc --- /dev/null +++ b/kubernetes/kubernetes-1.21.8/debian/deb_folder/kubernetes-1.21.8-client.install @@ -0,0 +1,3 @@ +usr/local/kubernetes/1.21.8/stage2/usr/bin/kubectl +usr/local/kubernetes/1.21.8/stage2/usr/share/bash-completion/completions/kubectl + diff --git a/kubernetes/kubernetes-1.21.3/debian/deb_folder/kubernetes-1.21.3-client.lintian-overrides b/kubernetes/kubernetes-1.21.8/debian/deb_folder/kubernetes-1.21.8-client.lintian-overrides similarity index 100% rename from kubernetes/kubernetes-1.21.3/debian/deb_folder/kubernetes-1.21.3-client.lintian-overrides rename to kubernetes/kubernetes-1.21.8/debian/deb_folder/kubernetes-1.21.8-client.lintian-overrides diff --git a/kubernetes/kubernetes-1.21.8/debian/deb_folder/kubernetes-1.21.8-kubeadm.dirs b/kubernetes/kubernetes-1.21.8/debian/deb_folder/kubernetes-1.21.8-kubeadm.dirs new file mode 100644 index 000000000..27b204661 --- /dev/null +++ b/kubernetes/kubernetes-1.21.8/debian/deb_folder/kubernetes-1.21.8-kubeadm.dirs @@ -0,0 +1 @@ +usr/local/kubernetes/1.21.8/stage2/etc/systemd/system/kubelet.service.d/ diff --git a/kubernetes/kubernetes-1.21.8/debian/deb_folder/kubernetes-1.21.8-kubeadm.install b/kubernetes/kubernetes-1.21.8/debian/deb_folder/kubernetes-1.21.8-kubeadm.install new file mode 100644 index 000000000..a66cb2506 --- /dev/null +++ b/kubernetes/kubernetes-1.21.8/debian/deb_folder/kubernetes-1.21.8-kubeadm.install @@ -0,0 +1,2 @@ +usr/local/kubernetes/1.21.8/stage1/usr/bin/kubeadm +usr/local/kubernetes/1.21.8/stage2/etc/systemd/system/kubelet.service.d/kubeadm.conf diff --git a/kubernetes/kubernetes-1.21.8/debian/deb_folder/kubernetes-1.21.8-master.dirs b/kubernetes/kubernetes-1.21.8/debian/deb_folder/kubernetes-1.21.8-master.dirs new file mode 100644 index 000000000..ae3e54bad --- /dev/null +++ b/kubernetes/kubernetes-1.21.8/debian/deb_folder/kubernetes-1.21.8-master.dirs @@ -0,0 +1,5 @@ +etc/kubernetes-1.21.8 +etc/kubernetes-1.21.8/addons +etc/kubernetes-1.21.8/addons/volumesnapshots +etc/kubernetes-1.21.8/addons/volumesnapshots/crd +etc/kubernetes-1.21.8/addons/volumesnapshots/volume-snapshot-controller diff --git a/kubernetes/kubernetes-1.21.8/debian/deb_folder/kubernetes-1.21.8-master.install b/kubernetes/kubernetes-1.21.8/debian/deb_folder/kubernetes-1.21.8-master.install new file mode 100644 index 000000000..c6643e957 --- /dev/null +++ b/kubernetes/kubernetes-1.21.8/debian/deb_folder/kubernetes-1.21.8-master.install @@ -0,0 +1,8 @@ +usr/bin/kube-apiserver +usr/bin/kube-controller-manager +usr/bin/kube-scheduler +etc/kubernetes-1.21.8/addons/volumesnapshots/crd/snapshot.storage.k8s.io_volumesnapshotcontents.yaml +etc/kubernetes-1.21.8/addons/volumesnapshots/crd/snapshot.storage.k8s.io_volumesnapshotclasses.yaml +etc/kubernetes-1.21.8/addons/volumesnapshots/crd/snapshot.storage.k8s.io_volumesnapshots.yaml +etc/kubernetes-1.21.8/addons/volumesnapshots/volume-snapshot-controller/volume-snapshot-controller-deployment.yaml +etc/kubernetes-1.21.8/addons/volumesnapshots/volume-snapshot-controller/rbac-volume-snapshot-controller.yaml diff --git a/kubernetes/kubernetes-1.21.3/debian/deb_folder/kubernetes-1.21.3-master.lintian-overrides b/kubernetes/kubernetes-1.21.8/debian/deb_folder/kubernetes-1.21.8-master.lintian-overrides similarity index 100% rename from kubernetes/kubernetes-1.21.3/debian/deb_folder/kubernetes-1.21.3-master.lintian-overrides rename to kubernetes/kubernetes-1.21.8/debian/deb_folder/kubernetes-1.21.8-master.lintian-overrides diff --git a/kubernetes/kubernetes-1.21.3/debian/deb_folder/kubernetes-1.21.3-misc.install b/kubernetes/kubernetes-1.21.8/debian/deb_folder/kubernetes-1.21.8-misc.install similarity index 100% rename from kubernetes/kubernetes-1.21.3/debian/deb_folder/kubernetes-1.21.3-misc.install rename to kubernetes/kubernetes-1.21.8/debian/deb_folder/kubernetes-1.21.8-misc.install diff --git a/kubernetes/kubernetes-1.21.8/debian/deb_folder/kubernetes-1.21.8-node.install b/kubernetes/kubernetes-1.21.8/debian/deb_folder/kubernetes-1.21.8-node.install new file mode 100644 index 000000000..eca404532 --- /dev/null +++ b/kubernetes/kubernetes-1.21.8/debian/deb_folder/kubernetes-1.21.8-node.install @@ -0,0 +1,2 @@ +usr/local/kubernetes/1.21.8/stage2/usr/bin/kubelet +usr/local/kubernetes/1.21.8/stage2/usr/bin/kubelet-cgroup-setup.sh diff --git a/kubernetes/kubernetes-1.21.3/debian/deb_folder/kubernetes-1.21.3-node.lintian-overrides b/kubernetes/kubernetes-1.21.8/debian/deb_folder/kubernetes-1.21.8-node.lintian-overrides similarity index 100% rename from kubernetes/kubernetes-1.21.3/debian/deb_folder/kubernetes-1.21.3-node.lintian-overrides rename to kubernetes/kubernetes-1.21.8/debian/deb_folder/kubernetes-1.21.8-node.lintian-overrides diff --git a/kubernetes/kubernetes-1.21.3/debian/deb_folder/kubernetes-1.21.3-unit-test.install b/kubernetes/kubernetes-1.21.8/debian/deb_folder/kubernetes-1.21.8-unit-test.install similarity index 100% rename from kubernetes/kubernetes-1.21.3/debian/deb_folder/kubernetes-1.21.3-unit-test.install rename to kubernetes/kubernetes-1.21.8/debian/deb_folder/kubernetes-1.21.8-unit-test.install diff --git a/kubernetes/kubernetes-1.21.3/debian/deb_folder/patches/Revert-use-subpath-for-coredns-only-for-default-repo.patch b/kubernetes/kubernetes-1.21.8/debian/deb_folder/patches/Revert-use-subpath-for-coredns-only-for-default-repo.patch similarity index 100% rename from kubernetes/kubernetes-1.21.3/debian/deb_folder/patches/Revert-use-subpath-for-coredns-only-for-default-repo.patch rename to kubernetes/kubernetes-1.21.8/debian/deb_folder/patches/Revert-use-subpath-for-coredns-only-for-default-repo.patch diff --git a/kubernetes/kubernetes-1.21.3/debian/deb_folder/patches/enable-support-for-kubernetes-to-ignore-isolcpus.patch b/kubernetes/kubernetes-1.21.8/debian/deb_folder/patches/enable-support-for-kubernetes-to-ignore-isolcpus.patch similarity index 100% rename from kubernetes/kubernetes-1.21.3/debian/deb_folder/patches/enable-support-for-kubernetes-to-ignore-isolcpus.patch rename to kubernetes/kubernetes-1.21.8/debian/deb_folder/patches/enable-support-for-kubernetes-to-ignore-isolcpus.patch diff --git a/kubernetes/kubernetes-1.21.3/debian/deb_folder/patches/kubeadm-create-platform-pods-with-zero-CPU-resources.patch b/kubernetes/kubernetes-1.21.8/debian/deb_folder/patches/kubeadm-create-platform-pods-with-zero-CPU-resources.patch similarity index 100% rename from kubernetes/kubernetes-1.21.3/debian/deb_folder/patches/kubeadm-create-platform-pods-with-zero-CPU-resources.patch rename to kubernetes/kubernetes-1.21.8/debian/deb_folder/patches/kubeadm-create-platform-pods-with-zero-CPU-resources.patch diff --git a/kubernetes/kubernetes-1.21.3/debian/deb_folder/patches/kubelet-cpumanager-disable-CFS-quota-throttling-for-.patch b/kubernetes/kubernetes-1.21.8/debian/deb_folder/patches/kubelet-cpumanager-disable-CFS-quota-throttling-for-.patch similarity index 100% rename from kubernetes/kubernetes-1.21.3/debian/deb_folder/patches/kubelet-cpumanager-disable-CFS-quota-throttling-for-.patch rename to kubernetes/kubernetes-1.21.8/debian/deb_folder/patches/kubelet-cpumanager-disable-CFS-quota-throttling-for-.patch diff --git a/kubernetes/kubernetes-1.21.3/debian/deb_folder/patches/kubelet-cpumanager-infrastructure-pods-use-system-re.patch b/kubernetes/kubernetes-1.21.8/debian/deb_folder/patches/kubelet-cpumanager-infrastructure-pods-use-system-re.patch similarity index 100% rename from kubernetes/kubernetes-1.21.3/debian/deb_folder/patches/kubelet-cpumanager-infrastructure-pods-use-system-re.patch rename to kubernetes/kubernetes-1.21.8/debian/deb_folder/patches/kubelet-cpumanager-infrastructure-pods-use-system-re.patch diff --git a/kubernetes/kubernetes-1.21.3/debian/deb_folder/patches/kubelet-cpumanager-introduce-concept-of-isolated-CPU.patch b/kubernetes/kubernetes-1.21.8/debian/deb_folder/patches/kubelet-cpumanager-introduce-concept-of-isolated-CPU.patch similarity index 100% rename from kubernetes/kubernetes-1.21.3/debian/deb_folder/patches/kubelet-cpumanager-introduce-concept-of-isolated-CPU.patch rename to kubernetes/kubernetes-1.21.8/debian/deb_folder/patches/kubelet-cpumanager-introduce-concept-of-isolated-CPU.patch diff --git a/kubernetes/kubernetes-1.21.3/debian/deb_folder/patches/kubelet-cpumanager-keep-normal-containers-off-reserv.patch b/kubernetes/kubernetes-1.21.8/debian/deb_folder/patches/kubelet-cpumanager-keep-normal-containers-off-reserv.patch similarity index 100% rename from kubernetes/kubernetes-1.21.3/debian/deb_folder/patches/kubelet-cpumanager-keep-normal-containers-off-reserv.patch rename to kubernetes/kubernetes-1.21.8/debian/deb_folder/patches/kubelet-cpumanager-keep-normal-containers-off-reserv.patch diff --git a/kubernetes/kubernetes-1.21.3/debian/deb_folder/patches/series b/kubernetes/kubernetes-1.21.8/debian/deb_folder/patches/series similarity index 100% rename from kubernetes/kubernetes-1.21.3/debian/deb_folder/patches/series rename to kubernetes/kubernetes-1.21.8/debian/deb_folder/patches/series diff --git a/kubernetes/kubernetes-1.21.3/debian/deb_folder/rules b/kubernetes/kubernetes-1.21.8/debian/deb_folder/rules similarity index 99% rename from kubernetes/kubernetes-1.21.3/debian/deb_folder/rules rename to kubernetes/kubernetes-1.21.8/debian/deb_folder/rules index 82ef8777b..02ebbd003 100755 --- a/kubernetes/kubernetes-1.21.3/debian/deb_folder/rules +++ b/kubernetes/kubernetes-1.21.8/debian/deb_folder/rules @@ -1,6 +1,6 @@ #!/usr/bin/make -f -kube_version := 1.21.3 +kube_version := 1.21.8 kube_git_version := v${kube_version} name := kubernetes-${kube_version} go_version := 1.16.6 diff --git a/kubernetes/kubernetes-1.21.3/debian/deb_folder/source/format b/kubernetes/kubernetes-1.21.8/debian/deb_folder/source/format similarity index 100% rename from kubernetes/kubernetes-1.21.3/debian/deb_folder/source/format rename to kubernetes/kubernetes-1.21.8/debian/deb_folder/source/format diff --git a/kubernetes/kubernetes-1.21.3/debian/meta_data.yaml b/kubernetes/kubernetes-1.21.8/debian/meta_data.yaml similarity index 57% rename from kubernetes/kubernetes-1.21.3/debian/meta_data.yaml rename to kubernetes/kubernetes-1.21.8/debian/meta_data.yaml index 1213eb5af..58e600f92 100644 --- a/kubernetes/kubernetes-1.21.3/debian/meta_data.yaml +++ b/kubernetes/kubernetes-1.21.8/debian/meta_data.yaml @@ -1,9 +1,9 @@ debname: kubernetes -debver: 1.21.3 +debver: 1.21.8 dl_path: - name: kubernetes-1.21.3.tar.gz - url: https://github.com/kubernetes/kubernetes/archive/refs/tags/v1.21.3.tar.gz - md5sum: fa28f2b262d496a08c0c3dad87846c48 + name: kubernetes-1.21.8.tar.gz + url: https://github.com/kubernetes/kubernetes/archive/refs/tags/v1.21.8.tar.gz + md5sum: df0aad94387386d4c8a3412acf196ae3 revision: dist: $STX_DIST PKG_GITREVCOUNT: true