Skip to content

Commit 7193617

Browse files
k8s-ci-robotvomba
authored andcommitted
Merge pull request kubernetes-sigs#1939 from ffais/upgrade-ansible-lint
Bump ansible-lint to v25.2.0
2 parents bc7da50 + 9e6f016 commit 7193617

3 files changed

Lines changed: 7 additions & 7 deletions

File tree

images/capi/Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ IMAGE_NAME ?= cluster-node-image-builder
212212
CONTROLLER_IMG ?= $(REGISTRY)/$(IMAGE_NAME)
213213
TAG ?= dev
214214
ARCH ?= amd64
215-
BASE_IMAGE ?= docker.io/library/ubuntu:jammy
215+
BASE_IMAGE ?= docker.io/library/ubuntu:24.04
216216
BUILDKIT_SYNTAX ?= docker/dockerfile:1.14
217217

218218
## --------------------------------------
@@ -1030,19 +1030,19 @@ validate-all: ## Validates the Packer config for all build targets
10301030
lint: ## Runs linters on image-builder code
10311031
sh_files = $(shell find . -type f -name "*.sh")
10321032
lint: deps-lint
1033-
ansible-lint ansible/
1033+
ansible-lint --project-dir . ansible/
10341034
# ignore error code since shellcheck exits with Error 1 if problems are found despite running properly
10351035
-@for f in $(sh_files); do (shellcheck -x $$f); done
10361036

10371037
.PHONY: lint-fix
10381038
lint-fix: ## Runs linters on image-builder code and fixes issues
10391039
lint-fix: deps-lint
1040-
ansible-lint --fix=all ansible/
1040+
ansible-lint --fix=all --project-dir . ansible/
10411041

10421042
.PHONY: lint-ignore
10431043
lint-ignore: ## Runs linters on image-builder code and creates an "ignore" file
10441044
lint-ignore: deps-lint
1045-
ansible-lint --generate-ignore ansible/
1045+
ansible-lint --generate-ignore --project-dir . ansible/
10461046

10471047
## --------------------------------------
10481048
## Clean targets

images/capi/hack/ensure-ansible-lint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ set -o pipefail
2222

2323
source hack/utils.sh
2424

25-
_version="6.21.1"
25+
_version="25.2.0"
2626

2727
# Change directories to the parent directory of the one in which this
2828
# script is located.

images/capi/hack/ensure-ansible.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ fi
4949
echo ${ansible_version[*]}
5050

5151
ansible-galaxy collection install \
52-
'community.general:<12.0.0' \
53-
ansible.posix \
52+
'community.general:<=12.0.0' \
53+
'ansible.posix' \
5454
'ansible.windows:>=1.7.0' \
5555
community.windows

0 commit comments

Comments
 (0)