Compare commits

..
10 Commits
Author SHA1 Message Date
Bikouo AubinandGitHub 97ed9be7d9 Release 4.0.0 (#235)
* Prepare release 4.0.0

* Update kubernetes.core dependency to 5.0.0

* documentation update
2024-06-13 15:35:12 +00:00
Bikouo AubinandGitHub e5b3e5b73e [stable-4] Fix action group documentation issue for downstream build (#232) (#234)
* Fix action group documentation issue for downstream build (#232)

(cherry picked from commit 59e78926ec)

* update Makefile
2024-06-10 15:40:07 +00:00
Bikouo AubinandGitHub 0e884c2341 k8s - Remove support of merge_type=json (#226) 2024-05-28 17:13:25 +00:00
Bikouo AubinandGitHub 050e236aa6 Defer removal of inventory/openshift to 5.0.0 (#224)
* Defer removal of inventory/openshift to 5.0.0

* add pull request number
2024-05-28 17:43:38 +02:00
Bikouo AubinandGitHub 2c394132aa connection/oc - add option oc_local_env_vars (#225)
* add local env vars for connection/oc plugin

* Fix sanity tests
2024-05-28 13:44:03 +00:00
Bharat BabbarandGitHub fcc19da20a Update k8s.py (#218)
docs.ansible.com is managed by Red Hat and I found that the example to create the OCP/OKD project was missing in this hence I have added the below snippet:

    - name: Create an OCP project
      community.okd.k8s:
        state: present
        resource_definition:
          apiVersion: project.openshift.io/v1
          kind: Project
          metadata:
            name: testing

Please add this to the man pages also.
2024-01-18 15:22:39 +00:00
Alina BuzachisandGitHub 31c2df50ed Remove useless tests/sanity/ignore-2.*.txt files lower than 2.14 (#213)
Signed-off-by: Alina Buzachis <abuzachis@redhat.com>
2023-12-12 16:29:00 +00:00
ca8b491f87 Push release 3.0.1 changes into main branch (#211)
* Prepare release 3.0.0 (#206)

* Preapare release 3.0.0

* Added release summary

* Drop ansible 2.9 mentions

* Add .gitignore to downstream build files (#208) (#209)

This is required for ansible-lint.

(cherry picked from commit 7988daff93)

* Release version 3.0.1 (#210)

* Running tests locally (#207)

* Running tests locally

* create temporary directory to run tests in

* clean for molecule target

* Update Makefile

Co-authored-by: Mike Graves <mgraves@redhat.com>

---------

Co-authored-by: Mike Graves <mgraves@redhat.com>

---------

Co-authored-by: GomathiselviS <gomathiselvi@gmail.com>
Co-authored-by: Mike Graves <mgraves@redhat.com>
2023-12-11 18:07:16 +00:00
Bikouo AubinandGitHub b5b2f67015 fix integration unsafe asserts (#212) 2023-12-11 17:57:20 +01:00
Mike GravesandGitHub 7988daff93 Add .gitignore to downstream build files (#208)
This is required for ansible-lint.
2023-11-30 06:11:26 +00:00
27 changed files with 161 additions and 259 deletions
+18 -1
View File
@@ -4,6 +4,24 @@ OKD Collection Release Notes
.. contents:: Topics .. contents:: Topics
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 v3.0.1
====== ======
@@ -13,7 +31,6 @@ Release Summary
This patch release fixes an issue in building the downstream collection. This patch release fixes an issue in building the downstream collection.
v3.0.0 v3.0.0
====== ======
+6 -9
View File
@@ -1,34 +1,31 @@
.PHONY: molecule .PHONY: molecule
# Also needs to be updated in galaxy.yml # Also needs to be updated in galaxy.yml
VERSION = 3.0.1 VERSION = 4.0.0
SANITY_TEST_ARGS ?= --docker --color SANITY_TEST_ARGS ?= --docker --color
UNITS_TEST_ARGS ?= --docker --color UNITS_TEST_ARGS ?= --docker --color
PYTHON_VERSION ?= `python3 -c 'import platform; print("{0}.{1}".format(platform.python_version_tuple()[0], platform.python_version_tuple()[1]))'` PYTHON_VERSION ?= `python3 -c 'import platform; print("{0}.{1}".format(platform.python_version_tuple()[0], platform.python_version_tuple()[1]))'`
# this expression compute the install path once for all the execution
# See: https://stackoverflow.com/questions/44114466/how-to-declare-a-deferred-variable-that-is-computed-only-once-for-all
INSTALL_PATH ?= $(eval INSTALL_PATH := $(shell mktemp -d))$(INSTALL_PATH)
clean: clean:
rm -f community-okd-$(VERSION).tar.gz rm -f community-okd-$(VERSION).tar.gz
rm -f redhat-openshift-$(VERSION).tar.gz rm -f redhat-openshift-$(VERSION).tar.gz
rm -rf $(INSTALL_PATH) rm -rf ansible_collections
build: clean build: clean
ansible-galaxy collection build ansible-galaxy collection build
install: build install: build
ansible-galaxy collection install --force -p $(INSTALL_PATH) community-okd-$(VERSION).tar.gz ansible-galaxy collection install --force -p ansible_collections community-okd-$(VERSION).tar.gz
sanity: install sanity: install
cd $(INSTALL_PATH)/ansible_collections/community/okd && ansible-test sanity -v --python $(PYTHON_VERSION) $(SANITY_TEST_ARGS) && rm -rf $(INSTALL_PATH) cd ansible_collections/community/okd && ansible-test sanity -v --python $(PYTHON_VERSION) $(SANITY_TEST_ARGS)
units: install units: install
cd $(INSTALL_PATH)/ansible_collections/community/okd && ansible-test units -v --python $(PYTHON_VERSION) $(UNITS_TEST_ARGS) && rm -rf $(INSTALL_PATH) cd ansible_collections/community/okd && ansible-test units -v --python $(PYTHON_VERSION) $(UNITS_TEST_ARGS)
molecule: install molecule: install
cd $(INSTALL_PATH)/ansible_collections/community/okd && molecule test && rm -rf $(INSTALL_PATH) molecule test
test-integration: upstream-test-integration downstream-test-integration test-integration: upstream-test-integration downstream-test-integration
+2 -2
View File
@@ -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.14.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`). 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: 3.0.1 version: 4.0.0
``` ```
### Installing the Kubernetes Python Library ### Installing the Kubernetes Python Library
+17
View File
@@ -224,3 +224,20 @@ releases:
- downstream-gitignore.yml - downstream-gitignore.yml
- release_summary.yml - release_summary.yml
release_date: '2023-11-30' 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'
+2 -1
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="3.0.1" DOWNSTREAM_VERSION="4.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,6 +50,7 @@ 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
} }
+6
View File
@@ -11,6 +11,12 @@ 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', '')
+10 -2
View File
@@ -433,7 +433,6 @@ 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>
@@ -445,7 +444,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>[&#x27;strategic-merge&#x27;, &#x27;merge&#x27;]</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>[&#x27;strategic-merge&#x27;, &#x27;merge&#x27;]</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> is deprecated and will be removed in version 3.0.0. Please use <span class='module'>kubernetes.core.k8s_json_patch</span> instead.</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>
</td> </td>
</tr> </tr>
<tr> <tr>
@@ -970,6 +969,15 @@ 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
+21
View File
@@ -208,6 +208,27 @@ 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>
+2 -2
View File
@@ -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 4.0.0. remove the openshift inventory plugin in release 5.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 4.0.0. *[deprecated]* - This inventory will be removed in version 5.0.0. *[deprecated]*
- For more information see `DEPRECATED`_. - For more information see `DEPRECATED`_.
+2 -2
View File
@@ -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: '>=3.0.0' kubernetes.core: '>=5.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: 3.0.1 version: 4.0.0
+3 -3
View File
@@ -1,5 +1,5 @@
--- ---
requires_ansible: '>=2.14.0' requires_ansible: '>=2.15.0'
action_groups: action_groups:
okd: okd:
- k8s - k8s
@@ -20,10 +20,10 @@ plugin_routing:
inventory: inventory:
openshift: openshift:
deprecation: deprecation:
removal_version: 4.0.0 removal_version: 5.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 4.0.0. will be removed in release 5.0.0.
action: action:
k8s: k8s:
redirect: kubernetes.core.k8s_info redirect: kubernetes.core.k8s_info
@@ -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:
@@ -223,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
@@ -177,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
@@ -192,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:
@@ -262,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:
@@ -315,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:
+7 -7
View File
@@ -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:
+9
View File
@@ -106,6 +106,15 @@ 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.
+4 -4
View File
@@ -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: 4.0.0 removed_in: 5.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 4.0.0. remove the openshift inventory plugin in release 5.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 4.0.0", "The 'openshift' inventory plugin has been deprecated and will be removed in release 5.0.0",
version="4.0.0", version="5.0.0",
collection_name="community.okd", collection_name="community.okd",
) )
+11 -3
View File
@@ -64,9 +64,8 @@ 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) is deprecated and will be removed in version 3.0.0. Please use M(kubernetes.core.k8s_json_patch) instead. - I(merge_type=json) has been removed in version 4.0.0. Please use M(kubernetes.core.k8s_json_patch) instead.
choices: choices:
- json
- merge - merge
- strategic-merge - strategic-merge
type: list type: list
@@ -145,6 +144,15 @@ 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
@@ -284,7 +292,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=["json", "merge", "strategic-merge"] type="list", elements="str", choices=["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)
-4
View File
@@ -1,4 +0,0 @@
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
-169
View File
@@ -1,169 +0,0 @@
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
-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
-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
-3
View File
@@ -1,3 +0,0 @@
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