Skip to content

Commit

Permalink
Updates images to use k8s v1.28.14 (#270)
Browse files Browse the repository at this point in the history
* Upgrades k8s to v1.28.14

Also fixes download paths for various k8s components

* Add kubeadm to curl download for packet virtual images

* Fixes name of CNI binary in extracted multus files
  • Loading branch information
nkinkade authored Sep 18, 2024
1 parent 89e4c5f commit 445a2b0
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
14 changes: 7 additions & 7 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.27.12
export K8S_CNI_VERSION=v1.4.1
export K8S_CRICTL_VERSION=v1.27.1
export K8S_VERSION=v1.28.14
export K8S_CNI_VERSION=v1.5.1
export K8S_CRICTL_VERSION=v1.28.0
# v0.9.1 of the official CNI plugins release stopped including flannel, so we
# must now install it manually.
export K8S_FLANNELCNI_VERSION=v1.4.0-flannel1
export K8S_TOOLING_VERSION=v0.16.7
export K8S_FLANNELCNI_VERSION=v1.5.1-flannel3
export K8S_TOOLING_VERSION=v0.17.7

# stage3 mlxupdate
export MFT_VERSION=4.22.0-96
Expand All @@ -24,7 +24,7 @@ export MFT_VERSION=4.22.0-96
export MLXROM_VERSION=3.4.818

# multus-cni version
export MULTUS_CNI_VERSION=3.9.3
export MULTUS_CNI_VERSION=4.1.0

# etcdctl version
export ETCDCTL_VERSION=v3.5.12
export ETCDCTL_VERSION=v3.5.15
4 changes: 2 additions & 2 deletions packer/configure_image_common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@ chmod +x /opt/cni/bin/flannel

# Install crictl.
mkdir -p /opt/bin
curl --location "https://github.com/kubernetes-incubator/cri-tools/releases/download/${K8S_CRICTL_VERSION}/crictl-${K8S_CRICTL_VERSION}-linux-amd64.tar.gz" | tar -C /opt/bin -xz
curl --location "https://github.com/kubernetes-sigs/cri-tools/releases/download/${K8S_CRICTL_VERSION}/crictl-${K8S_CRICTL_VERSION}-linux-amd64.tar.gz" | tar -C /opt/bin -xz

# Install kubeadm, kubelet and kubectl.
cd /opt/bin
curl --location --remote-name-all https://storage.googleapis.com/kubernetes-release/release/${K8S_VERSION}/bin/linux/amd64/{kubeadm,kubelet,kubectl}
curl --location --remote-name-all https://dl.k8s.io/release/${K8S_VERSION}/bin/linux/amd64/{kubeadm,kubelet,kubectl}
chmod +x {kubeadm,kubelet,kubectl}

# Install kubelet systemd service.
Expand Down
6 changes: 3 additions & 3 deletions setup_stage3_ubuntu.sh
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ curl --location "https://github.com/flannel-io/cni-plugin/releases/download/${K8
> flannel
GOPATH=${TMPDIR} CGO_ENABLED=0 go install -ldflags '-w -s' github.com/m-lab/index2ip@v1.2.0
GOPATH=${TMPDIR} CGO_ENABLED=0 go install -ldflags '-w -s' github.com/m-lab/cni-plugins/netctl@v1.0.0
cp ${TMPDIR}/multus-cni_${MULTUS_CNI_VERSION}_linux_amd64/multus-cni ${BOOTSTRAP}/opt/cni/bin/multus
cp ${TMPDIR}/multus-cni_${MULTUS_CNI_VERSION}_linux_amd64/multus ${BOOTSTRAP}/opt/cni/bin/multus
cp ${TMPDIR}/bin/index2ip ${BOOTSTRAP}/opt/cni/bin
cp ${TMPDIR}/bin/netctl ${BOOTSTRAP}/opt/cni/bin
cp ${TMPDIR}/flannel ${BOOTSTRAP}/opt/cni/bin
Expand All @@ -270,15 +270,15 @@ done

# Install crictl.
mkdir -p ${BOOTSTRAP}/opt/bin
wget https://github.com/kubernetes-incubator/cri-tools/releases/download/${K8S_CRICTL_VERSION}/crictl-${K8S_CRICTL_VERSION}-linux-amd64.tar.gz
wget https://github.com/kubernetes-sigs/cri-tools/releases/download/${K8S_CRICTL_VERSION}/crictl-${K8S_CRICTL_VERSION}-linux-amd64.tar.gz
tar zxvf crictl-${K8S_CRICTL_VERSION}-linux-amd64.tar.gz -C ${BOOTSTRAP}/opt/bin/
rm -f crictl-${K8S_CRICTL_VERSION}-linux-amd64.tar.gz

# Install the kube* commands.
# Installation commands adapted from:
# https://kubernetes.io/docs/setup/independent/install-kubeadm/#installing-kubeadm-kubelet-and-kubectl
pushd ${BOOTSTRAP}/opt/bin
curl --location --remote-name-all https://storage.googleapis.com/kubernetes-release/release/${K8S_VERSION}/bin/linux/amd64/{kubeadm,kubelet,kubectl}
curl --location --remote-name-all https://dl.k8s.io/release/${K8S_VERSION}/bin/linux/amd64/{kubeadm,kubelet,kubectl}
chmod 755 {kubeadm,kubelet,kubectl}
popd

Expand Down

0 comments on commit 445a2b0

Please sign in to comment.