Push 4.0.0 changes to main branch (#237)

* [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

* Release 4.0.0 (#235)

* Prepare release 4.0.0

* Update kubernetes.core dependency to 5.0.0

* documentation update
This commit is contained in:
Bikouo Aubin
2024-06-14 19:03:37 +02:00
committed by GitHub
parent 59e78926ec
commit adfb5ee140
13 changed files with 75 additions and 19 deletions

View File

@@ -433,7 +433,6 @@ Parameters
</td>
<td>
<ul style="margin: 0; padding: 0"><b>Choices:</b>
<li>json</li>
<li>merge</li>
<li>strategic-merge</li>
</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>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><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>
</tr>
<tr>
@@ -970,6 +969,15 @@ Examples
.. 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
community.okd.k8s:
name: testing

View File

@@ -208,6 +208,27 @@ Parameters
<div>Path to a oc config file. Defaults to <em>~/.kube/config</em></div>
</td>
</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>
<td colspan="1">
<div class="ansibleOptionAnchor" id="parameter-"></div>

View File

@@ -17,7 +17,7 @@ DEPRECATED
----------
:Removed in collection release after
: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.
@@ -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`_.