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

Commit 10fdaa0

Browse files
cpriviterecprivitere
committed
ran make generate
Signed-off-by: Chris Privitere <[email protected]>
1 parent 9872228 commit 10fdaa0

File tree

3 files changed

+18
-18
lines changed

3 files changed

+18
-18
lines changed

‎templates/cluster-template-crs-cni.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ spec:
4848
sysctl --system
4949
export DEBIAN_FRONTEND=noninteractive
5050
apt-get update -y
51-
apt-get remove -y docker docker-engine docker.io containerd runc
51+
apt-get remove -y docker docker-engine containerd runc
5252
apt-get install -y apt-transport-https ca-certificates curl gnupg lsb-release linux-generic jq
5353
mkdir -p /etc/apt/keyrings
5454
curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg
@@ -58,14 +58,14 @@ spec:
5858
apt-get update -y
5959
TRIMMED_KUBERNETES_VERSION=$(echo {{ .kubernetesVersion }} | sed 's/\./\\\\./g' | sed 's/^v//')
6060
RESOLVED_KUBERNETES_VERSION=$(apt-cache madison kubelet | awk -v VERSION=$${TRIMMED_KUBERNETES_VERSION} '$3~ VERSION { print $3 }' | head -n1)
61-
apt-get install -y containerd kubelet=$${RESOLVED_KUBERNETES_VERSION} kubeadm=$${RESOLVED_KUBERNETES_VERSION} kubectl=$${RESOLVED_KUBERNETES_VERSION}
61+
apt-get install -y containerd.io kubelet=$${RESOLVED_KUBERNETES_VERSION} kubeadm=$${RESOLVED_KUBERNETES_VERSION} kubectl=$${RESOLVED_KUBERNETES_VERSION}
6262
cat <<EOF > /etc/crictl.yaml
6363
runtime-endpoint: unix:///run/containerd/containerd.sock
6464
image-endpoint: unix:///run/containerd/containerd.sock
6565
EOF
6666
containerd config default > /etc/containerd/config.toml
6767
sed -i 's/SystemdCgroup = false/SystemdCgroup = true/' /etc/containerd/config.toml
68-
sed -i "s,sandbox_image.*$,sandbox_image = $(kubeadm config images list | grep pause | sort -r | head -n1)," /etc/containerd/config.toml
68+
sed -i "s,sandbox_image.*$,sandbox_image = \"$(kubeadm config images list | grep pause | sort -r | head -n1)\"," /etc/containerd/config.toml
6969
systemctl restart containerd
7070
---
7171
apiVersion: cluster.x-k8s.io/v1beta1
@@ -187,7 +187,7 @@ spec:
187187
sysctl --system
188188
export DEBIAN_FRONTEND=noninteractive
189189
apt-get update -y
190-
apt-get remove -y docker docker-engine docker.io containerd runc
190+
apt-get remove -y docker docker-engine containerd runc
191191
apt-get install -y apt-transport-https ca-certificates curl gnupg lsb-release linux-generic jq
192192
major_vers=$(lsb_release -r | awk '{ print $2 }' | cut -d. -f1)
193193
if [[ "$major_vers" -ge 20 ]]; then
@@ -201,14 +201,14 @@ spec:
201201
apt-get update -y
202202
TRIMMED_KUBERNETES_VERSION=$(echo {{ .kubernetesVersion }} | sed 's/\./\\\\./g' | sed 's/^v//')
203203
RESOLVED_KUBERNETES_VERSION=$(apt-cache madison kubelet | awk -v VERSION=$${TRIMMED_KUBERNETES_VERSION} '$3~ VERSION { print $3 }' | head -n1)
204-
apt-get install -y containerd kubelet=$${RESOLVED_KUBERNETES_VERSION} kubeadm=$${RESOLVED_KUBERNETES_VERSION} kubectl=$${RESOLVED_KUBERNETES_VERSION}
204+
apt-get install -y containerd.io kubelet=$${RESOLVED_KUBERNETES_VERSION} kubeadm=$${RESOLVED_KUBERNETES_VERSION} kubectl=$${RESOLVED_KUBERNETES_VERSION}
205205
containerd config default > /etc/containerd/config.toml
206206
cat <<EOF > /etc/crictl.yaml
207207
runtime-endpoint: unix:///run/containerd/containerd.sock
208208
image-endpoint: unix:///run/containerd/containerd.sock
209209
EOF
210210
sed -i 's/SystemdCgroup = false/SystemdCgroup = true/' /etc/containerd/config.toml
211-
sed -i "s,sandbox_image.*$,sandbox_image = $(kubeadm config images list | grep pause | sort -r | head -n1)," /etc/containerd/config.toml
211+
sed -i "s,sandbox_image.*$,sandbox_image = \"$(kubeadm config images list | grep pause | sort -r | head -n1)\"," /etc/containerd/config.toml
212212
systemctl restart containerd
213213
ping -c 3 -q {{ .controlPlaneEndpoint }} && echo OK || ip addr add {{ .controlPlaneEndpoint }} dev lo
214214
machineTemplate:

