Skip to content
This repository was archived by the owner on Aug 12, 2025. It is now read-only.

Commit b2dbab8

Browse files
cpriviterecprivitere
committed
Remove docker.io from apt-get remove line
Install containerd.io instead of containerd Add quotes around the kubernetes pause image Signed-off-by: Chris Privitere <[email protected]>
1 parent 3a2879b commit b2dbab8

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

‎templates/cluster-template.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ spec:
4949
sysctl --system
5050
export DEBIAN_FRONTEND=noninteractive
5151
apt-get update -y
52-
apt-get remove -y docker docker-engine docker.io containerd runc
52+
apt-get remove -y docker docker-engine containerd runc
5353
apt-get install -y apt-transport-https ca-certificates curl gnupg lsb-release linux-generic jq
5454
major_vers=$(lsb_release -r | awk '{ print $2 }' | cut -d. -f1)
5555
if [[ "$major_vers" -ge 20 ]]; then
@@ -63,14 +63,14 @@ spec:
6363
apt-get update -y
6464
TRIMMED_KUBERNETES_VERSION=$(echo {{ .kubernetesVersion }} | sed 's/\./\\\\./g' | sed 's/^v//')
6565
RESOLVED_KUBERNETES_VERSION=$(apt-cache madison kubelet | awk -v VERSION=$${TRIMMED_KUBERNETES_VERSION} '$3~ VERSION { print $3 }' | head -n1)
66-
apt-get install -y containerd kubelet=$${RESOLVED_KUBERNETES_VERSION} kubeadm=$${RESOLVED_KUBERNETES_VERSION} kubectl=$${RESOLVED_KUBERNETES_VERSION}
66+
apt-get install -y containerd.io kubelet=$${RESOLVED_KUBERNETES_VERSION} kubeadm=$${RESOLVED_KUBERNETES_VERSION} kubectl=$${RESOLVED_KUBERNETES_VERSION}
6767
containerd config default > /etc/containerd/config.toml
6868
cat <<EOF > /etc/crictl.yaml
6969
runtime-endpoint: unix:///run/containerd/containerd.sock
7070
image-endpoint: unix:///run/containerd/containerd.sock
7171
EOF
7272
sed -i 's/SystemdCgroup = false/SystemdCgroup = true/' /etc/containerd/config.toml
73-
sed -i "s,sandbox_image.*$,sandbox_image = $(kubeadm config images list | grep pause | sort -r | head -n1)," /etc/containerd/config.toml
73+
sed -i "s,sandbox_image.*$,sandbox_image = \"$(kubeadm config images list | grep pause | sort -r | head -n1)\"," /etc/containerd/config.toml
7474
systemctl restart containerd
7575
ping -c 3 -q {{ .controlPlaneEndpoint }} && echo OK || ip addr add {{ .controlPlaneEndpoint }} dev lo
7676
postKubeadmCommands:
@@ -215,7 +215,7 @@ spec:
215215
sysctl --system
216216
export DEBIAN_FRONTEND=noninteractive
217217
apt-get update -y
218-
apt-get remove -y docker docker-engine docker.io containerd runc
218+
apt-get remove -y docker docker-engine containerd runc
219219
apt-get install -y apt-transport-https ca-certificates curl gnupg lsb-release linux-generic jq
220220
mkdir -p /etc/apt/keyrings
221221
curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg
@@ -225,12 +225,12 @@ spec:
225225
apt-get update -y
226226
TRIMMED_KUBERNETES_VERSION=$(echo {{ .kubernetesVersion }} | sed 's/\./\\\\./g' | sed 's/^v//')
227227
RESOLVED_KUBERNETES_VERSION=$(apt-cache madison kubelet | awk -v VERSION=$${TRIMMED_KUBERNETES_VERSION} '$3~ VERSION { print $3 }' | head -n1)
228-
apt-get install -y containerd kubelet=$${RESOLVED_KUBERNETES_VERSION} kubeadm=$${RESOLVED_KUBERNETES_VERSION} kubectl=$${RESOLVED_KUBERNETES_VERSION}
228+
apt-get install -y containerd.io kubelet=$${RESOLVED_KUBERNETES_VERSION} kubeadm=$${RESOLVED_KUBERNETES_VERSION} kubectl=$${RESOLVED_KUBERNETES_VERSION}
229229
cat <<EOF > /etc/crictl.yaml
230230
runtime-endpoint: unix:///run/containerd/containerd.sock
231231
image-endpoint: unix:///run/containerd/containerd.sock
232232
EOF
233233
containerd config default > /etc/containerd/config.toml
234234
sed -i 's/SystemdCgroup = false/SystemdCgroup = true/' /etc/containerd/config.toml
235-
sed -i "s,sandbox_image.*$,sandbox_image = $(kubeadm config images list | grep pause | sort -r | head -n1)," /etc/containerd/config.toml
235+
sed -i "s,sandbox_image.*$,sandbox_image = \"$(kubeadm config images list | grep pause | sort -r | head -n1)\"," /etc/containerd/config.toml
236236
systemctl restart containerd

