From 76b0cbcb4ed863896a44961578f8e2f321dc8643 Mon Sep 17 00:00:00 2001
From: Cristian Calin <6627509+cristicalin@users.noreply.github.com>
Date: Thu, 23 Jun 2022 11:43:44 +0300
Subject: [PATCH] bump pause container to 3.6 (#9024)
* [pod-infra] bump pod infra container version to 3.6
* [cri-dockerd] align pod infra container image with other CRIs
---
.../cri-dockerd/templates/cri-dockerd.service.j2 | 2 +-
roles/download/defaults/main.yml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/roles/container-engine/cri-dockerd/templates/cri-dockerd.service.j2 b/roles/container-engine/cri-dockerd/templates/cri-dockerd.service.j2
index 968c7b0ac..078f66651 100644
--- a/roles/container-engine/cri-dockerd/templates/cri-dockerd.service.j2
+++ b/roles/container-engine/cri-dockerd/templates/cri-dockerd.service.j2
@@ -7,7 +7,7 @@ Requires=cri-dockerd.socket
[Service]
Type=notify
-ExecStart={{ bin_dir }}/cri-dockerd --container-runtime-endpoint {{ cri_socket }} --cni-conf-dir=/etc/cni/net.d --cni-bin-dir=/opt/cni/bin --network-plugin=cni --pod-cidr={{ kube_pods_subnet }} {% if enable_dual_stack_networks %}--ipv6-dual-stack=True{% endif %}
+ExecStart={{ bin_dir }}/cri-dockerd --container-runtime-endpoint {{ cri_socket }} --cni-conf-dir=/etc/cni/net.d --cni-bin-dir=/opt/cni/bin --network-plugin=cni --pod-cidr={{ kube_pods_subnet }} --pod-infra-container-image={{ pod_infra_image_repo }}:{{ pod_infra_version }} {% if enable_dual_stack_networks %}--ipv6-dual-stack=True{% endif %}
ExecReload=/bin/kill -s HUP $MAINPID
TimeoutSec=0
diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml
index 38b1e81b2..1400b0857 100644
--- a/roles/download/defaults/main.yml
+++ b/roles/download/defaults/main.yml
@@ -109,7 +109,7 @@ flannel_version: "v0.17.0"
flannel_cni_version: "v1.0.1"
cni_version: "v1.1.1"
weave_version: 2.8.1
-pod_infra_version: "3.3"
+pod_infra_version: "3.6"
cilium_version: "v1.11.3"
kube_ovn_version: "v1.9.2"
kube_ovn_dpdk_version: "19.11-{{ kube_ovn_version }}"
--
GitLab