‎templates/cluster-template-kube-vip-crs-cni.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ spec:
4848
sysctl --system
4949
export DEBIAN_FRONTEND=noninteractive
5050
apt-get update -y
51-
apt-get remove -y docker docker-engine docker.io containerd runc
51+
apt-get remove -y docker docker-engine containerd runc
5252
apt-get install -y apt-transport-https ca-certificates curl gnupg lsb-release linux-generic jq
5353
mkdir -p /etc/apt/keyrings
5454
curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg
@@ -58,14 +58,14 @@ spec:
5858
apt-get update -y
5959
TRIMMED_KUBERNETES_VERSION=$(echo {{ .kubernetesVersion }} | sed 's/\./\\\\./g' | sed 's/^v//')
6060
RESOLVED_KUBERNETES_VERSION=$(apt-cache madison kubelet | awk -v VERSION=$${TRIMMED_KUBERNETES_VERSION} '$3~ VERSION { print $3 }' | head -n1)
61-
apt-get install -y containerd kubelet=$${RESOLVED_KUBERNETES_VERSION} kubeadm=$${RESOLVED_KUBERNETES_VERSION} kubectl=$${RESOLVED_KUBERNETES_VERSION}
61+
apt-get install -y containerd.io kubelet=$${RESOLVED_KUBERNETES_VERSION} kubeadm=$${RESOLVED_KUBERNETES_VERSION} kubectl=$${RESOLVED_KUBERNETES_VERSION}
6262
cat <<EOF > /etc/crictl.yaml
6363
runtime-endpoint: unix:///run/containerd/containerd.sock
6464
image-endpoint: unix:///run/containerd/containerd.sock
6565
EOF
6666
containerd config default > /etc/containerd/config.toml
6767
sed -i 's/SystemdCgroup = false/SystemdCgroup = true/' /etc/containerd/config.toml
68-
sed -i "s,sandbox_image.*$,sandbox_image = $(kubeadm config images list | grep pause | sort -r | head -n1)," /etc/containerd/config.toml
68+
sed -i "s,sandbox_image.*$,sandbox_image = \"$(kubeadm config images list | grep pause | sort -r | head -n1)\"," /etc/containerd/config.toml
6969
systemctl restart containerd
7070
---
7171
apiVersion: cluster.x-k8s.io/v1beta1
@@ -180,7 +180,7 @@ spec:
180180
sysctl --system
181181
export DEBIAN_FRONTEND=noninteractive
182182
apt-get update -y
183-
apt-get remove -y docker docker-engine docker.io containerd runc
183+
apt-get remove -y docker docker-engine containerd runc
184184
apt-get install -y apt-transport-https ca-certificates curl gnupg lsb-release linux-generic jq
185185
mkdir -p /etc/apt/keyrings
186186
curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg
@@ -190,14 +190,14 @@ spec:
190190
apt-get update -y
191191
TRIMMED_KUBERNETES_VERSION=$(echo {{ .kubernetesVersion }} | sed 's/\./\\\\./g' | sed 's/^v//')
192192
RESOLVED_KUBERNETES_VERSION=$(apt-cache madison kubelet | awk -v VERSION=$${TRIMMED_KUBERNETES_VERSION} '$3~ VERSION { print $3 }' | head -n1)
193-
apt-get install -y containerd kubelet=$${RESOLVED_KUBERNETES_VERSION} kubeadm=$${RESOLVED_KUBERNETES_VERSION} kubectl=$${RESOLVED_KUBERNETES_VERSION}
193+
apt-get install -y containerd.io kubelet=$${RESOLVED_KUBERNETES_VERSION} kubeadm=$${RESOLVED_KUBERNETES_VERSION} kubectl=$${RESOLVED_KUBERNETES_VERSION}
194194
cat <<EOF > /etc/crictl.yaml
195195
runtime-endpoint: unix:///run/containerd/containerd.sock
196196
image-endpoint: unix:///run/containerd/containerd.sock
197197
EOF
198198
containerd config default > /etc/containerd/config.toml
199199
sed -i 's/SystemdCgroup = false/SystemdCgroup = true/' /etc/containerd/config.toml
200-
sed -i "s,sandbox_image.*$,sandbox_image = $(kubeadm config images list | grep pause | sort -r | head -n1)," /etc/containerd/config.toml
200+
sed -i "s,sandbox_image.*$,sandbox_image = \"$(kubeadm config images list | grep pause | sort -r | head -n1)\"," /etc/containerd/config.toml
201201
systemctl restart containerd
202202
ping -c 3 -q {{ .controlPlaneEndpoint }} && echo OK || ip addr add {{ .controlPlaneEndpoint }} dev lo
203203
curl -o /run/metadata.json -fsSL https://metadata.platformequinix.com/metadata

