mirror of
https://github.com/openshift/community.okd.git
synced 2026-11-22 07:00:26 +00:00
Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c196ccd867 |
@@ -1,15 +0,0 @@
|
||||
---
|
||||
|
||||
profile: production
|
||||
|
||||
exclude_paths:
|
||||
- tests/unit
|
||||
- tests/sanity
|
||||
- molecule
|
||||
- changelogs
|
||||
- docs
|
||||
- .ansible
|
||||
- .github
|
||||
|
||||
warn_list:
|
||||
- no-log-password
|
||||
@@ -0,0 +1,5 @@
|
||||
---
|
||||
profile: production
|
||||
exclude_paths:
|
||||
- molecule
|
||||
- tests/sanity
|
||||
@@ -1,9 +0,0 @@
|
||||
.venv
|
||||
.git
|
||||
.idea
|
||||
.cache/
|
||||
__pycache__/
|
||||
*.tar.gz
|
||||
changelogs/.plugin-cache.yaml
|
||||
tests/output
|
||||
tests/integration/cloud-config-*
|
||||
@@ -16,3 +16,6 @@ changelogs/.plugin-cache.yaml
|
||||
# Temporary test files.
|
||||
tests/output
|
||||
tests/integration/cloud-config-*
|
||||
|
||||
# Ignore the ansible_collections that the Makefile generates.
|
||||
ansible_collections
|
||||
|
||||
+3
-51
@@ -4,49 +4,6 @@ OKD Collection Release Notes
|
||||
|
||||
.. 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
|
||||
======
|
||||
|
||||
@@ -58,15 +15,10 @@ This patch updates the k8s dependency version to the 5.x range and modifies test
|
||||
v4.0.1
|
||||
======
|
||||
|
||||
Release Summary
|
||||
---------------
|
||||
Bugfixes
|
||||
--------
|
||||
|
||||
This is a bug fix release
|
||||
|
||||
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).
|
||||
- openshift_auth - fix issue where openshift_auth module sometimes does not delete the auth token (https://github.com/openshift/community.okd/pull/242)
|
||||
|
||||
v4.0.0
|
||||
======
|
||||
|
||||
@@ -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,7 +1,7 @@
|
||||
.PHONY: molecule
|
||||
|
||||
# Also needs to be updated in galaxy.yml
|
||||
VERSION = 6.0.0
|
||||
VERSION = 6.0.0-dev0
|
||||
|
||||
SANITY_TEST_ARGS ?= --docker --color
|
||||
UNITS_TEST_ARGS ?= --docker --color
|
||||
|
||||
+2
-10
@@ -1,19 +1,11 @@
|
||||
aliases:
|
||||
community.okd-approvers:
|
||||
- gravesm
|
||||
- jillr
|
||||
- GomathiselviS
|
||||
- alinabuzachis
|
||||
- abikouo
|
||||
- beeankha
|
||||
- mandar242
|
||||
- oraNod
|
||||
- brahmanim
|
||||
community.okd-reviewers:
|
||||
- gravesm
|
||||
- jillr
|
||||
- GomathiselviS
|
||||
- alinabuzachis
|
||||
- abikouo
|
||||
- beeankha
|
||||
- mandar242
|
||||
- oraNod
|
||||
- brahmanim
|
||||
|
||||
@@ -26,7 +26,7 @@ For more information about communication, see the [Ansible communication guide](
|
||||
<!--start requires_ansible-->
|
||||
### Ansible version compatibility
|
||||
|
||||
This collection has been tested against following Ansible versions: **>=2.16.0**.
|
||||
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.
|
||||
@@ -92,7 +92,7 @@ You can also include it in a `requirements.yml` file and install it via `ansible
|
||||
---
|
||||
collections:
|
||||
- name: community.okd
|
||||
version: 5.0.0
|
||||
version: 4.0.2
|
||||
```
|
||||
|
||||
### Installing the Kubernetes Python Library
|
||||
|
||||
@@ -244,8 +244,8 @@ releases:
|
||||
4.0.1:
|
||||
changes:
|
||||
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).
|
||||
- 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).
|
||||
release_summary: This is a bug fix release
|
||||
fragments:
|
||||
- 242-fix-failed-token-deletion.yml
|
||||
@@ -257,48 +257,3 @@ releases:
|
||||
fragments:
|
||||
- 4.0.2.yml
|
||||
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-17'
|
||||
|
||||
@@ -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
@@ -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.12
|
||||
DOWNSTREAM_BUILD_PYTHON=python3.9
|
||||
|
||||
RUN yum install -y \
|
||||
glibc-langpack-en \
|
||||
git \
|
||||
make \
|
||||
python3.12 \
|
||||
python3.12-devel \
|
||||
python3.12-pip \
|
||||
python3.12-setuptools \
|
||||
python3 \
|
||||
python3-devel \
|
||||
python3-pip \
|
||||
python3-setuptools \
|
||||
gcc \
|
||||
openldap-devel \
|
||||
&& python3.12 -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 --upgrade setuptools pip \
|
||||
&& python3.9 -m pip install --no-cache-dir \
|
||||
kubernetes \
|
||||
"ansible-core" \
|
||||
"molecule" \
|
||||
&& yum clean all \
|
||||
&& 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?
|
||||
|
||||
COPY . /opt/ansible
|
||||
|
||||
+3
-3
@@ -9,7 +9,7 @@
|
||||
# - All functions are prefixed with f_ so it's obvious where they come
|
||||
# from when in use throughout the script
|
||||
|
||||
DOWNSTREAM_VERSION="6.0.0"
|
||||
DOWNSTREAM_VERSION="6.0.0-dev0"
|
||||
KEEP_DOWNSTREAM_TMPDIR="${KEEP_DOWNSTREAM_TMPDIR:-''}"
|
||||
INSTALL_DOWNSTREAM_COLLECTION_PATH="${INSTALL_DOWNSTREAM_COLLECTION_PATH:-}"
|
||||
_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/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/namespace\:.*$/namespace: redhat/" "${_build_dir}/galaxy.yml"
|
||||
sed -i.bak "s/Kubernetes/OpenShift/g" "${_build_dir}/galaxy.yml"
|
||||
@@ -64,7 +64,6 @@ f_prep()
|
||||
# Files to copy downstream (relative repo root dir path)
|
||||
_file_manifest=(
|
||||
.gitignore
|
||||
.ansible-lint
|
||||
CHANGELOG.rst
|
||||
galaxy.yml
|
||||
LICENSE
|
||||
@@ -78,6 +77,7 @@ f_prep()
|
||||
|
||||
# Directories to recursively copy downstream (relative repo root dir path)
|
||||
_dir_manifest=(
|
||||
.config
|
||||
changelogs
|
||||
ci
|
||||
meta
|
||||
|
||||
+1
-1
@@ -24,4 +24,4 @@ tags:
|
||||
- okd
|
||||
- cluster
|
||||
# Also needs to be updated in the Makefile
|
||||
version: 6.0.0
|
||||
version: 6.0.0-dev0
|
||||
|
||||
+1
-1
@@ -1,5 +1,5 @@
|
||||
---
|
||||
requires_ansible: '>=2.16.0'
|
||||
requires_ansible: '>=2.15.0'
|
||||
action_groups:
|
||||
okd:
|
||||
- k8s
|
||||
|
||||
@@ -18,8 +18,8 @@ provisioner:
|
||||
host_vars:
|
||||
localhost:
|
||||
virtualenv: ${MOLECULE_EPHEMERAL_DIRECTORY}/virtualenv
|
||||
virtualenv_command: '{{ ansible_playbook_python }} -m venv'
|
||||
virtualenv_interpreter: '{{ virtualenv }}/bin/python3'
|
||||
virtualenv_command: '{{ ansible_playbook_python }} -m virtualenv'
|
||||
virtualenv_interpreter: '{{ virtualenv }}/bin/python'
|
||||
playbook_namespace: molecule-tests
|
||||
env:
|
||||
ANSIBLE_FORCE_COLOR: 'true'
|
||||
|
||||
@@ -13,7 +13,6 @@
|
||||
- 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 | length > 0
|
||||
- devs_group | length > 0
|
||||
- admins_group
|
||||
- devs_group
|
||||
- '"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 | length > 0
|
||||
- insurance_group | length > 0
|
||||
- banking_group
|
||||
- insurance_group
|
||||
- '"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,8 +17,7 @@
|
||||
spec:
|
||||
containers:
|
||||
- name: ldap
|
||||
# bitnami is no longer supporting this image. we should probably find a replacement
|
||||
image: docker.io/bitnamilegacy/openldap:latest
|
||||
image: bitnami/openldap
|
||||
env:
|
||||
- name: LDAP_ADMIN_USERNAME
|
||||
value: "{{ ldap_admin_user }}"
|
||||
|
||||
@@ -13,8 +13,10 @@
|
||||
|
||||
- pip:
|
||||
name:
|
||||
- python-ldap
|
||||
state: absent
|
||||
- kubernetes
|
||||
virtualenv: "{{ venv }}"
|
||||
virtualenv_command: "{{ virtualenv_command }}"
|
||||
virtualenv_site_packages: false
|
||||
|
||||
- name: Load test configurations
|
||||
set_fact:
|
||||
@@ -25,6 +27,8 @@
|
||||
config: "{{ configs.simple }}"
|
||||
register: result
|
||||
ignore_errors: true
|
||||
vars:
|
||||
ansible_python_interpreter: "{{ venv }}/bin/python"
|
||||
|
||||
- name: Check that module failed gracefully
|
||||
assert:
|
||||
@@ -32,9 +36,6 @@
|
||||
- '"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 | length > 0
|
||||
- devs_group | length > 0
|
||||
- admins_group
|
||||
- devs_group
|
||||
- '"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 | length > 0
|
||||
- devs_group | length > 0
|
||||
- admins_group
|
||||
- devs_group
|
||||
- '"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 | length > 0
|
||||
- devs_group | length > 0
|
||||
- admins_group
|
||||
- devs_group
|
||||
- '"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 | length > 0
|
||||
- devs_group | length > 0
|
||||
- admins_group
|
||||
- devs_group
|
||||
- '"jane.smith@ansible.org" in admins_group.users'
|
||||
- '"jim.adams@ansible.org" in devs_group.users'
|
||||
- '"jordanbulls@ansible.org" in devs_group.users'
|
||||
|
||||
@@ -213,6 +213,5 @@
|
||||
ignore_errors: true
|
||||
|
||||
when:
|
||||
- registry.public_hostname is not none
|
||||
- registry.public_hostname | length > 0
|
||||
- registry.public_hostname
|
||||
- registry.check.reached
|
||||
|
||||
@@ -65,16 +65,20 @@
|
||||
ansible_python_interpreter: '{{ virtualenv_interpreter }}'
|
||||
|
||||
tasks:
|
||||
# No explicit `virtualenv:` param is necessary with the following pip tasks.
|
||||
# prepare.yml creates the venv and ansible_python_interpreter sets it.
|
||||
- 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
|
||||
|
||||
- pip:
|
||||
name: kubernetes-validate
|
||||
state: absent
|
||||
virtualenv: "{{ virtualenv }}"
|
||||
virtualenv_command: "{{ virtualenv_command }}"
|
||||
virtualenv_site_packages: no
|
||||
|
||||
- import_tasks: tasks/validate_not_installed.yml
|
||||
|
||||
|
||||
@@ -21,7 +21,7 @@ try:
|
||||
except ImportError:
|
||||
pass
|
||||
|
||||
from ansible.module_utils.common.text.converters import to_native
|
||||
from ansible.module_utils._text import to_native
|
||||
|
||||
try:
|
||||
from kubernetes.dynamic.exceptions import (
|
||||
|
||||
@@ -4,7 +4,7 @@ from __future__ import absolute_import, division, print_function
|
||||
|
||||
__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 (
|
||||
AnsibleOpenshiftModule,
|
||||
|
||||
@@ -6,7 +6,7 @@ __metaclass__ = type
|
||||
|
||||
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 (
|
||||
AnsibleOpenshiftModule,
|
||||
|
||||
@@ -7,8 +7,9 @@ __metaclass__ = type
|
||||
from datetime import datetime, timezone, timedelta
|
||||
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.six import iteritems
|
||||
|
||||
from ansible_collections.community.okd.plugins.module_utils.openshift_common import (
|
||||
AnsibleOpenshiftModule,
|
||||
@@ -105,7 +106,7 @@ class OpenShiftAdmPruneImages(AnsibleOpenshiftModule):
|
||||
|
||||
def list_objects(self):
|
||||
result = {}
|
||||
for kind, version in ApiConfiguration.items():
|
||||
for kind, version in iteritems(ApiConfiguration):
|
||||
namespace = None
|
||||
if self.params.get("namespace") and kind.lower() == "imagestream":
|
||||
namespace = self.params.get("namespace")
|
||||
|
||||
@@ -7,7 +7,7 @@ __metaclass__ = type
|
||||
from datetime import datetime, timezone, timedelta
|
||||
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 (
|
||||
AnsibleOpenshiftModule,
|
||||
|
||||
@@ -7,7 +7,7 @@ __metaclass__ = type
|
||||
import traceback
|
||||
from abc import abstractmethod
|
||||
|
||||
from ansible.module_utils.common.text.converters import to_native
|
||||
from ansible.module_utils._text import to_native
|
||||
|
||||
try:
|
||||
from ansible_collections.kubernetes.core.plugins.module_utils.k8s.client import (
|
||||
|
||||
@@ -11,7 +11,7 @@ __metaclass__ = type
|
||||
from datetime import datetime
|
||||
|
||||
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_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 (
|
||||
parse_docker_image_ref,
|
||||
)
|
||||
from ansible.module_utils.six import iteritems
|
||||
|
||||
|
||||
def get_image_blobs(image):
|
||||
@@ -118,7 +119,7 @@ class OpenShiftAnalyzeImageStream(object):
|
||||
"CronJob",
|
||||
)
|
||||
|
||||
for k, objects in resources.items():
|
||||
for k, objects in iteritems(resources):
|
||||
if k not in keys:
|
||||
continue
|
||||
for obj in objects:
|
||||
@@ -221,7 +222,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 resources.items():
|
||||
for k, objects in iteritems(resources):
|
||||
if k not in keys:
|
||||
continue
|
||||
for obj in objects:
|
||||
|
||||
@@ -7,6 +7,7 @@ __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,
|
||||
@@ -369,7 +370,7 @@ class OpenShiftImportImage(AnsibleOpenshiftModule):
|
||||
def execute_module(self):
|
||||
names = []
|
||||
name = self.params.get("name")
|
||||
if isinstance(name, str):
|
||||
if isinstance(name, string_types):
|
||||
names.append(name)
|
||||
elif isinstance(name, list):
|
||||
names = name
|
||||
|
||||
@@ -12,6 +12,7 @@ import os
|
||||
import copy
|
||||
|
||||
from ansible.module_utils.parsing.convert_bool import boolean
|
||||
from ansible.module_utils.six import iteritems
|
||||
|
||||
try:
|
||||
import ldap
|
||||
@@ -45,7 +46,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 nameMapping.items():
|
||||
for k, v in iteritems(nameMapping):
|
||||
if len(k) == 0 or len(v) == 0:
|
||||
return "groupUIDNameMapping has empty key or value"
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@ __metaclass__ = type
|
||||
|
||||
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 (
|
||||
AnsibleOpenshiftModule,
|
||||
|
||||
@@ -83,7 +83,7 @@ options:
|
||||
type: str
|
||||
strict:
|
||||
description: whether to fail when passing unexpected properties
|
||||
default: true
|
||||
default: True
|
||||
type: bool
|
||||
type: dict
|
||||
append_hash:
|
||||
@@ -134,7 +134,7 @@ options:
|
||||
- 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.
|
||||
type: bool
|
||||
default: false
|
||||
default: False
|
||||
version_added: 2.0.0
|
||||
|
||||
requirements:
|
||||
|
||||
@@ -51,7 +51,7 @@ options:
|
||||
aliases:
|
||||
- config
|
||||
- src
|
||||
required: true
|
||||
required: True
|
||||
deny_groups:
|
||||
description:
|
||||
- Denied groups, could be openshift group name or LDAP group dn value.
|
||||
|
||||
@@ -233,7 +233,7 @@ result:
|
||||
"""
|
||||
# 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 (
|
||||
AnsibleOpenshiftModule,
|
||||
|
||||
@@ -37,7 +37,7 @@ options:
|
||||
- users
|
||||
- groups
|
||||
type: str
|
||||
required: true
|
||||
required: True
|
||||
name:
|
||||
description:
|
||||
- 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
|
||||
complete, failed, error, or cancelled.
|
||||
type: bool
|
||||
default: false
|
||||
default: False
|
||||
|
||||
requirements:
|
||||
- python >= 3.6
|
||||
|
||||
@@ -41,7 +41,7 @@ options:
|
||||
- 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).
|
||||
type: bool
|
||||
default: false
|
||||
default: False
|
||||
|
||||
requirements:
|
||||
- python >= 3.6
|
||||
|
||||
@@ -40,7 +40,7 @@ options:
|
||||
- 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.
|
||||
type: bool
|
||||
default: true
|
||||
default: True
|
||||
keep_younger_than:
|
||||
description:
|
||||
- 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,
|
||||
should be considered for pruning.
|
||||
type: bool
|
||||
default: false
|
||||
default: False
|
||||
registry_url:
|
||||
description:
|
||||
- The address to use when contacting the registry, instead of using the default value.
|
||||
@@ -70,17 +70,17 @@ options:
|
||||
type: bool
|
||||
prune_registry:
|
||||
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.
|
||||
type: bool
|
||||
default: true
|
||||
default: True
|
||||
ignore_invalid_refs:
|
||||
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.
|
||||
- As a result an image may be incorrectly deleted as unused.
|
||||
type: bool
|
||||
default: false
|
||||
default: False
|
||||
requirements:
|
||||
- python >= 3.6
|
||||
- kubernetes >= 12.0.0
|
||||
|
||||
@@ -174,7 +174,8 @@ k8s_auth:
|
||||
import traceback
|
||||
|
||||
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
|
||||
import hashlib
|
||||
|
||||
@@ -55,7 +55,7 @@ options:
|
||||
description:
|
||||
- Specify the namespace for the build or the build config.
|
||||
type: str
|
||||
required: true
|
||||
required: True
|
||||
build_args:
|
||||
description:
|
||||
- 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
|
||||
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.
|
||||
default: false
|
||||
default: False
|
||||
type: bool
|
||||
wait_sleep:
|
||||
description:
|
||||
|
||||
@@ -36,18 +36,18 @@ options:
|
||||
description:
|
||||
- Use to specify namespace for image stream to create/update.
|
||||
type: str
|
||||
required: true
|
||||
required: True
|
||||
name:
|
||||
description:
|
||||
- Image stream to import tag into.
|
||||
- This can be provided as a list of images streams or a single value.
|
||||
type: raw
|
||||
required: true
|
||||
required: True
|
||||
all:
|
||||
description:
|
||||
- If set to I(true), import all tags from the provided source on creation or if C(source) is specified.
|
||||
type: bool
|
||||
default: false
|
||||
default: False
|
||||
validate_registry_certs:
|
||||
description:
|
||||
- If set to I(true), allow importing from registries that have invalid HTTPS certificates.
|
||||
@@ -65,7 +65,7 @@ options:
|
||||
description:
|
||||
- Set each imported Docker image to be periodically imported from a remote repository.
|
||||
type: bool
|
||||
default: false
|
||||
default: False
|
||||
source:
|
||||
description:
|
||||
- A Docker image repository to import images from.
|
||||
|
||||
@@ -35,7 +35,7 @@ options:
|
||||
description:
|
||||
- Attempt to contact the integrated registry using local client.
|
||||
type: bool
|
||||
default: false
|
||||
default: False
|
||||
|
||||
requirements:
|
||||
- python >= 3.6
|
||||
|
||||
@@ -308,7 +308,7 @@ duration:
|
||||
|
||||
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 (
|
||||
AnsibleOpenshiftModule,
|
||||
|
||||
@@ -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
|
||||
@@ -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
|
||||
Reference in New Issue
Block a user