External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-05-26 18:17:48 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13269 from tico88612/fix/pre-commit

Browse Source 
Fixed pre-commit and pin Python Client version in pipeline
This commit is contained in:
Kubernetes Prow Robot
2026-05-26 13:41:26 +05:30
committed by GitHub
parent 6107c6ab7c d2ca095505
commit 03ae25e410
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.pre-commit-config.yaml
View File

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

4
pipeline.Dockerfile
View File

@@ -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 \ && rm vagrant_${VAGRANT_VERSION}-1_$(dpkg --print-architecture).deb \
&& vagrant plugin install vagrant-libvirt \ && vagrant plugin install vagrant-libvirt \
# Install Kubernetes collections # Install Kubernetes collections
&& pip install --break-system-packages --no-compile --no-cache-dir kubernetes \ && pip install --break-system-packages --no-compile --no-cache-dir kubernetes==35.0.0 \
&& ansible-galaxy collection install kubernetes.core && ansible-galaxy collection install kubernetes.core:==6.4.0

2
roles/container-engine/kata-containers/molecule/default/verify.yml
View File

@@ -9,7 +9,7 @@
failed_when: > failed_when: >
version is failed or version is failed or
'kata-runtime' not in version.stdout 'kata-runtime' not in version.stdout
- name: Test version - name: Test version check
command: "/opt/kata/bin/kata-runtime check" command: "/opt/kata/bin/kata-runtime check"
register: check register: check
failed_when: > failed_when: >

4
scripts/pipeline.Dockerfile.j2
View File

@@ -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 \ && rm vagrant_${VAGRANT_VERSION}-1_$(dpkg --print-architecture).deb \
&& vagrant plugin install vagrant-libvirt \ && vagrant plugin install vagrant-libvirt \
# Install Kubernetes collections # Install Kubernetes collections
&& pip install --break-system-packages --no-compile --no-cache-dir kubernetes \ && pip install --break-system-packages --no-compile --no-cache-dir kubernetes==35.0.0 \
&& ansible-galaxy collection install kubernetes.core && ansible-galaxy collection install kubernetes.core:==6.4.0