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 <chris.friesen@windriver.com> Change-Id: I64e4a64c90ef7591aeee52742dfcba9fdd8e5063
This commit is contained in:
Chris Friesen
parent
381985d244
commit
df3b902e6b
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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##
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
@ -1 +0,0 @@
|
|||
usr/local/kubernetes/1.21.3/stage2/etc/systemd/system/kubelet.service.d/
|
||||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
@ -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/*"
|
||||
|
|
@ -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
|
||||
|
||||
|
|
@ -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
|
||||
|
||||
|
|
@ -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,
|
||||
|
|
@ -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
|
||||
|
||||
|
|
@ -0,0 +1 @@
|
|||
usr/local/kubernetes/1.21.8/stage2/etc/systemd/system/kubelet.service.d/
|
||||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
Loading…
Reference in New Issue