Skip to content

Commit

Permalink
Upgrade to k8s v1.26.12 (#251)
Browse files Browse the repository at this point in the history
* Upgrades k8s to v1.26.11 + plus related components

* Fixes URLs for kubelet.service and dropin config

The URLs changes in the kubernetes/release repository for kubelet.service and
10-kubeadm.conf. Additionally, I realized that for physical machines we were
downloading a _very_ old version of these files from a static URLs, instead of
download the version specified by K8S_TOOLING_VERSION.

* Adds missing line continuation char in Packer build

* Fixes URLs to kubelet.service file

The old URLs were pointing to the main Github page for the file, not the "raw"
URLs for the file.

* Updates k8s to v1.26.12

This version was released just yesterday or today, so might as well upgrade to
it.
  • Loading branch information
nkinkade committed Dec 20, 2023
1 parent 8a5a668 commit 5738019
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
10 changes: 5 additions & 5 deletions config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@
export SITES="https://siteinfo.${PROJECT}.measurementlab.net/v2/sites/sites.json"

# K8S component versions
export K8S_VERSION=v1.25.13
export K8S_CNI_VERSION=v1.3.0
export K8S_CRICTL_VERSION=v1.25.0
export K8S_VERSION=v1.26.12
export K8S_CNI_VERSION=v1.4.0
export K8S_CRICTL_VERSION=v1.26.1
# v0.9.1 of the official CNI plugins release stopped including flannel, so we
# must now install it manually.
export K8S_FLANNELCNI_VERSION=v1.2.0
export K8S_TOOLING_VERSION=v0.15.1
export K8S_TOOLING_VERSION=v0.16.4

# stage3 mlxupdate
export MFT_VERSION=4.22.0-96
Expand All @@ -27,4 +27,4 @@ export MLXROM_VERSION=3.4.818
export MULTUS_CNI_VERSION=3.9.3

# etcdctl version
export ETCDCTL_VERSION=v3.5.6
export ETCDCTL_VERSION=v3.5.9
4 changes: 2 additions & 2 deletions packer/configure_image_common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,12 @@ chmod +x {kubeadm,kubelet,kubectl}

# Install kubelet systemd service and enable it.
curl --silent --show-error --location \
"https://raw.githubusercontent.com/kubernetes/release/${K8S_TOOLING_VERSION}/cmd/kubepkg/templates/latest/deb/kubelet/lib/systemd/system/kubelet.service" \
"https://raw.githubusercontent.com/kubernetes/release/${K8S_TOOLING_VERSION}/cmd/krel/templates/latest/kubelet/kubelet.service" \
| sed "s:/usr/bin:/opt/bin:g" | sudo tee /etc/systemd/system/kubelet.service

mkdir -p /etc/systemd/system/kubelet.service.d
curl --silent --show-error --location \
"https://raw.githubusercontent.com/kubernetes/release/${K8S_TOOLING_VERSION}/cmd/kubepkg/templates/latest/deb/kubeadm/10-kubeadm.conf" \
"https://raw.githubusercontent.com/kubernetes/release/${K8S_TOOLING_VERSION}/cmd/krel/templates/latest/kubeadm/10-kubeadm.conf" \
| sed "s:/usr/bin:/opt/bin:g" | sudo tee /etc/systemd/system/kubelet.service.d/10-kubeadm.conf

# For convenience, when an operator needs to login and inspect things with crictl.
Expand Down
6 changes: 3 additions & 3 deletions setup_stage3_ubuntu.sh
Original file line number Diff line number Diff line change
Expand Up @@ -174,13 +174,13 @@ chroot $BOOTSTRAP bash -c 'systemctl set-default multi-user.target'

# Install the kubelet.service unit file.
curl --silent --show-error --location \
"https://raw.githubusercontent.com/kubernetes/release/v0.7.0/cmd/kubepkg/templates/latest/deb/kubelet/lib/systemd/system/kubelet.service" \
> $BOOTSTRAP/etc/systemd/system/kubelet.service
"https://raw.githubusercontent.com/kubernetes/release/${K8S_TOOLING_VERSION}/cmd/krel/templates/latest/kubelet/kubelet.service" \
> $BOOTSTRAP/etc/systemd/system/kubelet.service

# Install kubelet.service config overrides.
mkdir --parents $BOOTSTRAP/etc/systemd/system/kubelet.service.d
curl --silent --show-error --location \
"https://raw.githubusercontent.com/kubernetes/release/v0.7.0/cmd/kubepkg/templates/latest/deb/kubeadm/10-kubeadm.conf" \
"https://raw.githubusercontent.com/kubernetes/release/${K8S_TOOLING_VERSION}/cmd/krel/templates/latest/kubeadm/10-kubeadm.conf" \
> $BOOTSTRAP/etc/systemd/system/kubelet.service.d/10-kubeadm.conf

for unit in $(find $CONFIG_DIR/etc/systemd/system -maxdepth 1 -type f -printf "%f\n"); do
Expand Down

0 comments on commit 5738019

Please sign in to comment.