‎templates/experimental-kube-vip/kustomization.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ patches:
3737
sysctl --system
3838
export DEBIAN_FRONTEND=noninteractive
3939
apt-get update -y
40-
apt-get remove -y docker docker-engine docker.io containerd runc
40+
apt-get remove -y docker docker-engine containerd runc
4141
apt-get install -y apt-transport-https ca-certificates curl gnupg lsb-release linux-generic jq
4242
mkdir -p /etc/apt/keyrings
4343
curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg
@@ -47,14 +47,14 @@ patches:
4747
apt-get update -y
4848
TRIMMED_KUBERNETES_VERSION=$(echo {{ .kubernetesVersion }} | sed 's/\./\\\\./g' | sed 's/^v//')
4949
RESOLVED_KUBERNETES_VERSION=$(apt-cache madison kubelet | awk -v VERSION=$${TRIMMED_KUBERNETES_VERSION} '$3~ VERSION { print $3 }' | head -n1)
50-
apt-get install -y containerd kubelet=$${RESOLVED_KUBERNETES_VERSION} kubeadm=$${RESOLVED_KUBERNETES_VERSION} kubectl=$${RESOLVED_KUBERNETES_VERSION}
50+
apt-get install -y containerd.io kubelet=$${RESOLVED_KUBERNETES_VERSION} kubeadm=$${RESOLVED_KUBERNETES_VERSION} kubectl=$${RESOLVED_KUBERNETES_VERSION}
5151
cat <<EOF > /etc/crictl.yaml
5252
runtime-endpoint: unix:///run/containerd/containerd.sock
5353
image-endpoint: unix:///run/containerd/containerd.sock
5454
EOF
5555
containerd config default > /etc/containerd/config.toml
5656
sed -i 's/SystemdCgroup = false/SystemdCgroup = true/' /etc/containerd/config.toml
57-
sed -i "s,sandbox_image.*$,sandbox_image = $(kubeadm config images list | grep pause | sort -r | head -n1)," /etc/containerd/config.toml
57+
sed -i "s,sandbox_image.*$,sandbox_image = \"$(kubeadm config images list | grep pause | sort -r | head -n1)\"," /etc/containerd/config.toml
5858
systemctl restart containerd
5959
ping -c 3 -q {{ .controlPlaneEndpoint }} && echo OK || ip addr add {{ .controlPlaneEndpoint }} dev lo
6060
curl -o /run/metadata.json -fsSL https://metadata.platformequinix.com/metadata
@@ -113,7 +113,7 @@ patches:
113113
sysctl --system
114114
export DEBIAN_FRONTEND=noninteractive
115115
apt-get update -y
116-
apt-get remove -y docker docker-engine docker.io containerd runc
116+
apt-get remove -y docker docker-engine containerd runc
117117
apt-get install -y apt-transport-https ca-certificates curl gnupg lsb-release linux-generic jq
118118
mkdir -p /etc/apt/keyrings
119119
curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg
@@ -123,12 +123,12 @@ patches:
123123
apt-get update -y
124124
TRIMMED_KUBERNETES_VERSION=$(echo {{ .kubernetesVersion }} | sed 's/\./\\\\./g' | sed 's/^v//')
125125
RESOLVED_KUBERNETES_VERSION=$(apt-cache madison kubelet | awk -v VERSION=$${TRIMMED_KUBERNETES_VERSION} '$3~ VERSION { print $3 }' | head -n1)
126-
apt-get install -y containerd kubelet=$${RESOLVED_KUBERNETES_VERSION} kubeadm=$${RESOLVED_KUBERNETES_VERSION} kubectl=$${RESOLVED_KUBERNETES_VERSION}
126+
apt-get install -y containerd.io kubelet=$${RESOLVED_KUBERNETES_VERSION} kubeadm=$${RESOLVED_KUBERNETES_VERSION} kubectl=$${RESOLVED_KUBERNETES_VERSION}
127127
cat <<EOF > /etc/crictl.yaml
128128
runtime-endpoint: unix:///run/containerd/containerd.sock
129129
image-endpoint: unix:///run/containerd/containerd.sock
130130
EOF
131131
containerd config default > /etc/containerd/config.toml
132132
sed -i 's/SystemdCgroup = false/SystemdCgroup = true/' /etc/containerd/config.toml
133-
sed -i "s,sandbox_image.*$,sandbox_image = $(kubeadm config images list | grep pause | sort -r | head -n1)," /etc/containerd/config.toml
133+
sed -i "s,sandbox_image.*$,sandbox_image = \"$(kubeadm config images list | grep pause | sort -r | head -n1)\"," /etc/containerd/config.toml
134134
systemctl restart containerd

0 commit comments

Comments
 (0)