Compare commits

..
Author SHA1 Message Date
c196ccd867 Update old stable-5 branch to sync with current changes from main (#266)
* Update tests for newer version of openshift (#254)

* Update tests for newer version of openshift

More recent versions of ocp no longer automatically create tokens for
service accounts. This updates the tests to manually create the tokens.

* Update nginx template version

The old image was EOL and the deployment was failing to deploy.

* Fix nginx version for all tasks

* Add missing var

* Remove openshift inventory plugin (#252)

* Remove openshift inventory plugin

This removes the openshift inventory plugin which has been deprecated
since version 3.0.0. The tests have been updated to retain coverage of
the connection plugin, which is still supported.

* Update version in Makefile

* CI fixes

* Update version info in build scripts

* Set ansible remote directory

The security policy on the pod is preventing ansible from writing to /.
Set it to /tmp which should be writable.

* Bump the ansible-lint version to 25.1.2 (#255)

* Bump the ansible-lint version to 25.1.2

* Update changelogs/fragments/ansible-lint-update.yml

Co-authored-by: Bikouo Aubin <79859644+abikouo@users.noreply.github.com>

---------

Co-authored-by: Bikouo Aubin <79859644+abikouo@users.noreply.github.com>

* Add ansible-lint to tox linters (#258)

* Add ansible-lint to tox linters

* Bump black

* Black formatting

* fix linting

* prepare release 4.0.2 (#262) (#263)

(cherry picked from commit 55ccaf3394)

* Update k8s dependency upper bounds (#257)

---------

Co-authored-by: Mike Graves <mgraves@redhat.com>
Co-authored-by: GomathiselviS <gomathiselvi@gmail.com>
Co-authored-by: Bikouo Aubin <79859644+abikouo@users.noreply.github.com>
Co-authored-by: Bianca Henderson <beeankha@gmail.com>
2025-06-10 10:43:21 +02:00
Bianca HendersonandGitHub d2346e4c8f Update k8s dependency upper bounds (#257) 2025-06-05 16:37:49 +00:00
Mandar KulkarniandGitHub 140da75c0f prepare release 4.0.2 (#262) (#263)
(cherry picked from commit 55ccaf3394)
2025-05-29 14:53:51 +00:00
Mike GravesandGitHub f54297c2ac Add ansible-lint to tox linters (#258)
* Add ansible-lint to tox linters

* Bump black

* Black formatting

* fix linting
2025-05-19 19:53:38 +00:00
69bcd79b92 Bump the ansible-lint version to 25.1.2 (#255)
* Bump the ansible-lint version to 25.1.2

* Update changelogs/fragments/ansible-lint-update.yml

Co-authored-by: Bikouo Aubin <79859644+abikouo@users.noreply.github.com>

---------

Co-authored-by: Bikouo Aubin <79859644+abikouo@users.noreply.github.com>
2025-05-16 16:20:49 +00:00
Mike GravesandGitHub 93746f2392 Remove openshift inventory plugin (#252)
* Remove openshift inventory plugin

This removes the openshift inventory plugin which has been deprecated
since version 3.0.0. The tests have been updated to retain coverage of
the connection plugin, which is still supported.

* Update version in Makefile

* CI fixes

* Update version info in build scripts

* Set ansible remote directory

The security policy on the pod is preventing ansible from writing to /.
Set it to /tmp which should be writable.
2025-05-05 15:55:22 +00:00
Mike GravesandGitHub a3c3a69bbf Update tests for newer version of openshift (#254)
* Update tests for newer version of openshift

More recent versions of ocp no longer automatically create tokens for
service accounts. This updates the tests to manually create the tokens.

* Update nginx template version

The old image was EOL and the deployment was failing to deploy.

* Fix nginx version for all tasks

* Add missing var
2025-05-02 08:30:38 +00:00
28 changed files with 66 additions and 112 deletions
-15
View File
@@ -1,15 +0,0 @@
---
profile: production
exclude_paths:
- tests/unit
- tests/sanity
- molecule
- changelogs
- docs
- .ansible
- .github
warn_list:
- no-log-password
+5
View File
@@ -0,0 +1,5 @@
---
profile: production
exclude_paths:
- molecule
- tests/sanity
+3 -27
View File
@@ -4,25 +4,6 @@ OKD Collection Release Notes
.. contents:: Topics .. contents:: Topics
v5.0.0
======
Release Summary
---------------
This release drops support for ansible-lint < 25.1.2 and removes deprecated openshift inventory plugin.
Breaking Changes / Porting Guide
--------------------------------
- Remove openshift inventory plugin deprecated in 3.0.0 (https://github.com/openshift/community.okd/pull/252).
Minor Changes
-------------
- Bump version of ansible-lint to 25.1.2 (https://github.com/openshift/community.okd/pull/255).
- Bump version of ansible-lint to minimum 24.7.0 (https://github.com/openshift/community.okd/pull/240).
v4.0.2 v4.0.2
====== ======
@@ -34,15 +15,10 @@ This patch updates the k8s dependency version to the 5.x range and modifies test
v4.0.1 v4.0.1
====== ======
Release Summary Bugfixes
--------------- --------
This is a bug fix release - openshift_auth - fix issue where openshift_auth module sometimes does not delete the auth token (https://github.com/openshift/community.okd/pull/242)
Minor Changes
-------------
- openshift_auth - fix issue where openshift_auth module sometimes does not delete the auth token. Based on stale PR (https://github.com/openshift/community.okd/pull/194).
v4.0.0 v4.0.0
====== ======
+1 -1
View File
@@ -1,7 +1,7 @@
.PHONY: molecule .PHONY: molecule
# Also needs to be updated in galaxy.yml # Also needs to be updated in galaxy.yml
VERSION = 5.0.0 VERSION = 6.0.0-dev0
SANITY_TEST_ARGS ?= --docker --color SANITY_TEST_ARGS ?= --docker --color
UNITS_TEST_ARGS ?= --docker --color UNITS_TEST_ARGS ?= --docker --color
+2 -16
View File
@@ -244,8 +244,8 @@ releases:
4.0.1: 4.0.1:
changes: changes:
minor_changes: minor_changes:
- openshift_auth - fix issue where openshift_auth module sometimes does not - openshift_auth - fix issue where openshift_auth module sometimes does not delete the auth
delete the auth token. Based on stale PR (https://github.com/openshift/community.okd/pull/194). token. Based on stale PR (https://github.com/openshift/community.okd/pull/194).
release_summary: This is a bug fix release release_summary: This is a bug fix release
fragments: fragments:
- 242-fix-failed-token-deletion.yml - 242-fix-failed-token-deletion.yml
@@ -257,17 +257,3 @@ releases:
fragments: fragments:
- 4.0.2.yml - 4.0.2.yml
release_date: '2025-05-28' release_date: '2025-05-28'
5.0.0:
changes:
breaking_changes:
- Remove openshift inventory plugin deprecated in 3.0.0 (https://github.com/openshift/community.okd/pull/252).
minor_changes:
- Bump version of ansible-lint to 25.1.2 (https://github.com/openshift/community.okd/pull/255).
- Bump version of ansible-lint to minimum 24.7.0 (https://github.com/openshift/community.okd/pull/240).
release_summary: This release drops support for ansible-lint < 25.1.2 and removes deprecated openshift inventory plugin.
fragments:
- 240-bump-ansible-lint-version.yml
- 5.0.0.yml
- ansible-lint-update.yml
- readme_template_update.yml
release_date: '2025-06-10'
@@ -0,0 +1,3 @@
---
minor_changes:
- Bump version of ansible-lint to minimum 24.7.0 (https://github.com/openshift/community.okd/pull/240).
@@ -1,3 +0,0 @@
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).
@@ -0,0 +1,3 @@
---
minor_changes:
- Bump version of ansible-lint to 25.1.2 (https://github.com/openshift/community.okd/pull/255).
@@ -0,0 +1,3 @@
---
trivial:
- Update the README doc to match https://access.redhat.com/articles/7068606.
+8 -8
View File
@@ -5,26 +5,26 @@ ENV OPERATOR=/usr/local/bin/ansible-operator \
USER_NAME=ansible-operator\ USER_NAME=ansible-operator\
HOME=/opt/ansible \ HOME=/opt/ansible \
ANSIBLE_LOCAL_TMP=/opt/ansible/tmp \ ANSIBLE_LOCAL_TMP=/opt/ansible/tmp \
DOWNSTREAM_BUILD_PYTHON=python3.12 DOWNSTREAM_BUILD_PYTHON=python3.9
RUN yum install -y \ RUN yum install -y \
glibc-langpack-en \ glibc-langpack-en \
git \ git \
make \ make \
python3.12 \ python3 \
python3.12-devel \ python3-devel \
python3.12-pip \ python3-pip \
python3.12-setuptools \ python3-setuptools \
gcc \ gcc \
openldap-devel \ openldap-devel \
&& python3.12 -m pip install --no-cache-dir --upgrade setuptools pip \ && python3.9 -m pip install --no-cache-dir --upgrade setuptools pip \
&& python3.12 -m pip install --no-cache-dir \ && python3.9 -m pip install --no-cache-dir \
kubernetes \ kubernetes \
"ansible-core" \ "ansible-core" \
"molecule" \ "molecule" \
&& yum clean all \ && yum clean all \
&& rm -rf $HOME/.cache \ && rm -rf $HOME/.cache \
&& 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 && 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
# TODO: Is there a better way to install this client in ubi8? # TODO: Is there a better way to install this client in ubi8?
COPY . /opt/ansible COPY . /opt/ansible
+2 -2
View File
@@ -9,7 +9,7 @@
# - All functions are prefixed with f_ so it's obvious where they come # - All functions are prefixed with f_ so it's obvious where they come
# from when in use throughout the script # from when in use throughout the script
DOWNSTREAM_VERSION="5.0.0" DOWNSTREAM_VERSION="6.0.0-dev0"
KEEP_DOWNSTREAM_TMPDIR="${KEEP_DOWNSTREAM_TMPDIR:-''}" KEEP_DOWNSTREAM_TMPDIR="${KEEP_DOWNSTREAM_TMPDIR:-''}"
INSTALL_DOWNSTREAM_COLLECTION_PATH="${INSTALL_DOWNSTREAM_COLLECTION_PATH:-}" INSTALL_DOWNSTREAM_COLLECTION_PATH="${INSTALL_DOWNSTREAM_COLLECTION_PATH:-}"
_build_dir="" _build_dir=""
@@ -64,7 +64,6 @@ f_prep()
# Files to copy downstream (relative repo root dir path) # Files to copy downstream (relative repo root dir path)
_file_manifest=( _file_manifest=(
.gitignore .gitignore
.ansible-lint
CHANGELOG.rst CHANGELOG.rst
galaxy.yml galaxy.yml
LICENSE LICENSE
@@ -78,6 +77,7 @@ f_prep()
# Directories to recursively copy downstream (relative repo root dir path) # Directories to recursively copy downstream (relative repo root dir path)
_dir_manifest=( _dir_manifest=(
.config
changelogs changelogs
ci ci
meta meta
+1 -1
View File
@@ -24,4 +24,4 @@ tags:
- okd - okd
- cluster - cluster
# Also needs to be updated in the Makefile # Also needs to be updated in the Makefile
version: 5.0.0 version: 6.0.0-dev0
+2 -2
View File
@@ -18,8 +18,8 @@ provisioner:
host_vars: host_vars:
localhost: localhost:
virtualenv: ${MOLECULE_EPHEMERAL_DIRECTORY}/virtualenv virtualenv: ${MOLECULE_EPHEMERAL_DIRECTORY}/virtualenv
virtualenv_command: '{{ ansible_playbook_python }} -m venv' virtualenv_command: '{{ ansible_playbook_python }} -m virtualenv'
virtualenv_interpreter: '{{ virtualenv }}/bin/python3' virtualenv_interpreter: '{{ virtualenv }}/bin/python'
playbook_namespace: molecule-tests playbook_namespace: molecule-tests
env: env:
ANSIBLE_FORCE_COLOR: 'true' ANSIBLE_FORCE_COLOR: 'true'
-1
View File
@@ -13,7 +13,6 @@
- kubernetes>=12.0.0 - kubernetes>=12.0.0
- coverage - coverage
- python-ldap - python-ldap
- packaging
virtualenv: "{{ virtualenv }}" virtualenv: "{{ virtualenv }}"
virtualenv_command: "{{ virtualenv_command }}" virtualenv_command: "{{ virtualenv_command }}"
virtualenv_site_packages: no virtualenv_site_packages: no
@@ -47,8 +47,8 @@
assert: assert:
that: that:
- result is changed - result is changed
- admins_group | length > 0 - admins_group
- devs_group | length > 0 - devs_group
- '"jane.smith@ansible.org" in admins_group.users' - '"jane.smith@ansible.org" in admins_group.users'
- '"jim.adams@ansible.org" in admins_group.users' - '"jim.adams@ansible.org" in admins_group.users'
- '"jordanbulls@ansible.org" in devs_group.users' - '"jordanbulls@ansible.org" in devs_group.users'
@@ -47,8 +47,8 @@
assert: assert:
that: that:
- result is changed - result is changed
- banking_group | length > 0 - banking_group
- insurance_group | length > 0 - insurance_group
- '"james-allan@ansible.org" in banking_group.users' - '"james-allan@ansible.org" in banking_group.users'
- '"gordon-kane@ansible.org" in banking_group.users' - '"gordon-kane@ansible.org" in banking_group.users'
- '"alice-courtney@ansible.org" in insurance_group.users' - '"alice-courtney@ansible.org" in insurance_group.users'
@@ -17,8 +17,7 @@
spec: spec:
containers: containers:
- name: ldap - name: ldap
# bitnami is no longer supporting this image. we should probably find a replacement image: bitnami/openldap
image: docker.io/bitnamilegacy/openldap:latest
env: env:
- name: LDAP_ADMIN_USERNAME - name: LDAP_ADMIN_USERNAME
value: "{{ ldap_admin_user }}" value: "{{ ldap_admin_user }}"
@@ -13,8 +13,10 @@
- pip: - pip:
name: name:
- python-ldap - kubernetes
state: absent virtualenv: "{{ venv }}"
virtualenv_command: "{{ virtualenv_command }}"
virtualenv_site_packages: false
- name: Load test configurations - name: Load test configurations
set_fact: set_fact:
@@ -25,6 +27,8 @@
config: "{{ configs.simple }}" config: "{{ configs.simple }}"
register: result register: result
ignore_errors: true ignore_errors: true
vars:
ansible_python_interpreter: "{{ venv }}/bin/python"
- name: Check that module failed gracefully - name: Check that module failed gracefully
assert: assert:
@@ -32,9 +36,6 @@
- '"Failed to import the required Python library (python-ldap)" in result.msg' - '"Failed to import the required Python library (python-ldap)" in result.msg'
always: always:
- pip:
name:
- python-ldap
- name: Remove temp directory - name: Remove temp directory
file: file:
path: "{{ test_dir }}" path: "{{ test_dir }}"
@@ -68,8 +68,8 @@
assert: assert:
that: that:
- result is changed - result is changed
- admins_group | length > 0 - admins_group
- devs_group | length > 0 - devs_group
- '"jane.smith@ansible.org" in admins_group.users' - '"jane.smith@ansible.org" in admins_group.users'
- '"jim.adams@ansible.org" in devs_group.users' - '"jim.adams@ansible.org" in devs_group.users'
- '"jordanbulls@ansible.org" in devs_group.users' - '"jordanbulls@ansible.org" in devs_group.users'
@@ -89,8 +89,8 @@
assert: assert:
that: that:
- result is changed - result is changed
- admins_group | length > 0 - admins_group
- devs_group | length > 0 - devs_group
- '"jane.smith@ansible.org" in admins_group.users' - '"jane.smith@ansible.org" in admins_group.users'
- '"jim.adams@ansible.org" in devs_group.users' - '"jim.adams@ansible.org" in devs_group.users'
- '"jordanbulls@ansible.org" in devs_group.users' - '"jordanbulls@ansible.org" in devs_group.users'
@@ -110,8 +110,8 @@
assert: assert:
that: that:
- result is changed - result is changed
- admins_group | length > 0 - admins_group
- devs_group | length > 0 - devs_group
- '"cn=Jane,ou=people,ou=rfc2307,"+ldap_root in admins_group.users' - '"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=Jim,ou=people,ou=rfc2307,"+ldap_root in devs_group.users'
- '"cn=Jordan,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: assert:
that: that:
- result is changed - result is changed
- admins_group | length > 0 - admins_group
- devs_group | length > 0 - devs_group
- '"jane.smith@ansible.org" in admins_group.users' - '"jane.smith@ansible.org" in admins_group.users'
- '"jim.adams@ansible.org" in devs_group.users' - '"jim.adams@ansible.org" in devs_group.users'
- '"jordanbulls@ansible.org" in devs_group.users' - '"jordanbulls@ansible.org" in devs_group.users'
@@ -213,6 +213,5 @@
ignore_errors: true ignore_errors: true
when: when:
- registry.public_hostname is not none - registry.public_hostname
- registry.public_hostname | length > 0
- registry.check.reached - registry.check.reached
+4 -1
View File
@@ -66,7 +66,10 @@
tasks: tasks:
- pip: - pip:
name: kubernetes-validate==1.34.1 name: kubernetes-validate==1.12.0
virtualenv: "{{ virtualenv }}"
virtualenv_command: "{{ virtualenv_command }}"
virtualenv_site_packages: no
- import_tasks: tasks/validate_installed.yml - import_tasks: tasks/validate_installed.yml
@@ -9,6 +9,7 @@ import copy
from ansible.module_utils._text import to_native from ansible.module_utils._text import to_native
from ansible.module_utils.parsing.convert_bool import boolean 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 ( from ansible_collections.community.okd.plugins.module_utils.openshift_common import (
AnsibleOpenshiftModule, AnsibleOpenshiftModule,
@@ -105,7 +106,7 @@ class OpenShiftAdmPruneImages(AnsibleOpenshiftModule):
def list_objects(self): def list_objects(self):
result = {} result = {}
for kind, version in ApiConfiguration.items(): for kind, version in iteritems(ApiConfiguration):
namespace = None namespace = None
if self.params.get("namespace") and kind.lower() == "imagestream": if self.params.get("namespace") and kind.lower() == "imagestream":
namespace = self.params.get("namespace") namespace = self.params.get("namespace")
@@ -8,6 +8,7 @@ from datetime import datetime
from ansible_collections.community.okd.plugins.module_utils.openshift_docker_image import ( from ansible_collections.community.okd.plugins.module_utils.openshift_docker_image import (
parse_docker_image_ref, parse_docker_image_ref,
) )
from ansible.module_utils.six import iteritems
def get_image_blobs(image): def get_image_blobs(image):
@@ -118,7 +119,7 @@ class OpenShiftAnalyzeImageStream(object):
"CronJob", "CronJob",
) )
for k, objects in resources.items(): for k, objects in iteritems(resources):
if k not in keys: if k not in keys:
continue continue
for obj in objects: for obj in objects:
@@ -221,7 +222,7 @@ class OpenShiftAnalyzeImageStream(object):
def analyze_refs_from_build_strategy(self, resources): def analyze_refs_from_build_strategy(self, resources):
# Json Path is always spec.strategy # Json Path is always spec.strategy
keys = ("BuildConfig", "Build") keys = ("BuildConfig", "Build")
for k, objects in resources.items(): for k, objects in iteritems(resources):
if k not in keys: if k not in keys:
continue continue
for obj in objects: for obj in objects:
@@ -7,6 +7,7 @@ __metaclass__ = type
import copy import copy
from ansible.module_utils.parsing.convert_bool import boolean 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 ( from ansible_collections.community.okd.plugins.module_utils.openshift_common import (
AnsibleOpenshiftModule, AnsibleOpenshiftModule,
@@ -369,7 +370,7 @@ class OpenShiftImportImage(AnsibleOpenshiftModule):
def execute_module(self): def execute_module(self):
names = [] names = []
name = self.params.get("name") name = self.params.get("name")
if isinstance(name, str): if isinstance(name, string_types):
names.append(name) names.append(name)
elif isinstance(name, list): elif isinstance(name, list):
names = name names = name
+2 -1
View File
@@ -12,6 +12,7 @@ import os
import copy import copy
from ansible.module_utils.parsing.convert_bool import boolean from ansible.module_utils.parsing.convert_bool import boolean
from ansible.module_utils.six import iteritems
try: try:
import ldap import ldap
@@ -45,7 +46,7 @@ def validate_ldap_sync_config(config):
return "could not read ca file: {0}.".format(ca_file) return "could not read ca file: {0}.".format(ca_file)
nameMapping = config.get("groupUIDNameMapping", {}) nameMapping = config.get("groupUIDNameMapping", {})
for k, v in nameMapping.items(): for k, v in iteritems(nameMapping):
if len(k) == 0 or len(v) == 0: if len(k) == 0 or len(v) == 0:
return "groupUIDNameMapping has empty key or value" return "groupUIDNameMapping has empty key or value"
-3
View File
@@ -1,3 +0,0 @@
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
@@ -1,5 +0,0 @@
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,7 +16,6 @@ commands =
[testenv:ansible-lint] [testenv:ansible-lint]
deps = deps =
ansible-lint >= 25.1.2 ansible-lint >= 25.1.2
ansible-core>=2.16.0,<2.19
changedir = {toxinidir} changedir = {toxinidir}
commands = commands =
ansible-lint ansible-lint