‎templates/cluster-template-kube-vip.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ spec:
2929
sysctl --system
3030
export DEBIAN_FRONTEND=noninteractive
3131
apt-get update -y
32-
apt-get remove -y docker docker-engine docker.io containerd runc
32+
apt-get remove -y docker docker-engine containerd runc
3333
apt-get install -y apt-transport-https ca-certificates curl gnupg lsb-release linux-generic jq
3434
mkdir -p /etc/apt/keyrings
3535
curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg
@@ -39,14 +39,14 @@ spec:
3939
apt-get update -y
4040
TRIMMED_KUBERNETES_VERSION=$(echo {{ .kubernetesVersion }} | sed 's/\./\\\\./g' | sed 's/^v//')
4141
RESOLVED_KUBERNETES_VERSION=$(apt-cache madison kubelet | awk -v VERSION=$${TRIMMED_KUBERNETES_VERSION} '$3~ VERSION { print $3 }' | head -n1)
42-
apt-get install -y containerd kubelet=$${RESOLVED_KUBERNETES_VERSION} kubeadm=$${RESOLVED_KUBERNETES_VERSION} kubectl=$${RESOLVED_KUBERNETES_VERSION}
42+
apt-get install -y containerd.io kubelet=$${RESOLVED_KUBERNETES_VERSION} kubeadm=$${RESOLVED_KUBERNETES_VERSION} kubectl=$${RESOLVED_KUBERNETES_VERSION}
4343
cat <<EOF > /etc/crictl.yaml
4444
runtime-endpoint: unix:///run/containerd/containerd.sock
4545
image-endpoint: unix:///run/containerd/containerd.sock
4646
EOF
4747
containerd config default > /etc/containerd/config.toml
4848
sed -i 's/SystemdCgroup = false/SystemdCgroup = true/' /etc/containerd/config.toml
49-
sed -i "s,sandbox_image.*$,sandbox_image = $(kubeadm config images list | grep pause | sort -r | head -n1)," /etc/containerd/config.toml
49+
sed -i "s,sandbox_image.*$,sandbox_image = \"$(kubeadm config images list | grep pause | sort -r | head -n1)\"," /etc/containerd/config.toml
5050
systemctl restart containerd
5151
---
5252
apiVersion: cluster.x-k8s.io/v1beta1
@@ -159,7 +159,7 @@ spec:
159159
sysctl --system
160160
export DEBIAN_FRONTEND=noninteractive
161161
apt-get update -y
162-
apt-get remove -y docker docker-engine docker.io containerd runc
162+
apt-get remove -y docker docker-engine containerd runc
163163
apt-get install -y apt-transport-https ca-certificates curl gnupg lsb-release linux-generic jq
164164
mkdir -p /etc/apt/keyrings
165165
curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg
@@ -169,14 +169,14 @@ spec:
169169
apt-get update -y
170170
TRIMMED_KUBERNETES_VERSION=$(echo {{ .kubernetesVersion }} | sed 's/\./\\\\./g' | sed 's/^v//')
171171
RESOLVED_KUBERNETES_VERSION=$(apt-cache madison kubelet | awk -v VERSION=$${TRIMMED_KUBERNETES_VERSION} '$3~ VERSION { print $3 }' | head -n1)
172-
apt-get install -y containerd kubelet=$${RESOLVED_KUBERNETES_VERSION} kubeadm=$${RESOLVED_KUBERNETES_VERSION} kubectl=$${RESOLVED_KUBERNETES_VERSION}
172+
apt-get install -y containerd.io kubelet=$${RESOLVED_KUBERNETES_VERSION} kubeadm=$${RESOLVED_KUBERNETES_VERSION} kubectl=$${RESOLVED_KUBERNETES_VERSION}
173173
cat <<EOF > /etc/crictl.yaml
174174
runtime-endpoint: unix:///run/containerd/containerd.sock
175175
image-endpoint: unix:///run/containerd/containerd.sock
176176
EOF
177177
containerd config default > /etc/containerd/config.toml
178178
sed -i 's/SystemdCgroup = false/SystemdCgroup = true/' /etc/containerd/config.toml
179-
sed -i "s,sandbox_image.*$,sandbox_image = $(kubeadm config images list | grep pause | sort -r | head -n1)," /etc/containerd/config.toml
179+
sed -i "s,sandbox_image.*$,sandbox_image = \"$(kubeadm config images list | grep pause | sort -r | head -n1)\"," /etc/containerd/config.toml
180180
systemctl restart containerd
181181
ping -c 3 -q {{ .controlPlaneEndpoint }} && echo OK || ip addr add {{ .controlPlaneEndpoint }} dev lo
182182
curl -o /run/metadata.json -fsSL https://metadata.platformequinix.com/metadata

0 commit comments

Comments
 (0)