mirror of
https://github.com/openshift/community.okd.git
synced 2026-11-22 15:10:29 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f627bc8dcd |
@@ -4,48 +4,6 @@ OKD Collection Release Notes
|
|||||||
|
|
||||||
.. contents:: Topics
|
.. contents:: Topics
|
||||||
|
|
||||||
v4.0.2
|
|
||||||
======
|
|
||||||
|
|
||||||
Release Summary
|
|
||||||
---------------
|
|
||||||
|
|
||||||
This patch updates the k8s dependency version to the 5.x range and modifies tests to handle the manual creation of service account tokens.
|
|
||||||
|
|
||||||
v4.0.1
|
|
||||||
======
|
|
||||||
|
|
||||||
Bugfixes
|
|
||||||
--------
|
|
||||||
|
|
||||||
- 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
|
|
||||||
======
|
|
||||||
|
|
||||||
Release Summary
|
|
||||||
---------------
|
|
||||||
|
|
||||||
In this major release we have removed support for ``ansible-core<2.15``.
|
|
||||||
|
|
||||||
Minor Changes
|
|
||||||
-------------
|
|
||||||
|
|
||||||
- connection/oc - added support of local enviroment variable that will be used for ``oc`` and may be requried for establishing connections ifself (https://github.com/openshift/community.okd/pull/225).
|
|
||||||
- inventory/openshift.py - Defer removal of k8s inventory plugin to version 5.0.0 (https://github.com/openshift/community.okd/pull/224).
|
|
||||||
|
|
||||||
Removed Features (previously deprecated)
|
|
||||||
----------------------------------------
|
|
||||||
|
|
||||||
- k8s - Support for ``merge_type=json`` has been removed in version 4.0.0. Please use ``kubernetes.core.k8s_json_patch`` instead (https://github.com/openshift/community.okd/pull/226).
|
|
||||||
|
|
||||||
v3.0.1
|
|
||||||
======
|
|
||||||
|
|
||||||
Release Summary
|
|
||||||
---------------
|
|
||||||
|
|
||||||
This patch release fixes an issue in building the downstream collection.
|
|
||||||
|
|
||||||
v3.0.0
|
v3.0.0
|
||||||
======
|
======
|
||||||
|
|||||||
@@ -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 = 4.0.2
|
VERSION = 3.0.0
|
||||||
|
|
||||||
SANITY_TEST_ARGS ?= --docker --color
|
SANITY_TEST_ARGS ?= --docker --color
|
||||||
UNITS_TEST_ARGS ?= --docker --color
|
UNITS_TEST_ARGS ?= --docker --color
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ The collection includes a variety of Ansible content to help automate the manage
|
|||||||
<!--start requires_ansible-->
|
<!--start requires_ansible-->
|
||||||
## Ansible version compatibility
|
## Ansible version compatibility
|
||||||
|
|
||||||
This collection has been tested against following Ansible versions: **>=2.15.0**.
|
This collection has been tested against following Ansible versions: **>=2.14.0**.
|
||||||
|
|
||||||
Please ensure to update the `network_os` to use the fully qualified collection name (for example, `cisco.ios.ios`).
|
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.
|
Plugins and modules within a collection may be tested with only specific Ansible versions.
|
||||||
@@ -76,7 +76,7 @@ You can also include it in a `requirements.yml` file and install it via `ansible
|
|||||||
---
|
---
|
||||||
collections:
|
collections:
|
||||||
- name: community.okd
|
- name: community.okd
|
||||||
version: 4.0.2
|
version: 3.0.0
|
||||||
```
|
```
|
||||||
|
|
||||||
### Installing the Kubernetes Python Library
|
### Installing the Kubernetes Python Library
|
||||||
|
|||||||
@@ -207,53 +207,8 @@ releases:
|
|||||||
deprecated_features:
|
deprecated_features:
|
||||||
- openshift - the ``openshift`` inventory plugin has been deprecated and will
|
- openshift - the ``openshift`` inventory plugin has been deprecated and will
|
||||||
be removed in release 4.0.0 (https://github.com/ansible-collections/kubernetes.core/issues/31).
|
be removed in release 4.0.0 (https://github.com/ansible-collections/kubernetes.core/issues/31).
|
||||||
release_summary: This major release drops support for ansible-core versions
|
release_summary: This major release drops support for ansible-core versions lower than 2.14 and Python versions lower than 3.9. It also deprecates ``openshift`` inventory plugin.
|
||||||
lower than 2.14 and Python versions lower than 3.9. It also deprecates ``openshift``
|
|
||||||
inventory plugin.
|
|
||||||
fragments:
|
fragments:
|
||||||
- 20230206-deprecate-openshift-inventory.yml
|
- 20230206-deprecate-openshift-inventory.yml
|
||||||
- 20231107-move-sanity-and-units-to-gha.yml
|
- 20231107-move-sanity-and-units-to-gha.yml
|
||||||
release_date: '2023-11-20'
|
release_date: '2023-11-20'
|
||||||
3.0.1:
|
|
||||||
changes:
|
|
||||||
release_summary: 'This patch release fixes an issue in building the downstream
|
|
||||||
collection.
|
|
||||||
|
|
||||||
'
|
|
||||||
fragments:
|
|
||||||
- downstream-gitignore.yml
|
|
||||||
- release_summary.yml
|
|
||||||
release_date: '2023-11-30'
|
|
||||||
4.0.0:
|
|
||||||
changes:
|
|
||||||
minor_changes:
|
|
||||||
- connection/oc - added support of local enviroment variable that will be used
|
|
||||||
for ``oc`` and may be requried for establishing connections ifself (https://github.com/openshift/community.okd/pull/225).
|
|
||||||
- inventory/openshift.py - Defer removal of k8s inventory plugin to version
|
|
||||||
5.0.0 (https://github.com/openshift/community.okd/pull/224).
|
|
||||||
release_summary: In this major release we have removed support for ``ansible-core<2.15``.
|
|
||||||
removed_features:
|
|
||||||
- k8s - Support for ``merge_type=json`` has been removed in version 4.0.0. Please
|
|
||||||
use ``kubernetes.core.k8s_json_patch`` instead (https://github.com/openshift/community.okd/pull/226).
|
|
||||||
fragments:
|
|
||||||
- 20240523-connection-oc-add-support-for-local-env-vars.yml
|
|
||||||
- 4.0.0.yaml
|
|
||||||
- defer_removal_of_inventory_plugin.yaml
|
|
||||||
- k8s-merge_type=json-removed.yml
|
|
||||||
release_date: '2024-05-29'
|
|
||||||
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).
|
|
||||||
release_summary: This is a bug fix release
|
|
||||||
fragments:
|
|
||||||
- 242-fix-failed-token-deletion.yml
|
|
||||||
release_date: '2024-12-03'
|
|
||||||
4.0.2:
|
|
||||||
changes:
|
|
||||||
release_summary: This patch updates the k8s dependency version to the 5.x range
|
|
||||||
and modifies tests to handle the manual creation of service account tokens.
|
|
||||||
fragments:
|
|
||||||
- 4.0.2.yml
|
|
||||||
release_date: '2025-05-21'
|
|
||||||
|
|||||||
+1
-3
@@ -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="4.0.2"
|
DOWNSTREAM_VERSION="3.0.0"
|
||||||
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=""
|
||||||
@@ -50,7 +50,6 @@ f_text_sub()
|
|||||||
sed -i.bak "s/[[:space:]]okd:$/ openshift:/" "${_build_dir}/meta/runtime.yml"
|
sed -i.bak "s/[[:space:]]okd:$/ openshift:/" "${_build_dir}/meta/runtime.yml"
|
||||||
|
|
||||||
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 "*.bak" -delete
|
find "${_build_dir}" -type f -name "*.bak" -delete
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -63,7 +62,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
|
|
||||||
CHANGELOG.rst
|
CHANGELOG.rst
|
||||||
galaxy.yml
|
galaxy.yml
|
||||||
LICENSE
|
LICENSE
|
||||||
|
|||||||
@@ -11,12 +11,6 @@ with open("./rendereddocfragments.txt", 'w') as df_fd:
|
|||||||
with open(sys.argv[2], 'r') as fd:
|
with open(sys.argv[2], 'r') as fd:
|
||||||
json_docs = json.load(fd)
|
json_docs = json.load(fd)
|
||||||
|
|
||||||
# ansible-doc has introduced a 'doc.plugin_name' on branch 'stable-2.17'
|
|
||||||
# This change generated the following sanity tests error.
|
|
||||||
# invalid-documentation: DOCUMENTATION.plugin_name: extra keys not allowed @ data['plugin_name'].
|
|
||||||
# This will be removed from the module documentation
|
|
||||||
|
|
||||||
json_docs[sys.argv[1]]['doc'].pop('plugin_name', '')
|
|
||||||
json_docs[sys.argv[1]]['doc'].pop('collection', '')
|
json_docs[sys.argv[1]]['doc'].pop('collection', '')
|
||||||
json_docs[sys.argv[1]]['doc'].pop('filename', '')
|
json_docs[sys.argv[1]]['doc'].pop('filename', '')
|
||||||
json_docs[sys.argv[1]]['doc'].pop('has_action', '')
|
json_docs[sys.argv[1]]['doc'].pop('has_action', '')
|
||||||
|
|||||||
@@ -433,6 +433,7 @@ Parameters
|
|||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<ul style="margin: 0; padding: 0"><b>Choices:</b>
|
<ul style="margin: 0; padding: 0"><b>Choices:</b>
|
||||||
|
<li>json</li>
|
||||||
<li>merge</li>
|
<li>merge</li>
|
||||||
<li>strategic-merge</li>
|
<li>strategic-merge</li>
|
||||||
</ul>
|
</ul>
|
||||||
@@ -444,7 +445,7 @@ Parameters
|
|||||||
<div>If more than one merge_type is given, the merge_types will be tried in order</div>
|
<div>If more than one merge_type is given, the merge_types will be tried in order</div>
|
||||||
<div>Defaults to <code>['strategic-merge', 'merge']</code>, which is ideal for using the same parameters on resource kinds that combine Custom Resources and built-in resources.</div>
|
<div>Defaults to <code>['strategic-merge', 'merge']</code>, which is ideal for using the same parameters on resource kinds that combine Custom Resources and built-in resources.</div>
|
||||||
<div>mutually exclusive with <code>apply</code></div>
|
<div>mutually exclusive with <code>apply</code></div>
|
||||||
<div><em>merge_type=json</em> has been removed in version 4.0.0. Please use <span class='module'>kubernetes.core.k8s_json_patch</span> instead.</div>
|
<div><em>merge_type=json</em> is deprecated and will be removed in version 3.0.0. Please use <span class='module'>kubernetes.core.k8s_json_patch</span> instead.</div>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
@@ -969,15 +970,6 @@ Examples
|
|||||||
|
|
||||||
.. code-block:: yaml
|
.. code-block:: yaml
|
||||||
|
|
||||||
- name: Create an OCP project
|
|
||||||
community.okd.k8s:
|
|
||||||
state: present
|
|
||||||
resource_definition:
|
|
||||||
apiVersion: project.openshift.io/v1
|
|
||||||
kind: Project
|
|
||||||
metadata:
|
|
||||||
name: testing
|
|
||||||
|
|
||||||
- name: Create a k8s namespace
|
- name: Create a k8s namespace
|
||||||
community.okd.k8s:
|
community.okd.k8s:
|
||||||
name: testing
|
name: testing
|
||||||
|
|||||||
@@ -208,27 +208,6 @@ Parameters
|
|||||||
<div>Path to a oc config file. Defaults to <em>~/.kube/config</em></div>
|
<div>Path to a oc config file. Defaults to <em>~/.kube/config</em></div>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
|
||||||
<td colspan="1">
|
|
||||||
<div class="ansibleOptionAnchor" id="parameter-"></div>
|
|
||||||
<b>oc_local_env_vars</b>
|
|
||||||
<a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
|
|
||||||
<div style="font-size: small">
|
|
||||||
<span style="color: purple">dictionary</span>
|
|
||||||
</div>
|
|
||||||
<div style="font-style: italic; font-size: small; color: darkgreen">added in 4.0.0</div>
|
|
||||||
</td>
|
|
||||||
<td>
|
|
||||||
<b>Default:</b><br/><div style="color: blue">{}</div>
|
|
||||||
</td>
|
|
||||||
<td>
|
|
||||||
<div>var: ansible_oc_local_env_vars</div>
|
|
||||||
</td>
|
|
||||||
<td>
|
|
||||||
<div>Local environment variable to be passed locally to the oc command line.</div>
|
|
||||||
<div>Please be aware that this passes information directly on the command line and it could expose sensitive data.</div>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
<tr>
|
||||||
<td colspan="1">
|
<td colspan="1">
|
||||||
<div class="ansibleOptionAnchor" id="parameter-"></div>
|
<div class="ansibleOptionAnchor" id="parameter-"></div>
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ DEPRECATED
|
|||||||
----------
|
----------
|
||||||
:Removed in collection release after
|
:Removed in collection release after
|
||||||
:Why: As discussed in https://github.com/ansible-collections/kubernetes.core/issues/31, we decided to
|
:Why: As discussed in https://github.com/ansible-collections/kubernetes.core/issues/31, we decided to
|
||||||
remove the openshift inventory plugin in release 5.0.0.
|
remove the openshift inventory plugin in release 4.0.0.
|
||||||
|
|
||||||
:Alternative: Use :ref:`kubernetes.core.k8s_info <kubernetes.core.k8s_info_module>` and :ref:`ansible.builtin.add_host <ansible.builtin.add_host_module>` instead.
|
:Alternative: Use :ref:`kubernetes.core.k8s_info <kubernetes.core.k8s_info_module>` and :ref:`ansible.builtin.add_host <ansible.builtin.add_host_module>` instead.
|
||||||
|
|
||||||
@@ -355,7 +355,7 @@ Status
|
|||||||
------
|
------
|
||||||
|
|
||||||
|
|
||||||
- This inventory will be removed in version 5.0.0. *[deprecated]*
|
- This inventory will be removed in version 4.0.0. *[deprecated]*
|
||||||
- For more information see `DEPRECATED`_.
|
- For more information see `DEPRECATED`_.
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+2
-2
@@ -5,7 +5,7 @@ authors:
|
|||||||
- willthames (https://github.com/willthames)
|
- willthames (https://github.com/willthames)
|
||||||
- Akasurde (https://github.com/akasurde)
|
- Akasurde (https://github.com/akasurde)
|
||||||
dependencies:
|
dependencies:
|
||||||
kubernetes.core: '>=5.0.0,<6.0.0'
|
kubernetes.core: '>=3.0.0'
|
||||||
description: OKD Collection for Ansible.
|
description: OKD Collection for Ansible.
|
||||||
documentation: ''
|
documentation: ''
|
||||||
homepage: ''
|
homepage: ''
|
||||||
@@ -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: 4.0.2
|
version: 3.0.0
|
||||||
|
|||||||
+3
-3
@@ -1,5 +1,5 @@
|
|||||||
---
|
---
|
||||||
requires_ansible: '>=2.15.0'
|
requires_ansible: '>=2.14.0'
|
||||||
action_groups:
|
action_groups:
|
||||||
okd:
|
okd:
|
||||||
- k8s
|
- k8s
|
||||||
@@ -20,10 +20,10 @@ plugin_routing:
|
|||||||
inventory:
|
inventory:
|
||||||
openshift:
|
openshift:
|
||||||
deprecation:
|
deprecation:
|
||||||
removal_version: 5.0.0
|
removal_version: 4.0.0
|
||||||
warning_text: >-
|
warning_text: >-
|
||||||
The openshift inventory plugin has been deprecated and
|
The openshift inventory plugin has been deprecated and
|
||||||
will be removed in release 5.0.0.
|
will be removed in release 4.0.0.
|
||||||
action:
|
action:
|
||||||
k8s:
|
k8s:
|
||||||
redirect: kubernetes.core.k8s_info
|
redirect: kubernetes.core.k8s_info
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
# Want to make sure comments don't break it
|
# Want to make sure comments don't break it
|
||||||
export NAME=test123
|
export NAME=test123
|
||||||
NAMESPACE=openshift
|
NAMESPACE=openshift
|
||||||
NGINX_VERSION=1.22-ubi8
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -49,9 +49,9 @@
|
|||||||
- result is changed
|
- result is changed
|
||||||
- admins_group
|
- admins_group
|
||||||
- devs_group
|
- 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 }}'
|
||||||
- admins_group.users | length == 2
|
- admins_group.users | length == 2
|
||||||
- devs_group.users | length == 1
|
- devs_group.users | length == 1
|
||||||
vars:
|
vars:
|
||||||
@@ -79,8 +79,8 @@
|
|||||||
assert:
|
assert:
|
||||||
that:
|
that:
|
||||||
- result.resources | length == 1
|
- result.resources | length == 1
|
||||||
- '"jane.smith@ansible.org" in result.resources.0.users'
|
- '"jane.smith@ansible.org" in {{ result.resources.0.users }}'
|
||||||
- '"jim.adams@ansible.org" in result.resources.0.users'
|
- '"jim.adams@ansible.org" in {{ result.resources.0.users }}'
|
||||||
|
|
||||||
- name: Read developers group
|
- name: Read developers group
|
||||||
kubernetes.core.k8s_info:
|
kubernetes.core.k8s_info:
|
||||||
@@ -93,7 +93,7 @@
|
|||||||
assert:
|
assert:
|
||||||
that:
|
that:
|
||||||
- result.resources | length == 1
|
- result.resources | length == 1
|
||||||
- '"jordanbulls@ansible.org" in result.resources.0.users'
|
- '"jordanbulls@ansible.org" in {{ result.resources.0.users }}'
|
||||||
|
|
||||||
- name: Define user dn to delete
|
- name: Define user dn to delete
|
||||||
set_fact:
|
set_fact:
|
||||||
@@ -133,8 +133,8 @@
|
|||||||
assert:
|
assert:
|
||||||
that:
|
that:
|
||||||
- result.resources | length == 1
|
- result.resources | length == 1
|
||||||
- '"jane.smith@ansible.org" in result.resources.0.users'
|
- '"jane.smith@ansible.org" in {{ result.resources.0.users }}'
|
||||||
- '"jim.adams@ansible.org" in result.resources.0.users'
|
- '"jim.adams@ansible.org" in {{ result.resources.0.users }}'
|
||||||
|
|
||||||
- name: Synchronize Openshift groups using deny_groups
|
- name: Synchronize Openshift groups using deny_groups
|
||||||
community.okd.openshift_adm_groups_sync:
|
community.okd.openshift_adm_groups_sync:
|
||||||
|
|||||||
@@ -49,9 +49,9 @@
|
|||||||
- result is changed
|
- result is changed
|
||||||
- banking_group
|
- banking_group
|
||||||
- insurance_group
|
- 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 }}'
|
||||||
- banking_group.users | length == 2
|
- banking_group.users | length == 2
|
||||||
- insurance_group.users | length == 1
|
- insurance_group.users | length == 1
|
||||||
vars:
|
vars:
|
||||||
@@ -90,8 +90,8 @@
|
|||||||
assert:
|
assert:
|
||||||
that:
|
that:
|
||||||
- result.resources | length == 1
|
- result.resources | length == 1
|
||||||
- '"james-allan@ansible.org" in result.resources.0.users'
|
- '"james-allan@ansible.org" in {{ result.resources.0.users }}'
|
||||||
- '"gordon-kane@ansible.org" in result.resources.0.users'
|
- '"gordon-kane@ansible.org" in {{ result.resources.0.users }}'
|
||||||
|
|
||||||
- name: Read 'insurance' openshift group
|
- name: Read 'insurance' openshift group
|
||||||
kubernetes.core.k8s_info:
|
kubernetes.core.k8s_info:
|
||||||
|
|||||||
@@ -70,9 +70,9 @@
|
|||||||
- result is changed
|
- result is changed
|
||||||
- admins_group
|
- admins_group
|
||||||
- devs_group
|
- 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 }}'
|
||||||
- admins_group.users | length == 1
|
- admins_group.users | length == 1
|
||||||
- devs_group.users | length == 2
|
- devs_group.users | length == 2
|
||||||
vars:
|
vars:
|
||||||
@@ -91,9 +91,9 @@
|
|||||||
- result is changed
|
- result is changed
|
||||||
- admins_group
|
- admins_group
|
||||||
- devs_group
|
- 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 }}'
|
||||||
- admins_group.users | length == 1
|
- admins_group.users | length == 1
|
||||||
- devs_group.users | length == 2
|
- devs_group.users | length == 2
|
||||||
vars:
|
vars:
|
||||||
@@ -112,9 +112,9 @@
|
|||||||
- result is changed
|
- result is changed
|
||||||
- admins_group
|
- admins_group
|
||||||
- devs_group
|
- 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 }}'
|
||||||
- admins_group.users | length == 1
|
- admins_group.users | length == 1
|
||||||
- devs_group.users | length == 2
|
- devs_group.users | length == 2
|
||||||
vars:
|
vars:
|
||||||
@@ -133,9 +133,9 @@
|
|||||||
- result is changed
|
- result is changed
|
||||||
- admins_group
|
- admins_group
|
||||||
- devs_group
|
- 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 }}'
|
||||||
- admins_group.users | length == 1
|
- admins_group.users | length == 1
|
||||||
- devs_group.users | length == 2
|
- devs_group.users | length == 2
|
||||||
vars:
|
vars:
|
||||||
@@ -162,7 +162,7 @@
|
|||||||
assert:
|
assert:
|
||||||
that:
|
that:
|
||||||
- result is failed
|
- result is failed
|
||||||
- result.msg.startswith("Entry not found for base='cn=Matthew,ou=people,ou=outrfc2307,"+ldap_root+"'")
|
- result.msg.startswith("Entry not found for base='cn=Matthew,ou=people,ou=outrfc2307,{{ ldap_root }}'")
|
||||||
|
|
||||||
- name: Define sync configuration with tolerateMemberNotFoundErrors
|
- name: Define sync configuration with tolerateMemberNotFoundErrors
|
||||||
set_fact:
|
set_fact:
|
||||||
@@ -264,7 +264,7 @@
|
|||||||
assert:
|
assert:
|
||||||
that:
|
that:
|
||||||
- result.resources | length == 1
|
- result.resources | length == 1
|
||||||
- '"jane.smith@ansible.org" in result.resources.0.users'
|
- '"jane.smith@ansible.org" in {{ result.resources.0.users }}'
|
||||||
|
|
||||||
- name: Read Groups
|
- name: Read Groups
|
||||||
kubernetes.core.k8s_info:
|
kubernetes.core.k8s_info:
|
||||||
@@ -277,8 +277,8 @@
|
|||||||
assert:
|
assert:
|
||||||
that:
|
that:
|
||||||
- result.resources | length == 1
|
- result.resources | length == 1
|
||||||
- '"jim.adams@ansible.org" in result.resources.0.users'
|
- '"jim.adams@ansible.org" in {{ result.resources.0.users }}'
|
||||||
- '"jordanbulls@ansible.org" in result.resources.0.users'
|
- '"jordanbulls@ansible.org" in {{ result.resources.0.users }}'
|
||||||
|
|
||||||
- name: Set users to delete (no admins users anymore and only 1 developer kept)
|
- name: Set users to delete (no admins users anymore and only 1 developer kept)
|
||||||
set_fact:
|
set_fact:
|
||||||
@@ -335,7 +335,7 @@
|
|||||||
assert:
|
assert:
|
||||||
that:
|
that:
|
||||||
- result.resources | length == 1
|
- result.resources | length == 1
|
||||||
- '"jordanbulls@ansible.org" in result.resources.0.users'
|
- '"jordanbulls@ansible.org" in {{ result.resources.0.users }}'
|
||||||
|
|
||||||
- name: Set group to delete
|
- name: Set group to delete
|
||||||
set_fact:
|
set_fact:
|
||||||
|
|||||||
@@ -3,7 +3,6 @@
|
|||||||
- set_fact:
|
- set_fact:
|
||||||
test_sa: "clusterrole-sa"
|
test_sa: "clusterrole-sa"
|
||||||
test_ns: "clusterrole-ns"
|
test_ns: "clusterrole-ns"
|
||||||
test_tn: "clusterrole-tn"
|
|
||||||
|
|
||||||
- name: Ensure namespace
|
- name: Ensure namespace
|
||||||
kubernetes.core.k8s:
|
kubernetes.core.k8s:
|
||||||
@@ -27,27 +26,34 @@
|
|||||||
name: "{{ test_sa }}"
|
name: "{{ test_sa }}"
|
||||||
namespace: "{{ test_ns }}"
|
namespace: "{{ test_ns }}"
|
||||||
|
|
||||||
- name: Create SA token
|
- name: Read Service Account
|
||||||
kubernetes.core.k8s:
|
kubernetes.core.k8s_info:
|
||||||
definition:
|
kind: ServiceAccount
|
||||||
apiVersion: v1
|
|
||||||
kind: Secret
|
|
||||||
metadata:
|
|
||||||
name: "{{ test_tn }}"
|
|
||||||
namespace: "{{ test_ns }}"
|
namespace: "{{ test_ns }}"
|
||||||
annotations:
|
name: "{{ test_sa }}"
|
||||||
kubernetes.io/service-account.name: "{{ test_sa }}"
|
register: result
|
||||||
type: kubernetes.io/service-account-token
|
|
||||||
|
- set_fact:
|
||||||
|
secret_token: "{{ result.resources[0]['secrets'][0]['name'] }}"
|
||||||
|
|
||||||
- name: Get secret details
|
- name: Get secret details
|
||||||
kubernetes.core.k8s_info:
|
kubernetes.core.k8s_info:
|
||||||
kind: Secret
|
kind: Secret
|
||||||
namespace: "{{ test_ns }}"
|
namespace: '{{ test_ns }}'
|
||||||
name: "{{ test_tn }}"
|
name: '{{ secret_token }}'
|
||||||
register: _secret
|
register: _secret
|
||||||
|
retries: 10
|
||||||
|
delay: 10
|
||||||
|
until:
|
||||||
|
- ("'openshift.io/token-secret.value' in _secret.resources[0]['metadata']['annotations']") or ("'token' in _secret.resources[0]['data']")
|
||||||
|
|
||||||
|
- set_fact:
|
||||||
|
api_token: "{{ _secret.resources[0]['metadata']['annotations']['openshift.io/token-secret.value'] }}"
|
||||||
|
when: "'openshift.io/token-secret.value' in _secret.resources[0]['metadata']['annotations']"
|
||||||
|
|
||||||
- set_fact:
|
- set_fact:
|
||||||
api_token: "{{ _secret.resources[0]['data']['token'] | b64decode }}"
|
api_token: "{{ _secret.resources[0]['data']['token'] | b64decode }}"
|
||||||
|
when: "'token' in _secret.resources[0]['data']"
|
||||||
|
|
||||||
- name: list Node should failed (forbidden user)
|
- name: list Node should failed (forbidden user)
|
||||||
kubernetes.core.k8s_info:
|
kubernetes.core.k8s_info:
|
||||||
@@ -217,8 +223,8 @@
|
|||||||
- name: validate clusterrole binding candidates for prune
|
- name: validate clusterrole binding candidates for prune
|
||||||
assert:
|
assert:
|
||||||
that:
|
that:
|
||||||
- 'item["name"]+"-binding" in check.cluster_role_binding'
|
- '"{{ item.name }}-binding" in check.cluster_role_binding'
|
||||||
- 'test_ns+"/"+cluster_roles[0].name+"-binding" in check.role_binding'
|
- '"{{ test_ns }}/{{ cluster_roles[0].name }}-binding" in check.role_binding'
|
||||||
with_items: "{{ cluster_roles }}"
|
with_items: "{{ cluster_roles }}"
|
||||||
|
|
||||||
- name: Prune Cluster Role for managing Pod
|
- name: Prune Cluster Role for managing Pod
|
||||||
|
|||||||
@@ -4,7 +4,6 @@
|
|||||||
test_ns: "prune-roles"
|
test_ns: "prune-roles"
|
||||||
sa_name: "roles-sa"
|
sa_name: "roles-sa"
|
||||||
pod_name: "pod-prune"
|
pod_name: "pod-prune"
|
||||||
tn_name: "roles-sa-token"
|
|
||||||
role_definition:
|
role_definition:
|
||||||
- name: pod-list
|
- name: pod-list
|
||||||
labels:
|
labels:
|
||||||
@@ -51,27 +50,34 @@
|
|||||||
name: '{{ sa_name }}'
|
name: '{{ sa_name }}'
|
||||||
namespace: '{{ test_ns }}'
|
namespace: '{{ test_ns }}'
|
||||||
|
|
||||||
- name: Create SA secret
|
- name: Read Service Account
|
||||||
kubernetes.core.k8s:
|
kubernetes.core.k8s_info:
|
||||||
definition:
|
kind: ServiceAccount
|
||||||
apiVersion: v1
|
namespace: '{{ test_ns }}'
|
||||||
kind: Secret
|
name: '{{ sa_name }}'
|
||||||
metadata:
|
register: sa_out
|
||||||
name: "{{ tn_name }}"
|
|
||||||
namespace: "{{ test_ns }}"
|
- set_fact:
|
||||||
annotations:
|
secret_token: "{{ sa_out.resources[0]['secrets'][0]['name'] }}"
|
||||||
kubernetes.io/service-account.name: "{{ sa_name }}"
|
|
||||||
type: kubernetes.io/service-account-token
|
|
||||||
|
|
||||||
- name: Get secret details
|
- name: Get secret details
|
||||||
kubernetes.core.k8s_info:
|
kubernetes.core.k8s_info:
|
||||||
kind: Secret
|
kind: Secret
|
||||||
namespace: '{{ test_ns }}'
|
namespace: '{{ test_ns }}'
|
||||||
name: '{{ tn_name }}'
|
name: '{{ secret_token }}'
|
||||||
register: r_secret
|
register: r_secret
|
||||||
|
retries: 10
|
||||||
|
delay: 10
|
||||||
|
until:
|
||||||
|
- ("'openshift.io/token-secret.value' in r_secret.resources[0]['metadata']['annotations']") or ("'token' in r_secret.resources[0]['data']")
|
||||||
|
|
||||||
|
- set_fact:
|
||||||
|
api_token: "{{ r_secret.resources[0]['metadata']['annotations']['openshift.io/token-secret.value'] }}"
|
||||||
|
when: "'openshift.io/token-secret.value' in r_secret.resources[0]['metadata']['annotations']"
|
||||||
|
|
||||||
- set_fact:
|
- set_fact:
|
||||||
api_token: "{{ r_secret.resources[0]['data']['token'] | b64decode }}"
|
api_token: "{{ r_secret.resources[0]['data']['token'] | b64decode }}"
|
||||||
|
when: "'token' in r_secret.resources[0]['data']"
|
||||||
|
|
||||||
- name: list resources using service account
|
- name: list resources using service account
|
||||||
kubernetes.core.k8s_info:
|
kubernetes.core.k8s_info:
|
||||||
@@ -171,7 +177,7 @@
|
|||||||
|
|
||||||
- name: validate that list role binding are candidates for prune
|
- name: validate that list role binding are candidates for prune
|
||||||
assert:
|
assert:
|
||||||
that: 'test_ns+"/"+item["name"]+"-bind" in check.role_binding'
|
that: '"{{ test_ns }}/{{ item.name }}-bind" in check.role_binding'
|
||||||
with_items: "{{ role_definition }}"
|
with_items: "{{ role_definition }}"
|
||||||
|
|
||||||
- name: Prune resource using label_selectors option
|
- name: Prune resource using label_selectors option
|
||||||
@@ -186,7 +192,7 @@
|
|||||||
assert:
|
assert:
|
||||||
that:
|
that:
|
||||||
- prune is changed
|
- prune is changed
|
||||||
- 'test_ns+"/"+role_definition[2]["name"]+"-bind" in check.role_binding'
|
- '"{{ test_ns }}/{{ role_definition[2].name }}-bind" in check.role_binding'
|
||||||
|
|
||||||
- name: assert that user could not delete pod anymore
|
- name: assert that user could not delete pod anymore
|
||||||
kubernetes.core.k8s:
|
kubernetes.core.k8s:
|
||||||
@@ -256,7 +262,7 @@
|
|||||||
assert:
|
assert:
|
||||||
that:
|
that:
|
||||||
- prune is changed
|
- prune is changed
|
||||||
- 'test_ns+"/"+role_definition[1]["name"]+"-bind" in check.role_binding'
|
- '"{{ test_ns }}/{{ role_definition[1].name }}-bind" in check.role_binding'
|
||||||
|
|
||||||
- name: Create Pod (should failed)
|
- name: Create Pod (should failed)
|
||||||
kubernetes.core.k8s:
|
kubernetes.core.k8s:
|
||||||
@@ -309,7 +315,7 @@
|
|||||||
assert:
|
assert:
|
||||||
that:
|
that:
|
||||||
- prune is changed
|
- prune is changed
|
||||||
- 'test_ns+"/"+role_definition[0]["name"]+"-bind" in check.role_binding'
|
- '"{{ test_ns }}/{{ role_definition[0].name }}-bind" in check.role_binding'
|
||||||
|
|
||||||
- name: List Pod
|
- name: List Pod
|
||||||
kubernetes.core.k8s_info:
|
kubernetes.core.k8s_info:
|
||||||
|
|||||||
@@ -95,7 +95,7 @@
|
|||||||
assert:
|
assert:
|
||||||
that:
|
that:
|
||||||
- replications.resources | length == 1
|
- replications.resources | length == 1
|
||||||
- replications.resources.0.metadata.name is match(dc_name+"-*")
|
- 'replications.resources.0.metadata.name is match("{{ dc_name }}-*")'
|
||||||
|
|
||||||
- name: Assure that candidate ReplicationController was found for pruning
|
- name: Assure that candidate ReplicationController was found for pruning
|
||||||
assert:
|
assert:
|
||||||
|
|||||||
@@ -55,7 +55,7 @@
|
|||||||
assert:
|
assert:
|
||||||
that:
|
that:
|
||||||
- new_build is changed
|
- new_build is changed
|
||||||
- new_build.builds.0.metadata.name == build_config+"-1"
|
- new_build.builds.0.metadata.name == "{{ build_config }}-1"
|
||||||
|
|
||||||
- name: Start a new Build from previous Build
|
- name: Start a new Build from previous Build
|
||||||
community.okd.openshift_build:
|
community.okd.openshift_build:
|
||||||
@@ -67,7 +67,7 @@
|
|||||||
assert:
|
assert:
|
||||||
that:
|
that:
|
||||||
- rerun_build is changed
|
- rerun_build is changed
|
||||||
- rerun_build.builds.0.metadata.name == build_config+"-2"
|
- rerun_build.builds.0.metadata.name == "{{ build_config }}-2"
|
||||||
|
|
||||||
- name: Cancel first build created
|
- name: Cancel first build created
|
||||||
community.okd.openshift_build:
|
community.okd.openshift_build:
|
||||||
@@ -82,8 +82,8 @@
|
|||||||
that:
|
that:
|
||||||
- cancel is changed
|
- cancel is changed
|
||||||
- cancel.builds | length == 1
|
- cancel.builds | length == 1
|
||||||
- cancel.builds.0.metadata.name == build_config+"-1"
|
- cancel.builds.0.metadata.name == "{{ build_config }}-1"
|
||||||
- cancel.builds.0.metadata.namespace == build_ns
|
- cancel.builds.0.metadata.namespace == "{{ build_ns }}"
|
||||||
- '"cancelled" in cancel.builds.0.status'
|
- '"cancelled" in cancel.builds.0.status'
|
||||||
- cancel.builds.0.status.cancelled
|
- cancel.builds.0.status.cancelled
|
||||||
|
|
||||||
@@ -119,7 +119,7 @@
|
|||||||
that:
|
that:
|
||||||
- restart is changed
|
- restart is changed
|
||||||
- restart.builds | length == 1
|
- restart.builds | length == 1
|
||||||
- restart.builds.0.metadata.name == build_config+"-3"
|
- 'restart.builds.0.metadata.name == "{{ build_config }}-3"'
|
||||||
|
|
||||||
- name: Get info for 2nd Build
|
- name: Get info for 2nd Build
|
||||||
kubernetes.core.k8s_info:
|
kubernetes.core.k8s_info:
|
||||||
@@ -175,8 +175,8 @@
|
|||||||
that:
|
that:
|
||||||
- prune_without_ns is changed
|
- prune_without_ns is changed
|
||||||
- prune_without_ns.builds | length > 0
|
- prune_without_ns.builds | length > 0
|
||||||
- 'build_config+"-1" in build_names'
|
- '"{{ build_config }}-1" in build_names'
|
||||||
- 'build_config+"-2" in build_names'
|
- '"{{ build_config }}-2" in build_names'
|
||||||
vars:
|
vars:
|
||||||
build_names: '{{ prune_without_ns.builds | map(attribute="metadata") | flatten | map(attribute="name") | list }}'
|
build_names: '{{ prune_without_ns.builds | map(attribute="metadata") | flatten | map(attribute="name") | list }}'
|
||||||
|
|
||||||
|
|||||||
@@ -125,7 +125,7 @@
|
|||||||
assert:
|
assert:
|
||||||
that:
|
that:
|
||||||
- error_tag is failed
|
- error_tag is failed
|
||||||
- error_tag.msg == "image stream "+test_ns+"/local-is does not have tags pointing to external container images"
|
- 'error_tag.msg == "image stream {{ test_ns }}/local-is does not have tags pointing to external container images"'
|
||||||
|
|
||||||
- name: import all tags for container image ibmcom/pause and specific tag for redhat/ubi8-micro
|
- name: import all tags for container image ibmcom/pause and specific tag for redhat/ubi8-micro
|
||||||
community.okd.openshift_import_image:
|
community.okd.openshift_import_image:
|
||||||
|
|||||||
@@ -7,7 +7,6 @@
|
|||||||
parameters:
|
parameters:
|
||||||
NAMESPACE: openshift
|
NAMESPACE: openshift
|
||||||
NAME: test123
|
NAME: test123
|
||||||
NGINX_VERSION: "{{ nginx_version }}"
|
|
||||||
register: result
|
register: result
|
||||||
|
|
||||||
- name: Create the rendered resources
|
- name: Create the rendered resources
|
||||||
@@ -33,7 +32,6 @@
|
|||||||
parameters:
|
parameters:
|
||||||
NAMESPACE: openshift
|
NAMESPACE: openshift
|
||||||
NAME: test123
|
NAME: test123
|
||||||
NGINX_VERSION: "{{ nginx_version }}"
|
|
||||||
state: present
|
state: present
|
||||||
namespace_target: process-test
|
namespace_target: process-test
|
||||||
register: result
|
register: result
|
||||||
@@ -46,7 +44,6 @@
|
|||||||
NAMESPACE: openshift
|
NAMESPACE: openshift
|
||||||
NAME: test123
|
NAME: test123
|
||||||
MEMORY_LIMIT: 1Gi
|
MEMORY_LIMIT: 1Gi
|
||||||
NGINX_VERSION: "{{ nginx_version }}"
|
|
||||||
state: present
|
state: present
|
||||||
namespace_target: process-test
|
namespace_target: process-test
|
||||||
register: result
|
register: result
|
||||||
@@ -58,7 +55,6 @@
|
|||||||
parameters:
|
parameters:
|
||||||
NAMESPACE: openshift
|
NAMESPACE: openshift
|
||||||
NAME: test123
|
NAME: test123
|
||||||
NGINX_VERSION: "{{ nginx_version }}"
|
|
||||||
state: absent
|
state: absent
|
||||||
namespace_target: process-test
|
namespace_target: process-test
|
||||||
register: result
|
register: result
|
||||||
|
|||||||
@@ -77,7 +77,6 @@
|
|||||||
- import_tasks: tasks/openshift_process.yml
|
- import_tasks: tasks/openshift_process.yml
|
||||||
vars:
|
vars:
|
||||||
files_dir: '{{ playbook_dir }}/files'
|
files_dir: '{{ playbook_dir }}/files'
|
||||||
nginx_version: 1.22-ubi8
|
|
||||||
always:
|
always:
|
||||||
- name: Delete namespace
|
- name: Delete namespace
|
||||||
community.okd.k8s:
|
community.okd.k8s:
|
||||||
|
|||||||
@@ -106,15 +106,6 @@ DOCUMENTATION = """
|
|||||||
env:
|
env:
|
||||||
- name: K8S_AUTH_TOKEN
|
- name: K8S_AUTH_TOKEN
|
||||||
- name: K8S_AUTH_API_KEY
|
- name: K8S_AUTH_API_KEY
|
||||||
oc_local_env_vars:
|
|
||||||
description:
|
|
||||||
- Local environment variable to be passed locally to the oc command line.
|
|
||||||
- Please be aware that this passes information directly on the command line and it could expose sensitive data.
|
|
||||||
default: {}
|
|
||||||
type: dict
|
|
||||||
version_added: 4.0.0
|
|
||||||
vars:
|
|
||||||
- name: ansible_oc_local_env_vars
|
|
||||||
client_cert:
|
client_cert:
|
||||||
description:
|
description:
|
||||||
- Path to a certificate used to authenticate with the API.
|
- Path to a certificate used to authenticate with the API.
|
||||||
|
|||||||
@@ -18,10 +18,10 @@ DOCUMENTATION = """
|
|||||||
- Uses openshift.(yml|yaml) YAML configuration file to set parameter values.
|
- Uses openshift.(yml|yaml) YAML configuration file to set parameter values.
|
||||||
|
|
||||||
deprecated:
|
deprecated:
|
||||||
removed_in: 5.0.0
|
removed_in: 4.0.0
|
||||||
why: |
|
why: |
|
||||||
As discussed in U(https://github.com/ansible-collections/kubernetes.core/issues/31), we decided to
|
As discussed in U(https://github.com/ansible-collections/kubernetes.core/issues/31), we decided to
|
||||||
remove the openshift inventory plugin in release 5.0.0.
|
remove the openshift inventory plugin in release 4.0.0.
|
||||||
alternative: "Use M(kubernetes.core.k8s_info) and M(ansible.builtin.add_host) instead."
|
alternative: "Use M(kubernetes.core.k8s_info) and M(ansible.builtin.add_host) instead."
|
||||||
|
|
||||||
options:
|
options:
|
||||||
@@ -157,8 +157,8 @@ class InventoryModule(K8sInventoryModule):
|
|||||||
super(InventoryModule, self).fetch_objects(connections)
|
super(InventoryModule, self).fetch_objects(connections)
|
||||||
|
|
||||||
self.display.deprecated(
|
self.display.deprecated(
|
||||||
"The 'openshift' inventory plugin has been deprecated and will be removed in release 5.0.0",
|
"The 'openshift' inventory plugin has been deprecated and will be removed in release 4.0.0",
|
||||||
version="5.0.0",
|
version="4.0.0",
|
||||||
collection_name="community.okd",
|
collection_name="community.okd",
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
+3
-11
@@ -64,8 +64,9 @@ options:
|
|||||||
- Defaults to C(['strategic-merge', 'merge']), which is ideal for using the same parameters
|
- Defaults to C(['strategic-merge', 'merge']), which is ideal for using the same parameters
|
||||||
on resource kinds that combine Custom Resources and built-in resources.
|
on resource kinds that combine Custom Resources and built-in resources.
|
||||||
- mutually exclusive with C(apply)
|
- mutually exclusive with C(apply)
|
||||||
- I(merge_type=json) has been removed in version 4.0.0. Please use M(kubernetes.core.k8s_json_patch) instead.
|
- I(merge_type=json) is deprecated and will be removed in version 3.0.0. Please use M(kubernetes.core.k8s_json_patch) instead.
|
||||||
choices:
|
choices:
|
||||||
|
- json
|
||||||
- merge
|
- merge
|
||||||
- strategic-merge
|
- strategic-merge
|
||||||
type: list
|
type: list
|
||||||
@@ -144,15 +145,6 @@ requirements:
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
EXAMPLES = r"""
|
EXAMPLES = r"""
|
||||||
- name: Create an OCP project
|
|
||||||
community.okd.k8s:
|
|
||||||
state: present
|
|
||||||
resource_definition:
|
|
||||||
apiVersion: project.openshift.io/v1
|
|
||||||
kind: Project
|
|
||||||
metadata:
|
|
||||||
name: testing
|
|
||||||
|
|
||||||
- name: Create a k8s namespace
|
- name: Create a k8s namespace
|
||||||
community.okd.k8s:
|
community.okd.k8s:
|
||||||
name: testing
|
name: testing
|
||||||
@@ -292,7 +284,7 @@ def argspec():
|
|||||||
argument_spec.update(AUTH_ARG_SPEC)
|
argument_spec.update(AUTH_ARG_SPEC)
|
||||||
argument_spec.update(WAIT_ARG_SPEC)
|
argument_spec.update(WAIT_ARG_SPEC)
|
||||||
argument_spec["merge_type"] = dict(
|
argument_spec["merge_type"] = dict(
|
||||||
type="list", elements="str", choices=["merge", "strategic-merge"]
|
type="list", elements="str", choices=["json", "merge", "strategic-merge"]
|
||||||
)
|
)
|
||||||
argument_spec["validate"] = dict(type="dict", default=None, options=validate_spec())
|
argument_spec["validate"] = dict(type="dict", default=None, options=validate_spec())
|
||||||
argument_spec["append_hash"] = dict(type="bool", default=False)
|
argument_spec["append_hash"] = dict(type="bool", default=False)
|
||||||
|
|||||||
@@ -295,9 +295,9 @@ class OpenShiftMigrateTemplateInstances(AnsibleOpenshiftModule):
|
|||||||
object_type in transforms.keys()
|
object_type in transforms.keys()
|
||||||
and obj["ref"].get("apiVersion") != transforms[object_type]
|
and obj["ref"].get("apiVersion") != transforms[object_type]
|
||||||
):
|
):
|
||||||
ti_elem["status"]["objects"][i]["ref"]["apiVersion"] = (
|
ti_elem["status"]["objects"][i]["ref"][
|
||||||
transforms[object_type]
|
"apiVersion"
|
||||||
)
|
] = transforms[object_type]
|
||||||
ti_to_be_migrated.append(ti_elem)
|
ti_to_be_migrated.append(ti_elem)
|
||||||
|
|
||||||
return ti_to_be_migrated
|
return ti_to_be_migrated
|
||||||
|
|||||||
@@ -224,10 +224,8 @@ def get_oauthaccesstoken_objectname_from_token(token_name):
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
sha256Prefix = "sha256~"
|
sha256Prefix = "sha256~"
|
||||||
if token_name.startswith(sha256Prefix):
|
content = token_name.strip(sha256Prefix)
|
||||||
content = token_name[len(sha256Prefix) :]
|
|
||||||
else:
|
|
||||||
content = token_name
|
|
||||||
b64encoded = urlsafe_b64encode(hashlib.sha256(content.encode()).digest()).rstrip(
|
b64encoded = urlsafe_b64encode(hashlib.sha256(content.encode()).digest()).rstrip(
|
||||||
b"="
|
b"="
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -421,9 +421,9 @@ class OpenShiftRoute(AnsibleOpenshiftModule):
|
|||||||
if tls_insecure_policy == "disallow":
|
if tls_insecure_policy == "disallow":
|
||||||
tls_insecure_policy = None
|
tls_insecure_policy = None
|
||||||
else:
|
else:
|
||||||
tls_ca_cert = tls_cert = tls_dest_ca_cert = tls_key = (
|
tls_ca_cert = (
|
||||||
tls_insecure_policy
|
tls_cert
|
||||||
) = None
|
) = tls_dest_ca_cert = tls_key = tls_insecure_policy = None
|
||||||
|
|
||||||
route = {
|
route = {
|
||||||
"apiVersion": "route.openshift.io/v1",
|
"apiVersion": "route.openshift.io/v1",
|
||||||
|
|||||||
@@ -0,0 +1,4 @@
|
|||||||
|
plugins/modules/k8s.py validate-modules:parameter-type-not-in-doc
|
||||||
|
plugins/modules/k8s.py validate-modules:return-syntax-error
|
||||||
|
plugins/module_utils/k8s.py pylint:bad-option-value
|
||||||
|
plugins/modules/openshift_process.py validate-modules:parameter-type-not-in-doc
|
||||||
@@ -0,0 +1,169 @@
|
|||||||
|
plugins/modules/k8s.py validate-modules:parameter-type-not-in-doc
|
||||||
|
plugins/modules/k8s.py validate-modules:return-syntax-error
|
||||||
|
plugins/module_utils/k8s.py pylint:bad-option-value
|
||||||
|
plugins/modules/openshift_process.py validate-modules:parameter-type-not-in-doc
|
||||||
|
plugins/connection/oc.py import-2.6!skip
|
||||||
|
plugins/connection/oc.py import-2.7!skip
|
||||||
|
plugins/connection/oc.py import-3.5!skip
|
||||||
|
plugins/connection/oc.py compile-2.6!skip
|
||||||
|
plugins/connection/oc.py compile-2.7!skip
|
||||||
|
plugins/connection/oc.py compile-3.5!skip
|
||||||
|
plugins/inventory/openshift.py import-2.6!skip
|
||||||
|
plugins/inventory/openshift.py import-2.7!skip
|
||||||
|
plugins/inventory/openshift.py import-3.5!skip
|
||||||
|
plugins/inventory/openshift.py compile-2.6!skip
|
||||||
|
plugins/inventory/openshift.py compile-2.7!skip
|
||||||
|
plugins/inventory/openshift.py compile-3.5!skip
|
||||||
|
plugins/modules/openshift_route.py import-2.6!skip
|
||||||
|
plugins/modules/openshift_route.py import-2.7!skip
|
||||||
|
plugins/modules/openshift_route.py import-3.5!skip
|
||||||
|
plugins/modules/openshift_route.py compile-2.6!skip
|
||||||
|
plugins/modules/openshift_route.py compile-2.7!skip
|
||||||
|
plugins/modules/openshift_route.py compile-3.5!skip
|
||||||
|
plugins/modules/k8s.py import-2.6!skip
|
||||||
|
plugins/modules/k8s.py import-2.7!skip
|
||||||
|
plugins/modules/k8s.py import-3.5!skip
|
||||||
|
plugins/modules/k8s.py compile-2.6!skip
|
||||||
|
plugins/modules/k8s.py compile-2.7!skip
|
||||||
|
plugins/modules/k8s.py compile-3.5!skip
|
||||||
|
plugins/modules/openshift_process.py import-2.6!skip
|
||||||
|
plugins/modules/openshift_process.py import-2.7!skip
|
||||||
|
plugins/modules/openshift_process.py import-3.5!skip
|
||||||
|
plugins/modules/openshift_process.py compile-2.6!skip
|
||||||
|
plugins/modules/openshift_process.py compile-2.7!skip
|
||||||
|
plugins/modules/openshift_process.py compile-3.5!skip
|
||||||
|
plugins/modules/openshift_adm_groups_sync.py import-2.6!skip
|
||||||
|
plugins/modules/openshift_adm_groups_sync.py import-2.7!skip
|
||||||
|
plugins/modules/openshift_adm_groups_sync.py import-3.5!skip
|
||||||
|
plugins/modules/openshift_adm_groups_sync.py compile-2.6!skip
|
||||||
|
plugins/modules/openshift_adm_groups_sync.py compile-2.7!skip
|
||||||
|
plugins/modules/openshift_adm_groups_sync.py compile-3.5!skip
|
||||||
|
plugins/modules/openshift_adm_migrate_template_instances.py import-2.6!skip
|
||||||
|
plugins/modules/openshift_adm_migrate_template_instances.py import-2.7!skip
|
||||||
|
plugins/modules/openshift_adm_migrate_template_instances.py import-3.5!skip
|
||||||
|
plugins/modules/openshift_adm_migrate_template_instances.py compile-2.6!skip
|
||||||
|
plugins/modules/openshift_adm_migrate_template_instances.py compile-2.7!skip
|
||||||
|
plugins/modules/openshift_adm_migrate_template_instances.py compile-3.5!skip
|
||||||
|
plugins/modules/openshift_adm_prune_auth.py import-2.6!skip
|
||||||
|
plugins/modules/openshift_adm_prune_auth.py import-2.7!skip
|
||||||
|
plugins/modules/openshift_adm_prune_auth.py import-3.5!skip
|
||||||
|
plugins/modules/openshift_adm_prune_auth.py compile-2.6!skip
|
||||||
|
plugins/modules/openshift_adm_prune_auth.py compile-2.7!skip
|
||||||
|
plugins/modules/openshift_adm_prune_auth.py compile-3.5!skip
|
||||||
|
plugins/modules/openshift_adm_prune_deployments.py import-2.6!skip
|
||||||
|
plugins/modules/openshift_adm_prune_deployments.py import-2.7!skip
|
||||||
|
plugins/modules/openshift_adm_prune_deployments.py import-3.5!skip
|
||||||
|
plugins/modules/openshift_adm_prune_deployments.py compile-2.6!skip
|
||||||
|
plugins/modules/openshift_adm_prune_deployments.py compile-2.7!skip
|
||||||
|
plugins/modules/openshift_adm_prune_deployments.py compile-3.5!skip
|
||||||
|
plugins/modules/openshift_adm_prune_images.py import-2.6!skip
|
||||||
|
plugins/modules/openshift_adm_prune_images.py import-2.7!skip
|
||||||
|
plugins/modules/openshift_adm_prune_images.py import-3.5!skip
|
||||||
|
plugins/modules/openshift_adm_prune_images.py compile-2.6!skip
|
||||||
|
plugins/modules/openshift_adm_prune_images.py compile-2.7!skip
|
||||||
|
plugins/modules/openshift_adm_prune_images.py compile-3.5!skip
|
||||||
|
plugins/modules/openshift_auth.py import-2.6!skip
|
||||||
|
plugins/modules/openshift_auth.py import-2.7!skip
|
||||||
|
plugins/modules/openshift_auth.py import-3.5!skip
|
||||||
|
plugins/modules/openshift_auth.py compile-2.6!skip
|
||||||
|
plugins/modules/openshift_auth.py compile-2.7!skip
|
||||||
|
plugins/modules/openshift_auth.py compile-3.5!skip
|
||||||
|
plugins/modules/openshift_import_image.py import-2.6!skip
|
||||||
|
plugins/modules/openshift_import_image.py import-2.7!skip
|
||||||
|
plugins/modules/openshift_import_image.py import-3.5!skip
|
||||||
|
plugins/modules/openshift_import_image.py compile-2.6!skip
|
||||||
|
plugins/modules/openshift_import_image.py compile-2.7!skip
|
||||||
|
plugins/modules/openshift_import_image.py compile-3.5!skip
|
||||||
|
plugins/modules/openshift_registry_info.py import-2.6!skip
|
||||||
|
plugins/modules/openshift_registry_info.py import-2.7!skip
|
||||||
|
plugins/modules/openshift_registry_info.py import-3.5!skip
|
||||||
|
plugins/modules/openshift_registry_info.py compile-2.6!skip
|
||||||
|
plugins/modules/openshift_registry_info.py compile-2.7!skip
|
||||||
|
plugins/modules/openshift_registry_info.py compile-3.5!skip
|
||||||
|
plugins/module_utils/k8s.py import-2.6!skip
|
||||||
|
plugins/module_utils/k8s.py import-2.7!skip
|
||||||
|
plugins/module_utils/k8s.py import-3.5!skip
|
||||||
|
plugins/module_utils/k8s.py compile-2.6!skip
|
||||||
|
plugins/module_utils/k8s.py compile-2.7!skip
|
||||||
|
plugins/module_utils/k8s.py compile-3.5!skip
|
||||||
|
plugins/module_utils/openshift_process.py import-2.6!skip
|
||||||
|
plugins/module_utils/openshift_process.py import-2.7!skip
|
||||||
|
plugins/module_utils/openshift_process.py import-3.5!skip
|
||||||
|
plugins/module_utils/openshift_process.py compile-2.6!skip
|
||||||
|
plugins/module_utils/openshift_process.py compile-2.7!skip
|
||||||
|
plugins/module_utils/openshift_process.py compile-3.5!skip
|
||||||
|
plugins/module_utils/openshift_adm_prune_auth.py import-2.6!skip
|
||||||
|
plugins/module_utils/openshift_adm_prune_auth.py import-2.7!skip
|
||||||
|
plugins/module_utils/openshift_adm_prune_auth.py import-3.5!skip
|
||||||
|
plugins/module_utils/openshift_adm_prune_auth.py compile-2.6!skip
|
||||||
|
plugins/module_utils/openshift_adm_prune_auth.py compile-2.7!skip
|
||||||
|
plugins/module_utils/openshift_adm_prune_auth.py compile-3.5!skip
|
||||||
|
plugins/module_utils/openshift_adm_prune_deployments.py import-2.6!skip
|
||||||
|
plugins/module_utils/openshift_adm_prune_deployments.py import-2.7!skip
|
||||||
|
plugins/module_utils/openshift_adm_prune_deployments.py import-3.5!skip
|
||||||
|
plugins/module_utils/openshift_adm_prune_deployments.py compile-2.6!skip
|
||||||
|
plugins/module_utils/openshift_adm_prune_deployments.py compile-2.7!skip
|
||||||
|
plugins/module_utils/openshift_adm_prune_deployments.py compile-3.5!skip
|
||||||
|
plugins/module_utils/openshift_ldap.py import-2.6!skip
|
||||||
|
plugins/module_utils/openshift_ldap.py import-2.7!skip
|
||||||
|
plugins/module_utils/openshift_ldap.py import-3.5!skip
|
||||||
|
plugins/module_utils/openshift_ldap.py compile-2.6!skip
|
||||||
|
plugins/module_utils/openshift_ldap.py compile-2.7!skip
|
||||||
|
plugins/module_utils/openshift_ldap.py compile-3.5!skip
|
||||||
|
plugins/module_utils/openshift_adm_prune_images.py import-2.6!skip
|
||||||
|
plugins/module_utils/openshift_adm_prune_images.py import-2.7!skip
|
||||||
|
plugins/module_utils/openshift_adm_prune_images.py import-3.5!skip
|
||||||
|
plugins/module_utils/openshift_adm_prune_images.py compile-2.6!skip
|
||||||
|
plugins/module_utils/openshift_adm_prune_images.py compile-2.7!skip
|
||||||
|
plugins/module_utils/openshift_adm_prune_images.py compile-3.5!skip
|
||||||
|
plugins/module_utils/openshift_docker_image.py import-2.6!skip
|
||||||
|
plugins/module_utils/openshift_docker_image.py import-2.7!skip
|
||||||
|
plugins/module_utils/openshift_docker_image.py import-3.5!skip
|
||||||
|
plugins/module_utils/openshift_docker_image.py compile-2.6!skip
|
||||||
|
plugins/module_utils/openshift_docker_image.py compile-2.7!skip
|
||||||
|
plugins/module_utils/openshift_docker_image.py compile-3.5!skip
|
||||||
|
plugins/module_utils/openshift_import_image.py import-2.6!skip
|
||||||
|
plugins/module_utils/openshift_import_image.py import-2.7!skip
|
||||||
|
plugins/module_utils/openshift_import_image.py import-3.5!skip
|
||||||
|
plugins/module_utils/openshift_import_image.py compile-2.6!skip
|
||||||
|
plugins/module_utils/openshift_import_image.py compile-2.7!skip
|
||||||
|
plugins/module_utils/openshift_import_image.py compile-3.5!skip
|
||||||
|
plugins/module_utils/openshift_groups.py import-2.6!skip
|
||||||
|
plugins/module_utils/openshift_groups.py import-2.7!skip
|
||||||
|
plugins/module_utils/openshift_groups.py import-3.5!skip
|
||||||
|
plugins/module_utils/openshift_groups.py compile-2.6!skip
|
||||||
|
plugins/module_utils/openshift_groups.py compile-2.7!skip
|
||||||
|
plugins/module_utils/openshift_groups.py compile-3.5!skip
|
||||||
|
plugins/module_utils/openshift_images_common.py import-2.6!skip
|
||||||
|
plugins/module_utils/openshift_images_common.py import-2.7!skip
|
||||||
|
plugins/module_utils/openshift_images_common.py import-3.5!skip
|
||||||
|
plugins/module_utils/openshift_images_common.py compile-2.6!skip
|
||||||
|
plugins/module_utils/openshift_images_common.py compile-2.7!skip
|
||||||
|
plugins/module_utils/openshift_images_common.py compile-3.5!skip
|
||||||
|
plugins/module_utils/openshift_registry.py import-2.6!skip
|
||||||
|
plugins/module_utils/openshift_registry.py import-2.7!skip
|
||||||
|
plugins/module_utils/openshift_registry.py import-3.5!skip
|
||||||
|
plugins/module_utils/openshift_registry.py compile-2.6!skip
|
||||||
|
plugins/module_utils/openshift_registry.py compile-2.7!skip
|
||||||
|
plugins/module_utils/openshift_registry.py compile-3.5!skip
|
||||||
|
plugins/module_utils/openshift_builds.py import-2.6!skip
|
||||||
|
plugins/module_utils/openshift_builds.py import-2.7!skip
|
||||||
|
plugins/module_utils/openshift_builds.py import-3.5!skip
|
||||||
|
plugins/module_utils/openshift_builds.py compile-2.6!skip
|
||||||
|
plugins/module_utils/openshift_builds.py compile-2.7!skip
|
||||||
|
plugins/module_utils/openshift_builds.py compile-3.5!skip
|
||||||
|
plugins/modules/openshift_build.py import-2.6!skip
|
||||||
|
plugins/modules/openshift_build.py import-2.7!skip
|
||||||
|
plugins/modules/openshift_build.py import-3.5!skip
|
||||||
|
plugins/modules/openshift_build.py compile-2.6!skip
|
||||||
|
plugins/modules/openshift_build.py compile-2.7!skip
|
||||||
|
plugins/modules/openshift_build.py compile-3.5!skip
|
||||||
|
plugins/modules/openshift_adm_prune_builds.py import-2.6!skip
|
||||||
|
plugins/modules/openshift_adm_prune_builds.py import-2.7!skip
|
||||||
|
plugins/modules/openshift_adm_prune_builds.py import-3.5!skip
|
||||||
|
plugins/modules/openshift_adm_prune_builds.py compile-2.6!skip
|
||||||
|
plugins/modules/openshift_adm_prune_builds.py compile-2.7!skip
|
||||||
|
plugins/modules/openshift_adm_prune_builds.py compile-3.5!skip
|
||||||
|
plugins/module_utils/openshift_common.py import-2.6!skip
|
||||||
|
plugins/module_utils/openshift_common.py import-2.7!skip
|
||||||
|
plugins/module_utils/openshift_common.py import-3.5!skip
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
plugins/modules/k8s.py validate-modules:parameter-type-not-in-doc
|
||||||
|
plugins/module_utils/k8s.py pylint:bad-option-value
|
||||||
|
plugins/modules/openshift_process.py validate-modules:parameter-type-not-in-doc
|
||||||
@@ -8,7 +8,7 @@ install_command = pip install {opts} {packages}
|
|||||||
|
|
||||||
[testenv:black]
|
[testenv:black]
|
||||||
deps =
|
deps =
|
||||||
black >= 25.0, < 26.0
|
black >= 23.0, < 24.0
|
||||||
|
|
||||||
commands =
|
commands =
|
||||||
black {toxinidir}/plugins {toxinidir}/tests
|
black {toxinidir}/plugins {toxinidir}/tests
|
||||||
@@ -24,12 +24,10 @@ commands =
|
|||||||
deps =
|
deps =
|
||||||
flake8
|
flake8
|
||||||
{[testenv:black]deps}
|
{[testenv:black]deps}
|
||||||
{[testenv:ansible-lint]deps}
|
|
||||||
|
|
||||||
commands =
|
commands =
|
||||||
black -v --check --diff {toxinidir}/plugins {toxinidir}/tests
|
black -v --check --diff {toxinidir}/plugins {toxinidir}/tests
|
||||||
flake8 {toxinidir}
|
flake8 {toxinidir}
|
||||||
ansible-lint
|
|
||||||
|
|
||||||
[flake8]
|
[flake8]
|
||||||
# E123, E125 skipped as they are invalid PEP-8.
|
# E123, E125 skipped as they are invalid PEP-8.
|
||||||
|
|||||||
Reference in New Issue
Block a user