Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

K8srepo #487

Merged
merged 2 commits into from
Mar 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions RELEASE.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
# 6.1

## Improvements
* OCP4 documentation

## Fixes
* Switch to new Kubernetes yum repo
* Clean up vSphere clouddrives

# 6.0

## Improvements
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.0
6.1
9 changes: 5 additions & 4 deletions vagrant/k8s-common
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
repo=$(echo $k8s_version | cut -f 1,2 -d .)
cat <<EOF >/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
Expand Down