Compare commits

..
5 Commits
Author SHA1 Message Date
Don NaroandGitHub c21952e87b chore: update ansible-lint config (#302) 2026-08-17 11:17:29 +00:00
Chyna SandersandGitHub 7b56706004 [backport stable-5] replace ansible.module_utils.six imports with Python 3 stdlib, add ignores (#287)
* Replace ansible.module_utils.six imports with Python 3 stdlib and add sanity ignore files for ansible-core 2.20/2.21

* Add changelog fragment
2026-08-06 21:22:31 +00:00
Don NaroandGitHub 2418bceeec fix(ci): pin ansible-core below 2.19 in ansible-lint tox env (#283) 2026-08-03 20:53:17 +00:00
d50d64d5d9 Add .ansible-lint (#272) (#278)
* Add .ansible-lint



* Update



* Update



---------

Signed-off-by: Alina Buzachis <abuzachis@redhat.com>
Co-authored-by: Alina Buzachis <abuzachis@redhat.com>
2026-08-03 19:24:49 +00:00
1fbf4ae009 Update ldap image in tests (#274) (#276)
* Update ldap image in tests

The bitnami openldap image we had been using is no longer being support
by them. It has been moved over to a bitnamilegacy namespace, but it's
not clear how long that will remain. We should find a better solution at
some point.

* Update versions in Dockerfile

The dockerfile was built around python3.9 which forced the use of
ansible 2.15. This updates the base image to ubi10 which uses python3.12
by default. The version of the oc/kubectl client package was updated to
4.20 as well.

* Try and make it work

* Remove backslash

* debug

* try and force 3.12

* use ubi9

* debug

* try adding packaging

* debug

* Lots of changes

* Add check for none

* Fix python version

Co-authored-by: Mike Graves <mgraves@redhat.com>
2026-08-03 13:47:34 +00:00
21 changed files with 66 additions and 49 deletions
+15
View File
@@ -0,0 +1,15 @@
---
profile: production
exclude_paths:
- tests/unit
- tests/sanity
- molecule
- changelogs
- docs
- .ansible
- .github
warn_list:
- no-log-password
-5
View File
@@ -1,5 +0,0 @@
---
profile: production
exclude_paths:
- molecule
- tests/sanity
@@ -0,0 +1,3 @@
minor_changes:
- Replace ``ansible.module_utils.six`` imports (``iteritems``, ``string_types``) with Python 3 stdlib equivalents (https://github.com/openshift/community.okd/pull/287).
- Add sanity test ignore files for ansible-core 2.20 and 2.21 (https://github.com/openshift/community.okd/pull/287).
+8 -8
View File
@@ -5,26 +5,26 @@ ENV OPERATOR=/usr/local/bin/ansible-operator \
USER_NAME=ansible-operator\
HOME=/opt/ansible \
ANSIBLE_LOCAL_TMP=/opt/ansible/tmp \
DOWNSTREAM_BUILD_PYTHON=python3.9
DOWNSTREAM_BUILD_PYTHON=python3.12
RUN yum install -y \
glibc-langpack-en \
git \
make \
python3 \
python3-devel \
python3-pip \
python3-setuptools \
python3.12 \
python3.12-devel \
python3.12-pip \
python3.12-setuptools \
gcc \
openldap-devel \
&& python3.9 -m pip install --no-cache-dir --upgrade setuptools pip \
&& python3.9 -m pip install --no-cache-dir \
&& python3.12 -m pip install --no-cache-dir --upgrade setuptools pip \
&& python3.12 -m pip install --no-cache-dir \
kubernetes \
"ansible-core" \
"molecule" \
&& yum clean all \
&& rm -rf $HOME/.cache \
&& curl -L https://github.com/openshift/okd/releases/download/4.12.0-0.okd-2023-04-16-041331/openshift-client-linux-4.12.0-0.okd-2023-04-16-041331.tar.gz | tar -xz -C /usr/local/bin
&& curl -L https://github.com/okd-project/okd/releases/download/4.20.0-okd-scos.17/openshift-client-linux-amd64-rhel9-4.20.0-okd-scos.17.tar.gz | tar -xz -C /usr/local/bin
# TODO: Is there a better way to install this client in ubi8?
COPY . /opt/ansible
+1 -1
View File
@@ -64,6 +64,7 @@ f_prep()
# Files to copy downstream (relative repo root dir path)
_file_manifest=(
.gitignore
.ansible-lint
CHANGELOG.rst
galaxy.yml
LICENSE
@@ -77,7 +78,6 @@ f_prep()
# Directories to recursively copy downstream (relative repo root dir path)
_dir_manifest=(
.config
changelogs
ci
meta
+2 -2
View File
@@ -18,8 +18,8 @@ provisioner:
host_vars:
localhost:
virtualenv: ${MOLECULE_EPHEMERAL_DIRECTORY}/virtualenv
virtualenv_command: '{{ ansible_playbook_python }} -m virtualenv'
virtualenv_interpreter: '{{ virtualenv }}/bin/python'
virtualenv_command: '{{ ansible_playbook_python }} -m venv'
virtualenv_interpreter: '{{ virtualenv }}/bin/python3'
playbook_namespace: molecule-tests
env:
ANSIBLE_FORCE_COLOR: 'true'
+1
View File
@@ -13,6 +13,7 @@
- kubernetes>=12.0.0
- coverage
- python-ldap
- packaging
virtualenv: "{{ virtualenv }}"
virtualenv_command: "{{ virtualenv_command }}"
virtualenv_site_packages: no
@@ -47,8 +47,8 @@
assert:
that:
- result is changed
- admins_group
- devs_group
- admins_group | length > 0
- devs_group | length > 0
- '"jane.smith@ansible.org" in admins_group.users'
- '"jim.adams@ansible.org" in admins_group.users'
- '"jordanbulls@ansible.org" in devs_group.users'
@@ -47,8 +47,8 @@
assert:
that:
- result is changed
- banking_group
- insurance_group
- banking_group | length > 0
- insurance_group | length > 0
- '"james-allan@ansible.org" in banking_group.users'
- '"gordon-kane@ansible.org" in banking_group.users'
- '"alice-courtney@ansible.org" in insurance_group.users'
@@ -17,7 +17,8 @@
spec:
containers:
- name: ldap
image: bitnami/openldap
# bitnami is no longer supporting this image. we should probably find a replacement
image: docker.io/bitnamilegacy/openldap:latest
env:
- name: LDAP_ADMIN_USERNAME
value: "{{ ldap_admin_user }}"
@@ -13,10 +13,8 @@
- pip:
name:
- kubernetes
virtualenv: "{{ venv }}"
virtualenv_command: "{{ virtualenv_command }}"
virtualenv_site_packages: false
- python-ldap
state: absent
- name: Load test configurations
set_fact:
@@ -27,8 +25,6 @@
config: "{{ configs.simple }}"
register: result
ignore_errors: true
vars:
ansible_python_interpreter: "{{ venv }}/bin/python"
- name: Check that module failed gracefully
assert:
@@ -36,6 +32,9 @@
- '"Failed to import the required Python library (python-ldap)" in result.msg'
always:
- pip:
name:
- python-ldap
- name: Remove temp directory
file:
path: "{{ test_dir }}"
@@ -68,8 +68,8 @@
assert:
that:
- result is changed
- admins_group
- devs_group
- admins_group | length > 0
- devs_group | length > 0
- '"jane.smith@ansible.org" in admins_group.users'
- '"jim.adams@ansible.org" in devs_group.users'
- '"jordanbulls@ansible.org" in devs_group.users'
@@ -89,8 +89,8 @@
assert:
that:
- result is changed
- admins_group
- devs_group
- admins_group | length > 0
- devs_group | length > 0
- '"jane.smith@ansible.org" in admins_group.users'
- '"jim.adams@ansible.org" in devs_group.users'
- '"jordanbulls@ansible.org" in devs_group.users'
@@ -110,8 +110,8 @@
assert:
that:
- result is changed
- admins_group
- devs_group
- admins_group | length > 0
- devs_group | length > 0
- '"cn=Jane,ou=people,ou=rfc2307,"+ldap_root in admins_group.users'
- '"cn=Jim,ou=people,ou=rfc2307,"+ldap_root in devs_group.users'
- '"cn=Jordan,ou=people,ou=rfc2307,"+ldap_root in devs_group.users'
@@ -131,8 +131,8 @@
assert:
that:
- result is changed
- admins_group
- devs_group
- admins_group | length > 0
- devs_group | length > 0
- '"jane.smith@ansible.org" in admins_group.users'
- '"jim.adams@ansible.org" in devs_group.users'
- '"jordanbulls@ansible.org" in devs_group.users'
@@ -213,5 +213,6 @@
ignore_errors: true
when:
- registry.public_hostname
- registry.public_hostname is not none
- registry.public_hostname | length > 0
- registry.check.reached
+1 -4
View File
@@ -66,10 +66,7 @@
tasks:
- pip:
name: kubernetes-validate==1.12.0
virtualenv: "{{ virtualenv }}"
virtualenv_command: "{{ virtualenv_command }}"
virtualenv_site_packages: no
name: kubernetes-validate==1.34.1
- import_tasks: tasks/validate_installed.yml
@@ -9,7 +9,6 @@ import copy
from ansible.module_utils._text import to_native
from ansible.module_utils.parsing.convert_bool import boolean
from ansible.module_utils.six import iteritems
from ansible_collections.community.okd.plugins.module_utils.openshift_common import (
AnsibleOpenshiftModule,
@@ -106,7 +105,7 @@ class OpenShiftAdmPruneImages(AnsibleOpenshiftModule):
def list_objects(self):
result = {}
for kind, version in iteritems(ApiConfiguration):
for kind, version in ApiConfiguration.items():
namespace = None
if self.params.get("namespace") and kind.lower() == "imagestream":
namespace = self.params.get("namespace")
@@ -8,7 +8,6 @@ from datetime import datetime
from ansible_collections.community.okd.plugins.module_utils.openshift_docker_image import (
parse_docker_image_ref,
)
from ansible.module_utils.six import iteritems
def get_image_blobs(image):
@@ -119,7 +118,7 @@ class OpenShiftAnalyzeImageStream(object):
"CronJob",
)
for k, objects in iteritems(resources):
for k, objects in resources.items():
if k not in keys:
continue
for obj in objects:
@@ -222,7 +221,7 @@ class OpenShiftAnalyzeImageStream(object):
def analyze_refs_from_build_strategy(self, resources):
# Json Path is always spec.strategy
keys = ("BuildConfig", "Build")
for k, objects in iteritems(resources):
for k, objects in resources.items():
if k not in keys:
continue
for obj in objects:
@@ -7,7 +7,6 @@ __metaclass__ = type
import copy
from ansible.module_utils.parsing.convert_bool import boolean
from ansible.module_utils.six import string_types
from ansible_collections.community.okd.plugins.module_utils.openshift_common import (
AnsibleOpenshiftModule,
@@ -370,7 +369,7 @@ class OpenShiftImportImage(AnsibleOpenshiftModule):
def execute_module(self):
names = []
name = self.params.get("name")
if isinstance(name, string_types):
if isinstance(name, str):
names.append(name)
elif isinstance(name, list):
names = name
+1 -2
View File
@@ -12,7 +12,6 @@ import os
import copy
from ansible.module_utils.parsing.convert_bool import boolean
from ansible.module_utils.six import iteritems
try:
import ldap
@@ -46,7 +45,7 @@ def validate_ldap_sync_config(config):
return "could not read ca file: {0}.".format(ca_file)
nameMapping = config.get("groupUIDNameMapping", {})
for k, v in iteritems(nameMapping):
for k, v in nameMapping.items():
if len(k) == 0 or len(v) == 0:
return "groupUIDNameMapping has empty key or value"
+3
View File
@@ -0,0 +1,3 @@
plugins/modules/k8s.py validate-modules:parameter-type-not-in-doc
plugins/modules/k8s.py validate-modules:return-syntax-error
plugins/modules/openshift_process.py validate-modules:parameter-type-not-in-doc
+5
View File
@@ -0,0 +1,5 @@
plugins/modules/k8s.py validate-modules:parameter-type-not-in-doc
plugins/modules/k8s.py validate-modules:return-syntax-error
plugins/modules/k8s.py validate-modules:bad-return-value-key
plugins/modules/openshift_process.py validate-modules:parameter-type-not-in-doc
plugins/modules/openshift_process.py validate-modules:bad-return-value-key
+1
View File
@@ -16,6 +16,7 @@ commands =
[testenv:ansible-lint]
deps =
ansible-lint >= 25.1.2
ansible-core>=2.16.0,<2.19
changedir = {toxinidir}
commands =
ansible-lint