From 4e6e63d49dac658d3f320029930ad462c39f7818 Mon Sep 17 00:00:00 2001
From: ChengHao Yang <17496418+tico88612@users.noreply.github.com>
Date: Thu, 21 May 2026 20:58:51 +0800
Subject: [PATCH 1/3] Chore: pin the pre-commit ansible-core version

Signed-off-by: ChengHao Yang <17496418+tico88612@users.noreply.github.com>
---
 .pre-commit-config.yaml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 0e6d218ad..16d79bda9 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -33,6 +33,7 @@ repos:
     hooks:
       - id: ansible-lint
         additional_dependencies:
+          - ansible-core>=2.18.0,<2.19.0
           - jmespath==1.0.1
           - netaddr==1.3.0
           - distlib
@@ -49,7 +50,7 @@ repos:
         name: Build and install kubernetes-sigs.kubespray Ansible collection
         language: python
         additional_dependencies:
-          - ansible-core>=2.16.4
+          - ansible-core>=2.18.0,<2.19.0
           - distlib
         entry: tests/scripts/collection-build-install.sh
         pass_filenames: false
@@ -91,7 +92,7 @@ repos:
         name: Update static files referencing default kubespray values
         language: python
         additional_dependencies:
-          - ansible-core>=2.16.4
+          - ansible-core>=2.18.0,<2.19.0
         entry: scripts/propagate_ansible_variables.yml
         pass_filenames: false
 

From 1b111e06b165696b379bd112a4a1846cfad12207 Mon Sep 17 00:00:00 2001
From: ChengHao Yang <17496418+tico88612@users.noreply.github.com>
Date: Thu, 21 May 2026 21:09:06 +0800
Subject: [PATCH 2/3] Fix kata-containers job name duplicated

Signed-off-by: ChengHao Yang <17496418+tico88612@users.noreply.github.com>
---
 .../kata-containers/molecule/default/verify.yml                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/container-engine/kata-containers/molecule/default/verify.yml b/roles/container-engine/kata-containers/molecule/default/verify.yml
index 1bb02c321..93ca857ad 100644
--- a/roles/container-engine/kata-containers/molecule/default/verify.yml
+++ b/roles/container-engine/kata-containers/molecule/default/verify.yml
@@ -9,7 +9,7 @@
     failed_when: >
       version is failed or
       'kata-runtime' not in version.stdout
-  - name: Test version
+  - name: Test version check
     command: "/opt/kata/bin/kata-runtime check"
     register: check
     failed_when: >

From d2ca095505ff3b2204f86761e44f422d0e19372a Mon Sep 17 00:00:00 2001
From: ChengHao Yang <17496418+tico88612@users.noreply.github.com>
Date: Thu, 21 May 2026 22:23:10 +0800
Subject: [PATCH 3/3] Chore: Pipeline kubernetes-python client version pin
 35.0.0

Signed-off-by: ChengHao Yang <17496418+tico88612@users.noreply.github.com>
---
 pipeline.Dockerfile            | 4 ++--
 scripts/pipeline.Dockerfile.j2 | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pipeline.Dockerfile b/pipeline.Dockerfile
index 5474a661d..bb164045a 100644
--- a/pipeline.Dockerfile
+++ b/pipeline.Dockerfile
@@ -55,5 +55,5 @@ RUN update-alternatives --install /usr/bin/python python /usr/bin/python3 1 \
     && rm vagrant_${VAGRANT_VERSION}-1_$(dpkg --print-architecture).deb \
     && vagrant plugin install vagrant-libvirt \
     # Install Kubernetes collections
-    && pip install --break-system-packages --no-compile --no-cache-dir kubernetes \
-    && ansible-galaxy collection install kubernetes.core
+    && pip install --break-system-packages --no-compile --no-cache-dir kubernetes==35.0.0 \
+    && ansible-galaxy collection install kubernetes.core:==6.4.0
diff --git a/scripts/pipeline.Dockerfile.j2 b/scripts/pipeline.Dockerfile.j2
index e7ed7bd54..8aead15ad 100644
--- a/scripts/pipeline.Dockerfile.j2
+++ b/scripts/pipeline.Dockerfile.j2
@@ -55,5 +55,5 @@ RUN update-alternatives --install /usr/bin/python python /usr/bin/python3 1 \
     && rm vagrant_${VAGRANT_VERSION}-1_$(dpkg --print-architecture).deb \
     && vagrant plugin install vagrant-libvirt \
     # Install Kubernetes collections
-    && pip install --break-system-packages --no-compile --no-cache-dir kubernetes \
-    && ansible-galaxy collection install kubernetes.core
+    && pip install --break-system-packages --no-compile --no-cache-dir kubernetes==35.0.0 \
+    && ansible-galaxy collection install kubernetes.core:==6.4.0