diff --git a/RELEASE.md b/RELEASE.md index a30f164..0db1ed7 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -1,3 +1,12 @@ +# 6.1 + +## Improvements + * OCP4 documentation + +## Fixes + * Switch to new Kubernetes yum repo + * Clean up vSphere clouddrives + # 6.0 ## Improvements diff --git a/VERSION b/VERSION index e0ea36f..a435f5a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -6.0 +6.1 diff --git a/vagrant/k8s-common b/vagrant/k8s-common index c065196..d8948b5 100644 --- a/vagrant/k8s-common +++ b/vagrant/k8s-common @@ -1,13 +1,14 @@ +repo=$(echo $k8s_version | cut -f 1,2 -d .) cat </etc/yum.repos.d/kubernetes.repo [kubernetes] name=Kubernetes -baseurl=https://packages.cloud.google.com/yum/repos/kubernetes-el7-x86_64 +baseurl=https://pkgs.k8s.io/core:/stable:/v$repo/rpm/ enabled=1 -gpgcheck=0 -repo_gpgcheck=0 +gpgcheck=1 +gpgkey=https://pkgs.k8s.io/core:/stable:/v$repo/rpm/repodata/repomd.xml.key EOF while ! dnf install -y selinux-policy policycoreutils-python-utils selinux-policy-targeted container-selinux --setopt=tsflags=noscripts; do sleep 1; done -while ! dnf install -y kubelet-$k8s_version-0 docker kubeadm-$k8s_version-0 kubectl-$k8s_version-0; do sleep 1; done +while ! dnf install -y kubelet-$k8s_version docker kubeadm-$k8s_version kubectl-$k8s_version; do sleep 1; done curl -L https://github.com/containerd/containerd/releases/download/v1.6.15/containerd-1.6.15-linux-amd64.tar.gz | tar Cxzvf /usr/local - curl -o /etc/systemd/system/containerd.service https://raw.githubusercontent.com/containerd/containerd/main/containerd.service mkdir /etc/containerd