Compare commits

..
1 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
52 changed files with 160 additions and 394 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
-9
View File
@@ -1,9 +0,0 @@
.venv
.git
.idea
.cache/
__pycache__/
*.tar.gz
changelogs/.plugin-cache.yaml
tests/output
tests/integration/cloud-config-*
-20
View File
@@ -1,20 +0,0 @@
---
name: Run collection certification checks
permissions:
contents: read
on:
pull_request:
branches: [main]
workflow_dispatch:
concurrency:
group: cert-ver-${{ github.head_ref || github.run_id }}
cancel-in-progress: true
jobs:
call:
uses: ansible-collections/partner-certification-checker/.github/workflows/certification-reusable.yml@v4.1.0 # zizmor: ignore[unpinned-uses]
with:
collection-deps: "kubernetes.core"
+3
View File
@@ -16,3 +16,6 @@ changelogs/.plugin-cache.yaml
# Temporary test files. # Temporary test files.
tests/output tests/output
tests/integration/cloud-config-* tests/integration/cloud-config-*
# Ignore the ansible_collections that the Makefile generates.
ansible_collections
+3 -51
View File
@@ -4,49 +4,6 @@ OKD Collection Release Notes
.. contents:: Topics .. contents:: Topics
v6.0.0
======
Release Summary
---------------
This major release drops support for ansible-core versions below 2.16,
replaces all ``ansible.module_utils.six`` imports with Python 3 stdlib equivalents,
and fixes deprecated ``ansible.module_utils._text`` imports for compatibility
with ansible-core 2.24+.
Minor Changes
-------------
- Add sanity test ignore files for ansible-core 2.20 and 2.21 (https://github.com/openshift/community.okd/pull/286).
- Replace ``ansible.module_utils.six.moves.urllib_parse`` import with Python 3 ``urllib.parse`` in ``openshift_auth`` module (https://github.com/openshift/community.okd/pull/291).
- Replace ``ansible.module_utils.six`` imports (``iteritems``, ``string_types``) with Python 3 stdlib equivalents (https://github.com/openshift/community.okd/pull/286).
- Replace deprecated ``ansible.module_utils._text`` imports with ``ansible.module_utils.common.text.converters`` to fix compatibility with ansible-core 2.24+ (https://github.com/openshift/community.okd/issues/275).
Breaking Changes / Porting Guide
--------------------------------
- Minimum supported version of ansible-core is now 2.16 (https://github.com/openshift/community.okd/pull/292).
v5.0.0
======
Release Summary
---------------
This release drops support for ansible-lint < 25.1.2 and removes deprecated openshift inventory plugin.
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).
Breaking Changes / Porting Guide
--------------------------------
- Remove openshift inventory plugin deprecated in 3.0.0 (https://github.com/openshift/community.okd/pull/252).
v4.0.2 v4.0.2
====== ======
@@ -58,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
====== ======
-64
View File
@@ -1,64 +0,0 @@
# Continuous Integration (CI)
This collection uses two CI systems: **Zuul** for PR validation checks and **Prow** for integration testing.
## Zuul - PR Validation
Zuul runs automated tests on every pull request. The Zuul configuration for this collection is defined in the [ansible/ansible-zuul-jobs](https://github.com/ansible/ansible-zuul-jobs/blob/main/zuul.d/project-templates.yaml) repository under the `ansible-collections-community-okd` template.
### Jobs Run by Zuul
The following jobs run in the `third-party-check` pipeline on every PR:
| Job | Description |
| --- | ----------- |
| `build-ansible-collection` | Builds the collection tarball |
| `ansible-galaxy-importer` | Validates collection structure for Galaxy (non-voting) |
| `ansible-tox-linters` | Runs `black`, `flake8`, and `ansible-lint` via `tox -e linters` (see [tox.ini](tox.ini)) |
| `ansible-test-units-community-okd-python39` | Executes unit tests with Python 3.9 |
**Upstream Sanity Tests:**
- `ansible-test-sanity-docker-devel`
- `ansible-test-sanity-docker-milestone`
- `ansible-test-sanity-docker-stable-2.16`
- `ansible-test-sanity-docker-stable-2.17`
- `ansible-test-sanity-docker-stable-2.18`
**Downstream Sanity Tests** (test the `redhat.openshift` variant):
- `ansible-test-sanity-okd-downstream-devel`
- `ansible-test-sanity-okd-downstream-milestone`
- `ansible-test-sanity-okd-downstream-stable-2.16`
- `ansible-test-sanity-okd-downstream-stable-2.17`
- `ansible-test-sanity-okd-downstream-stable-2.18`
## OpenShift Prow - Integration Testing
Integration tests for community.okd are executed via [OpenShift Prow](https://github.com/kubernetes/test-infra/blob/master/prow/README.md), OpenShift's CI/CD system for testing against live clusters.
### Prow Configuration
The Prow configuration for this collection is maintained in the [openshift/release](https://github.com/openshift/release) repository at `ci-operator/config/openshift/community.okd/openshift-community.okd-main.yaml`.
### Integration Test Workflow
The integration test workflow follows these steps:
1. **Prow builds the test runner image** defined in [ci/Dockerfile](ci/Dockerfile)
- Based on `registry.access.redhat.com/ubi9/ubi`
- Includes Python 3.12, ansible-core, molecule, kubernetes client, and OKD CLI tools
2. **Prow executes `make test-integration-incluster`**
- This runs [ci/incluster_integration.sh](ci/incluster_integration.sh)
3. **The script spawns a Kubernetes Job** that runs `make test-integration` using the previously built image
- Job runs with cluster-admin permissions
- 30-minute timeout
- Backoff limit of 2 retries
4. **`make test-integration` runs both upstream and downstream tests:**
- **Upstream tests** (`upstream-test-integration`): Runs molecule tests for `community.okd` collection
- **Downstream tests** (`downstream-test-integration`): Runs `ci/downstream.sh -i` to convert the collection to `redhat.openshift` and test the downstream variant
### Test Framework
Integration tests use the Molecule framework and require a live OpenShift or Kubernetes cluster (>=1.24). Tests are located in the `molecule/default/` directory and cover check mode, creation, idempotency, modification, and deletion scenarios.
+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 = 7.0.0-dev0 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 -10
View File
@@ -1,19 +1,11 @@
aliases: aliases:
community.okd-approvers: community.okd-approvers:
- gravesm
- jillr - jillr
- GomathiselviS
- alinabuzachis - alinabuzachis
- abikouo - abikouo
- beeankha
- mandar242
- oraNod
- brahmanim
community.okd-reviewers: community.okd-reviewers:
- gravesm
- jillr - jillr
- GomathiselviS
- alinabuzachis - alinabuzachis
- abikouo - abikouo
- beeankha
- mandar242
- oraNod
- brahmanim
+47 -82
View File
@@ -3,7 +3,6 @@
This repo hosts the `community.okd` Ansible Collection. This repo hosts the `community.okd` Ansible Collection.
## Description ## Description
The collection includes a variety of Ansible content to help automate the management of applications in OKD clusters, as well as the provisioning and maintenance of clusters themselves. The collection includes a variety of Ansible content to help automate the management of applications in OKD clusters, as well as the provisioning and maintenance of clusters themselves.
<!--- STARTREMOVE ---> <!--- STARTREMOVE --->
@@ -22,26 +21,43 @@ The collection includes a variety of Ansible content to help automate the manage
For more information about communication, see the [Ansible communication guide](https://docs.ansible.com/ansible/devel/community/communication.html). For more information about communication, see the [Ansible communication guide](https://docs.ansible.com/ansible/devel/community/communication.html).
## Included content ## Requirements
<!--start requires_ansible-->
### Ansible version compatibility
This collection has been tested against following Ansible versions: **>=2.15.0**.
Please ensure to update the `network_os` to use the fully qualified collection name (for example, `cisco.ios.ios`).
Plugins and modules within a collection may be tested with only specific Ansible versions.
A collection may contain metadata that identifies these versions.
PEP440 is the schema used to describe the versions of Ansible.
<!--end requires_ansible-->
### Python Support
* Collection supports 3.9+
### Kubernetes Version Support
This collection supports Kubernetes versions >=1.24.
### Included content
Click on the name of a plugin or module to view that content's documentation: Click on the name of a plugin or module to view that content's documentation:
<!--start collection content--> <!--start collection content-->
#### Connection plugins
### Connection plugins
Name | Description Name | Description
--- | --- --- | ---
[community.okd.oc](https://github.com/openshift/community.okd/blob/main/docs/community.okd.oc_connection.rst)|Execute tasks in pods running on OpenShift. [community.okd.oc](https://github.com/openshift/community.okd/blob/main/docs/community.okd.oc_connection.rst)|Execute tasks in pods running on OpenShift.
### Inventory plugins #### Inventory plugins
Name | Description Name | Description
--- | --- --- | ---
[community.okd.openshift](https://github.com/openshift/community.okd/blob/main/docs/community.okd.openshift_inventory.rst)|OpenShift inventory source [community.okd.openshift](https://github.com/openshift/community.okd/blob/main/docs/community.okd.openshift_inventory.rst)|OpenShift inventory source
### Modules #### Modules
Name | Description Name | Description
--- | --- --- | ---
[community.okd.k8s](https://github.com/openshift/community.okd/blob/main/docs/community.okd.k8s_module.rst)|Manage OpenShift objects [community.okd.k8s](https://github.com/openshift/community.okd/blob/main/docs/community.okd.k8s_module.rst)|Manage OpenShift objects
@@ -62,49 +78,13 @@ Name | Description
<!--- ENDREMOVE ---> <!--- ENDREMOVE --->
## Requirements
<!--start requires_ansible-->
### Ansible version compatibility
This collection has been tested against following Ansible versions: **>=2.16.0**.
Plugins and modules within a collection may be tested with only specific Ansible versions.
A collection may contain metadata that identifies these versions.
PEP440 is the schema used to describe the versions of Ansible.
<!--end requires_ansible-->
### Python version compatibility
This collection requires Python 3.9 or later.
### Python dependencies
The following Python packages are required:
* [kubernetes](https://pypi.org/project/kubernetes/) >= 12.0.0
* [requests-oauthlib](https://pypi.org/project/requests-oauthlib/)
### Kubernetes version compatibility
This collection supports Kubernetes versions >= 1.24.
### Collection dependencies
This collection requires the following Ansible collections:
* [kubernetes.core](https://galaxy.ansible.com/ui/repo/published/kubernetes/core/) >= 3.0.0
## Installation ## Installation
### Installing the Collection from Ansible Galaxy ### Installing the Collection from Ansible Galaxy
Before using the OKD collection, you need to install it with the Ansible Galaxy CLI: Before using the OKD collection, you need to install it with the Ansible Galaxy CLI:
```bash
ansible-galaxy collection install community.okd ansible-galaxy collection install community.okd
```
You can also include it in a `requirements.yml` file and install it via `ansible-galaxy collection install -r requirements.yml`, using the format: You can also include it in a `requirements.yml` file and install it via `ansible-galaxy collection install -r requirements.yml`, using the format:
@@ -112,32 +92,27 @@ You can also include it in a `requirements.yml` file and install it via `ansible
--- ---
collections: collections:
- name: community.okd - name: community.okd
version: 6.0.0 version: 4.0.2
``` ```
### Installing the Kubernetes Python Library ### Installing the Kubernetes Python Library
Content in this collection requires the [Kubernetes Python client](https://pypi.org/project/kubernetes/) to interact with Kubernetes' APIs. You can install it with: Content in this collection requires the [Kubernetes Python client](https://pypi.org/project/kubernetes/) to interact with Kubernetes' APIs. You can install it with:
```bash
pip3 install kubernetes pip3 install kubernetes
```
## Use Cases ## Use Cases
### Using modules from the OKD Collection in your playbooks ### Using modules from the OKD Collection in your playbooks
It's preferable to use content in this collection using their Fully Qualified Collection Namespace (FQCN), for example `community.okd.openshift_route`: It's preferable to use content in this collection using their Fully Qualified Collection Namespace (FQCN), for example `community.okd.openshift`:
```yaml ```yaml
--- ---
- hosts: localhost plugin: community.okd.openshift
tasks: connections:
- name: Expose a Service as an OpenShift Route - namespaces:
community.okd.openshift_route: - testing
service: frontend
namespace: testing
state: present
``` ```
For documentation on how to use individual plugins included in this collection, please see the links in the 'Included content' section earlier in this README. For documentation on how to use individual plugins included in this collection, please see the links in the 'Included content' section earlier in this README.
@@ -158,7 +133,6 @@ The `community.okd` collection supports Ansible Turbo mode as a tech preview via
Please read more about Ansible Turbo mode - [here](https://github.com/ansible-collections/community.okd/blob/main/docs/ansible_turbo_mode.rst). Please read more about Ansible Turbo mode - [here](https://github.com/ansible-collections/community.okd/blob/main/docs/ansible_turbo_mode.rst).
<!--- STARTREMOVE ---> <!--- STARTREMOVE --->
## Contributing to the collection ## Contributing to the collection
If you want to develop new content for this collection or improve what's already here, the easiest way to work on the collection is to clone it into one of the configured [`COLLECTIONS_PATHS`](https://docs.ansible.com/ansible/latest/reference_appendices/config.html#collections-paths), and work on it there. If you want to develop new content for this collection or improve what's already here, the easiest way to work on the collection is to clone it into one of the configured [`COLLECTIONS_PATHS`](https://docs.ansible.com/ansible/latest/reference_appendices/config.html#collections-paths), and work on it there.
@@ -171,19 +145,16 @@ The `tests` directory contains configuration for running sanity tests using [`an
You can run the `ansible-test` sanity tests with the command: You can run the `ansible-test` sanity tests with the command:
```bash
make test-sanity make test-sanity
```
The `molecule` directory contains configuration for running integration tests using [`molecule`](https://molecule.readthedocs.io/). The `molecule` directory contains configuration for running integration tests using [`molecule`](https://molecule.readthedocs.io/).
You can run the `molecule` integration tests with the command: You can run the `molecule` integration tests with the command:
```bash
make test-integration make test-integration
```
These commands will create a directory called `ansible_collections` which should not be committed or added to the `.gitignore` (Tracking issue: <https://github.com/ansible/ansible/issues/68499>) These commands will create a directory called `ansible_collections` which should not be committed or added to the `.gitignore` (Tracking issue: https://github.com/ansible/ansible/issues/68499)
### Prow ### Prow
@@ -193,17 +164,13 @@ The configuration for the CI jobs that this repository runs can be found in the
The [Prow CI integration test job](https://github.com/openshift/release/blob/master/ci-operator/config/openshift/community.okd/openshift-community.okd-main.yaml#L40-L43) The [Prow CI integration test job](https://github.com/openshift/release/blob/master/ci-operator/config/openshift/community.okd/openshift-community.okd-main.yaml#L40-L43)
runs the command: runs the command:
```bash
make test-integration-incluster make test-integration-incluster
```
which will create a job that runs the normal `make integration` target. In order to mimic the Prow CI job, you must which will create a job that runs the normal `make integration` target. In order to mimic the Prow CI job, you must
first build the test image using the Dockerfile in [`ci/Dockerfile`](ci/Dockerfile). Then, push the image first build the test image using the Dockerfile in [`ci/Dockerfile`](ci/Dockerfile). Then, push the image
somewhere that it will be accessible to the cluster, and run somewhere that it will be accessible to the cluster, and run
```bash
IMAGE_FORMAT=<your image> make test-integration-incluser IMAGE_FORMAT=<your image> make test-integration-incluser
```
where the `IMAGE_FORMAT` environment variable is the full reference to your container (ie, `IMAGE_FORMAT=quay.io/example/molecule-test-runner`) where the `IMAGE_FORMAT` environment variable is the full reference to your container (ie, `IMAGE_FORMAT=quay.io/example/molecule-test-runner`)
@@ -212,15 +179,15 @@ where the `IMAGE_FORMAT` environment variable is the full reference to your cont
Releases are automatically built and pushed to Ansible Galaxy for any new tag. Before tagging a release, make sure to do the following: Releases are automatically built and pushed to Ansible Galaxy for any new tag. Before tagging a release, make sure to do the following:
1. Update the version in the following places: 1. Update the version in the following places:
* The `version` in `galaxy.yml` * a. The `version` in `galaxy.yml`
* This README's `requirements.yml` example * b. This README's `requirements.yml` example
* The `DOWNSTREAM_VERSION` in `ci/downstream.sh` * c. The `DOWNSTREAM_VERSION` in `ci/downstream.sh`
* The `VERSION` in `Makefile` * d. The `VERSION` in `Makefile`
* The version in `requirements.yml` * e. The version in `requirements.yml`
2. Update the CHANGELOG: 2. Update the CHANGELOG:
* Make sure you have [`antsibull-changelog`](https://pypi.org/project/antsibull-changelog/) installed. * 1. Make sure you have [`antsibull-changelog`](https://pypi.org/project/antsibull-changelog/) installed.
* Make sure there are fragments for all known changes in `changelogs/fragments`. * 2. Make sure there are fragments for all known changes in `changelogs/fragments`.
* Run `antsibull-changelog release`. * 3. Run `antsibull-changelog release`.
3. Commit the changes and create a PR with the changes. Wait for tests to pass, then merge it once they have. 3. Commit the changes and create a PR with the changes. Wait for tests to pass, then merge it once they have.
4. Tag the version in Git and push to GitHub. 4. Tag the version in Git and push to GitHub.
@@ -229,20 +196,18 @@ After the version is published, verify it exists on the [OKD Collection Galaxy p
## Support ## Support
This collection is maintained by Red Hat.
As Red Hat Ansible Certified Content, this collection is entitled to support through Ansible Automation Platform (AAP) using the **Create issue** button on the top right corner.
If a support case cannot be opened with Red Hat and the collection has been obtained either from Galaxy or GitHub, there may be community help available on the [Ansible Forum](https://forum.ansible.com/).
<!--List available communication channels. In addition to channels specific to your collection, we also recommend to use the following ones.--> <!--List available communication channels. In addition to channels specific to your collection, we also recommend to use the following ones.-->
We announce releases and important changes through Ansible's [Bullhorn newsletter](https://forum.ansible.com/c/news/bullhorn/17). We announce releases and important changes through Ansible's [The Bullhorn newsletter](https://github.com/ansible/community/wiki/News#the-bullhorn). Be sure you are [subscribed](https://eepurl.com/gZmiEP).
We take part in the global quarterly [Ansible Contributor Summit](https://github.com/ansible/community/wiki/Contributor-Summit) virtually or in-person. Track [The Bullhorn newsletter](https://eepurl.com/gZmiEP) and join us.
For more information about communication, refer to the [Ansible Communication guide](https://docs.ansible.com/ansible/devel/community/communication.html). For more information about communication, refer to the [Ansible Communication guide](https://docs.ansible.com/ansible/devel/community/communication.html).
For the latest supported versions, refer to the release notes below. For the latest supported versions, refer to the release notes below.
If you encounter issues or have questions, you can report bugs, request features, or ask questions by opening an issue in the [GitHub repository](https://github.com/openshift/community.okd/). If you encounter issues or have questions, you can submit a support request through the following channels:
- GitHub Issues: Report bugs, request features, or ask questions by opening an issue in the [GitHub repository](https://github.com/openshift/community.okd/).
## Release notes ## Release notes
@@ -262,4 +227,4 @@ If you encounter abusive behavior, please refer to the [policy violations](https
GNU General Public License v3.0 or later GNU General Public License v3.0 or later
See LICENSE to see the full text. See LICENCE to see the full text.
+2 -47
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,48 +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'
6.0.0:
changes:
breaking_changes:
- Minimum supported version of ansible-core is now 2.16 (https://github.com/openshift/community.okd/pull/292).
minor_changes:
- Add sanity test ignore files for ansible-core 2.20 and 2.21 (https://github.com/openshift/community.okd/pull/286).
- Replace ``ansible.module_utils.six.moves.urllib_parse`` import with Python
3 ``urllib.parse`` in ``openshift_auth`` module (https://github.com/openshift/community.okd/pull/291).
- Replace ``ansible.module_utils.six`` imports (``iteritems``, ``string_types``)
with Python 3 stdlib equivalents (https://github.com/openshift/community.okd/pull/286).
- Replace deprecated ``ansible.module_utils._text`` imports with ``ansible.module_utils.common.text.converters``
to fix compatibility with ansible-core 2.24+ (https://github.com/openshift/community.okd/issues/275).
release_summary: 'This major release drops support for ansible-core versions
below 2.16,
replaces all ``ansible.module_utils.six`` imports with Python 3 stdlib equivalents,
and fixes deprecated ``ansible.module_utils._text`` imports for compatibility
with ansible-core 2.24+.
'
fragments:
- 187-lowercase-booleans.yml
- 286-replace-six-imports.yml
- 292-bump-min-ansible-core.yml
- fix-deprecated-text-imports.yml
- replace-six-urllib-parse.yml
- v6.0.0-release-summary.yml
release_date: '2026-08-12'
@@ -0,0 +1,3 @@
---
minor_changes:
- Bump version of ansible-lint to minimum 24.7.0 (https://github.com/openshift/community.okd/pull/240).
@@ -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
+3 -8
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="7.0.0-dev0" 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=""
@@ -41,7 +41,7 @@ f_text_sub()
sed -i.bak "s/Ansible Galaxy/Automation Hub/" "${_build_dir}/README.md" sed -i.bak "s/Ansible Galaxy/Automation Hub/" "${_build_dir}/README.md"
sed -i.bak "s/community-okd/redhat-openshift/" "${_build_dir}/Makefile" sed -i.bak "s/community-okd/redhat-openshift/" "${_build_dir}/Makefile"
sed -i.bak "s/community\/okd/redhat\/openshift/" "${_build_dir}/Makefile" sed -i.bak "s/community\/okd/redhat\/openshift/" "${_build_dir}/Makefile"
sed -i.bak "s/^VERSION = .*$/VERSION = ${DOWNSTREAM_VERSION}/" "${_build_dir}/Makefile" sed -i.bak "s/^VERSION\:/VERSION: ${DOWNSTREAM_VERSION}/" "${_build_dir}/Makefile"
sed -i.bak "s/name\:.*$/name: openshift/" "${_build_dir}/galaxy.yml" sed -i.bak "s/name\:.*$/name: openshift/" "${_build_dir}/galaxy.yml"
sed -i.bak "s/namespace\:.*$/namespace: redhat/" "${_build_dir}/galaxy.yml" sed -i.bak "s/namespace\:.*$/namespace: redhat/" "${_build_dir}/galaxy.yml"
sed -i.bak "s/Kubernetes/OpenShift/g" "${_build_dir}/galaxy.yml" sed -i.bak "s/Kubernetes/OpenShift/g" "${_build_dir}/galaxy.yml"
@@ -51,11 +51,6 @@ f_text_sub()
find "${_build_dir}" -type f ! -name galaxy.yml -exec sed -i.bak "s/community\.okd/redhat\.openshift/g" {} \; find "${_build_dir}" -type f ! -name galaxy.yml -exec sed -i.bak "s/community\.okd/redhat\.openshift/g" {} \;
find "${_build_dir}" -type f ! -name galaxy.yml -exec sed -i.bak "s/group\/redhat\.openshift\.okd/redhat\.openshift\.openshift/g" {} \; find "${_build_dir}" -type f ! -name galaxy.yml -exec sed -i.bak "s/group\/redhat\.openshift\.okd/redhat\.openshift\.openshift/g" {} \;
# Restore GitHub repository URLs in the README
sed -i.bak "s|github\.com/openshift/redhat\.openshift|github.com/openshift/community.okd|g" "${_build_dir}/README.md"
sed -i.bak "s|github\.com/ansible-collections/redhat\.openshift|github.com/ansible-collections/community.okd|g" "${_build_dir}/README.md"
find "${_build_dir}" -type f -name "*.bak" -delete find "${_build_dir}" -type f -name "*.bak" -delete
} }
@@ -69,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
@@ -83,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 -2
View File
@@ -14,7 +14,6 @@ license_file: LICENSE
name: okd name: okd
namespace: community namespace: community
readme: README.md readme: README.md
# The downstream redhat.openshift collection is built from the community.okd repository.
repository: https://github.com/openshift/community.okd repository: https://github.com/openshift/community.okd
tags: tags:
- kubernetes - kubernetes
@@ -25,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: 7.0.0-dev0 version: 6.0.0-dev0
+1 -1
View File
@@ -1,5 +1,5 @@
--- ---
requires_ansible: '>=2.16.0' requires_ansible: '>=2.15.0'
action_groups: action_groups:
okd: okd:
- k8s - k8s
+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
+7 -3
View File
@@ -65,16 +65,20 @@
ansible_python_interpreter: '{{ virtualenv_interpreter }}' ansible_python_interpreter: '{{ virtualenv_interpreter }}'
tasks: tasks:
# No explicit `virtualenv:` param is necessary with the following pip tasks.
# prepare.yml creates the venv and ansible_python_interpreter sets it.
- pip: - pip:
name: kubernetes-validate==1.35.0 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
- pip: - pip:
name: kubernetes-validate name: kubernetes-validate
state: absent state: absent
virtualenv: "{{ virtualenv }}"
virtualenv_command: "{{ virtualenv_command }}"
virtualenv_site_packages: no
- import_tasks: tasks/validate_not_installed.yml - import_tasks: tasks/validate_not_installed.yml
+1 -1
View File
@@ -21,7 +21,7 @@ try:
except ImportError: except ImportError:
pass pass
from ansible.module_utils.common.text.converters import to_native from ansible.module_utils._text import to_native
try: try:
from kubernetes.dynamic.exceptions import ( from kubernetes.dynamic.exceptions import (
@@ -4,7 +4,7 @@ from __future__ import absolute_import, division, print_function
__metaclass__ = type __metaclass__ = type
from ansible.module_utils.common.text.converters import to_native from ansible.module_utils._text import to_native
from ansible_collections.community.okd.plugins.module_utils.openshift_common import ( from ansible_collections.community.okd.plugins.module_utils.openshift_common import (
AnsibleOpenshiftModule, AnsibleOpenshiftModule,
@@ -6,7 +6,7 @@ __metaclass__ = type
from datetime import datetime, timezone from datetime import datetime, timezone
from ansible.module_utils.common.text.converters import to_native from ansible.module_utils._text import to_native
from ansible_collections.community.okd.plugins.module_utils.openshift_common import ( from ansible_collections.community.okd.plugins.module_utils.openshift_common import (
AnsibleOpenshiftModule, AnsibleOpenshiftModule,
@@ -7,8 +7,9 @@ __metaclass__ = type
from datetime import datetime, timezone, timedelta from datetime import datetime, timezone, timedelta
import copy import copy
from ansible.module_utils.common.text.converters 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")
+1 -1
View File
@@ -7,7 +7,7 @@ __metaclass__ = type
from datetime import datetime, timezone, timedelta from datetime import datetime, timezone, timedelta
import time import time
from ansible.module_utils.common.text.converters import to_native from ansible.module_utils._text import to_native
from ansible_collections.community.okd.plugins.module_utils.openshift_common import ( from ansible_collections.community.okd.plugins.module_utils.openshift_common import (
AnsibleOpenshiftModule, AnsibleOpenshiftModule,
+1 -1
View File
@@ -7,7 +7,7 @@ __metaclass__ = type
import traceback import traceback
from abc import abstractmethod from abc import abstractmethod
from ansible.module_utils.common.text.converters import to_native from ansible.module_utils._text import to_native
try: try:
from ansible_collections.kubernetes.core.plugins.module_utils.k8s.client import ( from ansible_collections.kubernetes.core.plugins.module_utils.k8s.client import (
+1 -1
View File
@@ -11,7 +11,7 @@ __metaclass__ = type
from datetime import datetime from datetime import datetime
from ansible.module_utils.parsing.convert_bool import boolean from ansible.module_utils.parsing.convert_bool import boolean
from ansible.module_utils.common.text.converters import to_native from ansible.module_utils._text import to_native
from ansible.module_utils.basic import missing_required_lib from ansible.module_utils.basic import missing_required_lib
from ansible_collections.community.okd.plugins.module_utils.openshift_ldap import ( from ansible_collections.community.okd.plugins.module_utils.openshift_ldap import (
@@ -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"
+1 -1
View File
@@ -6,7 +6,7 @@ __metaclass__ = type
import os import os
from ansible.module_utils.common.text.converters import to_native from ansible.module_utils._text import to_native
from ansible_collections.community.okd.plugins.module_utils.openshift_common import ( from ansible_collections.community.okd.plugins.module_utils.openshift_common import (
AnsibleOpenshiftModule, AnsibleOpenshiftModule,
+2 -2
View File
@@ -83,7 +83,7 @@ options:
type: str type: str
strict: strict:
description: whether to fail when passing unexpected properties description: whether to fail when passing unexpected properties
default: true default: True
type: bool type: bool
type: dict type: dict
append_hash: append_hash:
@@ -134,7 +134,7 @@ options:
- Whether to continue on creation/deletion errors when multiple resources are defined. - Whether to continue on creation/deletion errors when multiple resources are defined.
- This has no effect on the validation step which is controlled by the C(validate.fail_on_error) parameter. - This has no effect on the validation step which is controlled by the C(validate.fail_on_error) parameter.
type: bool type: bool
default: false default: False
version_added: 2.0.0 version_added: 2.0.0
requirements: requirements:
+1 -1
View File
@@ -51,7 +51,7 @@ options:
aliases: aliases:
- config - config
- src - src
required: true required: True
deny_groups: deny_groups:
description: description:
- Denied groups, could be openshift group name or LDAP group dn value. - Denied groups, could be openshift group name or LDAP group dn value.
@@ -233,7 +233,7 @@ result:
""" """
# ENDREMOVE (downstream) # ENDREMOVE (downstream)
from ansible.module_utils.common.text.converters import to_native from ansible.module_utils._text import to_native
from ansible_collections.community.okd.plugins.module_utils.openshift_common import ( from ansible_collections.community.okd.plugins.module_utils.openshift_common import (
AnsibleOpenshiftModule, AnsibleOpenshiftModule,
+1 -1
View File
@@ -37,7 +37,7 @@ options:
- users - users
- groups - groups
type: str type: str
required: true required: True
name: name:
description: description:
- Use to specify an object name to remove. - Use to specify an object name to remove.
@@ -41,7 +41,7 @@ options:
- If C(true), prune all builds whose associated BuildConfig no longer exists and whose status is - If C(true), prune all builds whose associated BuildConfig no longer exists and whose status is
complete, failed, error, or cancelled. complete, failed, error, or cancelled.
type: bool type: bool
default: false default: False
requirements: requirements:
- python >= 3.6 - python >= 3.6
@@ -41,7 +41,7 @@ options:
- If C(true), prune all deployments where the associated DeploymentConfig no longer exists, - If C(true), prune all deployments where the associated DeploymentConfig no longer exists,
the status is complete or failed, and the replica size is C(0). the status is complete or failed, and the replica size is C(0).
type: bool type: bool
default: false default: False
requirements: requirements:
- python >= 3.6 - python >= 3.6
@@ -40,7 +40,7 @@ options:
- Include images that were imported from external registries as candidates for pruning. - Include images that were imported from external registries as candidates for pruning.
- If pruned, all the mirrored objects associated with them will also be removed from the integrated registry. - If pruned, all the mirrored objects associated with them will also be removed from the integrated registry.
type: bool type: bool
default: true default: True
keep_younger_than: keep_younger_than:
description: description:
- Specify the minimum age (in minutes) of an image and its referrers for it to be considered a candidate for pruning. - Specify the minimum age (in minutes) of an image and its referrers for it to be considered a candidate for pruning.
@@ -50,7 +50,7 @@ options:
- Specify if images which are exceeding LimitRanges specified in the same namespace, - Specify if images which are exceeding LimitRanges specified in the same namespace,
should be considered for pruning. should be considered for pruning.
type: bool type: bool
default: false default: False
registry_url: registry_url:
description: description:
- The address to use when contacting the registry, instead of using the default value. - The address to use when contacting the registry, instead of using the default value.
@@ -70,17 +70,17 @@ options:
type: bool type: bool
prune_registry: prune_registry:
description: description:
- If set to I(false), the prune operation will clean up image API objects, but - If set to I(False), the prune operation will clean up image API objects, but
none of the associated content in the registry is removed. none of the associated content in the registry is removed.
type: bool type: bool
default: true default: True
ignore_invalid_refs: ignore_invalid_refs:
description: description:
- If set to I(true), the pruning process will ignore all errors while parsing image references. - If set to I(True), the pruning process will ignore all errors while parsing image references.
- This means that the pruning process will ignore the intended connection between the object and the referenced image. - This means that the pruning process will ignore the intended connection between the object and the referenced image.
- As a result an image may be incorrectly deleted as unused. - As a result an image may be incorrectly deleted as unused.
type: bool type: bool
default: false default: False
requirements: requirements:
- python >= 3.6 - python >= 3.6
- kubernetes >= 12.0.0 - kubernetes >= 12.0.0
+2 -1
View File
@@ -174,7 +174,8 @@ k8s_auth:
import traceback import traceback
from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.basic import AnsibleModule
from urllib.parse import urlparse, parse_qs, urlencode, urljoin from ansible.module_utils.six.moves.urllib_parse import urlparse, parse_qs, urlencode
from urllib.parse import urljoin
from base64 import urlsafe_b64encode from base64 import urlsafe_b64encode
import hashlib import hashlib
+2 -2
View File
@@ -55,7 +55,7 @@ options:
description: description:
- Specify the namespace for the build or the build config. - Specify the namespace for the build or the build config.
type: str type: str
required: true required: True
build_args: build_args:
description: description:
- Specify a list of key-value pair to pass to Docker during the build. - Specify a list of key-value pair to pass to Docker during the build.
@@ -106,7 +106,7 @@ options:
- When C(state=started), specify whether to wait for a build to complete - When C(state=started), specify whether to wait for a build to complete
and exit with a non-zero return code if the build fails. and exit with a non-zero return code if the build fails.
- When I(state=cancelled), specify whether to wait for a build phase to be Cancelled. - When I(state=cancelled), specify whether to wait for a build phase to be Cancelled.
default: false default: False
type: bool type: bool
wait_sleep: wait_sleep:
description: description:
+4 -4
View File
@@ -36,18 +36,18 @@ options:
description: description:
- Use to specify namespace for image stream to create/update. - Use to specify namespace for image stream to create/update.
type: str type: str
required: true required: True
name: name:
description: description:
- Image stream to import tag into. - Image stream to import tag into.
- This can be provided as a list of images streams or a single value. - This can be provided as a list of images streams or a single value.
type: raw type: raw
required: true required: True
all: all:
description: description:
- If set to I(true), import all tags from the provided source on creation or if C(source) is specified. - If set to I(true), import all tags from the provided source on creation or if C(source) is specified.
type: bool type: bool
default: false default: False
validate_registry_certs: validate_registry_certs:
description: description:
- If set to I(true), allow importing from registries that have invalid HTTPS certificates. - If set to I(true), allow importing from registries that have invalid HTTPS certificates.
@@ -65,7 +65,7 @@ options:
description: description:
- Set each imported Docker image to be periodically imported from a remote repository. - Set each imported Docker image to be periodically imported from a remote repository.
type: bool type: bool
default: false default: False
source: source:
description: description:
- A Docker image repository to import images from. - A Docker image repository to import images from.
+1 -1
View File
@@ -35,7 +35,7 @@ options:
description: description:
- Attempt to contact the integrated registry using local client. - Attempt to contact the integrated registry using local client.
type: bool type: bool
default: false default: False
requirements: requirements:
- python >= 3.6 - python >= 3.6
+1 -1
View File
@@ -308,7 +308,7 @@ duration:
import copy import copy
from ansible.module_utils.common.text.converters import to_native from ansible.module_utils._text import to_native
from ansible_collections.community.okd.plugins.module_utils.openshift_common import ( from ansible_collections.community.okd.plugins.module_utils.openshift_common import (
AnsibleOpenshiftModule, AnsibleOpenshiftModule,
-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