Merge pull request vmware-samples#1086 from lamw/issue-1085

lamw · Aug 5, 2023 · 6773c6c · 6773c6c
2 parents fe086ce + 4a28e07
commit 6773c6c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/scripts/photon-settings.sh b/scripts/photon-settings.sh
@@ -78,6 +78,12 @@ curl -L https://github.com/containerd/containerd/releases/download/v${CONTAINERD
 tar -zxvf /root/download/containerd-${CONTAINERD_VERSION}-linux-amd64.tar.gz -C /usr
 rm -f /root/download/containerd-${CONTAINERD_VERSION}-linux-amd64.tar.gz
 containerd config default > /etc/containerd/config.toml
+
+# Update default version of the pause container to the one from VEBA BOM
+PAUSE_CONTAINER_NAME="registry.k8s.io/pause"
+PAUSE_CONTAINER_VERSION=$(jq -r --arg PAUSE_CONTAINER_NAME ${PAUSE_CONTAINER_NAME} '.kubernetes.containers[] | select(.name == $PAUSE_CONTAINER_NAME) | .version' ${VEBA_BOM_FILE})
+sed -i "s#sandbox_image.*#sandbox_image = \"${PAUSE_CONTAINER_NAME}:${PAUSE_CONTAINER_VERSION}\"#g" /etc/containerd/config.toml
+
 cat > /usr/lib/systemd/system/containerd.service <<EOF
 [Unit]
 Description=containerd container runtime

diff --git a/veba-bom.json b/veba-bom.json
@@ -66,10 +66,6 @@
                 "name": "registry.k8s.io/pause",
                 "version": "3.8"
             },
-            {
-                "name": "registry.k8s.io/pause",
-                "version": "3.7"
-            },
             {
                 "name": "registry.k8s.io/etcd",
                 "version": "3.5.6-0"