mirror of
https://github.com/openshift/community.okd.git
synced 2026-11-22 07:00:26 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
18afe96096 | ||
|
|
a37175c6f9 | ||
|
|
b4950f525c | ||
|
|
55ccaf3394 | ||
|
|
90e7bf975e | ||
|
|
db863c9089 | ||
|
|
a890d14253 | ||
|
|
3833922158 | ||
|
|
97ed9be7d9 | ||
|
|
e5b3e5b73e |
@@ -0,0 +1,15 @@
|
||||
---
|
||||
|
||||
profile: production
|
||||
|
||||
exclude_paths:
|
||||
- tests/unit
|
||||
- tests/sanity
|
||||
- molecule
|
||||
- changelogs
|
||||
- docs
|
||||
- .ansible
|
||||
- .github
|
||||
|
||||
warn_list:
|
||||
- no-log-password
|
||||
@@ -1,5 +0,0 @@
|
||||
---
|
||||
profile: production
|
||||
exclude_paths:
|
||||
- molecule
|
||||
- tests/sanity
|
||||
+34
-1
@@ -4,6 +4,40 @@ OKD Collection Release Notes
|
||||
|
||||
.. 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
|
||||
======
|
||||
@@ -13,7 +47,6 @@ Release Summary
|
||||
|
||||
This patch release fixes an issue in building the downstream collection.
|
||||
|
||||
|
||||
v3.0.0
|
||||
======
|
||||
|
||||
|
||||
@@ -1,34 +1,31 @@
|
||||
.PHONY: molecule
|
||||
|
||||
# Also needs to be updated in galaxy.yml
|
||||
VERSION = 3.0.1
|
||||
VERSION = 4.0.2
|
||||
|
||||
SANITY_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]))'`
|
||||
# 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:
|
||||
rm -f community-okd-$(VERSION).tar.gz
|
||||
rm -f redhat-openshift-$(VERSION).tar.gz
|
||||
rm -rf $(INSTALL_PATH)
|
||||
rm -rf ansible_collections
|
||||
|
||||
build: clean
|
||||
ansible-galaxy collection 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
|
||||
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
|
||||
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
|
||||
cd $(INSTALL_PATH)/ansible_collections/community/okd && molecule test && rm -rf $(INSTALL_PATH)
|
||||
molecule test
|
||||
|
||||
test-integration: upstream-test-integration downstream-test-integration
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@ The collection includes a variety of Ansible content to help automate the manage
|
||||
<!--start requires_ansible-->
|
||||
## 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`).
|
||||
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:
|
||||
- name: community.okd
|
||||
version: 3.0.1
|
||||
version: 4.0.2
|
||||
```
|
||||
|
||||
### Installing the Kubernetes Python Library
|
||||
|
||||
@@ -224,3 +224,36 @@ releases:
|
||||
- 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 +0,0 @@
|
||||
---
|
||||
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).
|
||||
@@ -1,2 +0,0 @@
|
||||
minor_changes:
|
||||
- inventory/openshift.py - Defer removal of k8s inventory plugin to version 5.0.0 (https://github.com/openshift/community.okd/pull/224).
|
||||
@@ -1,2 +0,0 @@
|
||||
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).
|
||||
+8
-8
@@ -5,26 +5,26 @@ ENV OPERATOR=/usr/local/bin/ansible-operator \
|
||||
USER_NAME=ansible-operator\
|
||||
HOME=/opt/ansible \
|
||||
ANSIBLE_LOCAL_TMP=/opt/ansible/tmp \
|
||||
DOWNSTREAM_BUILD_PYTHON=python3.9
|
||||
DOWNSTREAM_BUILD_PYTHON=python3.12
|
||||
|
||||
RUN yum install -y \
|
||||
glibc-langpack-en \
|
||||
git \
|
||||
make \
|
||||
python3 \
|
||||
python3-devel \
|
||||
python3-pip \
|
||||
python3-setuptools \
|
||||
python3.12 \
|
||||
python3.12-devel \
|
||||
python3.12-pip \
|
||||
python3.12-setuptools \
|
||||
gcc \
|
||||
openldap-devel \
|
||||
&& python3.9 -m pip install --no-cache-dir --upgrade setuptools pip \
|
||||
&& python3.9 -m pip install --no-cache-dir \
|
||||
&& python3.12 -m pip install --no-cache-dir --upgrade setuptools pip \
|
||||
&& python3.12 -m pip install --no-cache-dir \
|
||||
kubernetes \
|
||||
"ansible-core" \
|
||||
"molecule" \
|
||||
&& yum clean all \
|
||||
&& rm -rf $HOME/.cache \
|
||||
&& curl -L https://github.com/openshift/okd/releases/download/4.12.0-0.okd-2023-04-16-041331/openshift-client-linux-4.12.0-0.okd-2023-04-16-041331.tar.gz | tar -xz -C /usr/local/bin
|
||||
&& curl -L https://github.com/okd-project/okd/releases/download/4.20.0-okd-scos.17/openshift-client-linux-amd64-rhel9-4.20.0-okd-scos.17.tar.gz | tar -xz -C /usr/local/bin
|
||||
# TODO: Is there a better way to install this client in ubi8?
|
||||
|
||||
COPY . /opt/ansible
|
||||
|
||||
+3
-2
@@ -9,7 +9,7 @@
|
||||
# - All functions are prefixed with f_ so it's obvious where they come
|
||||
# from when in use throughout the script
|
||||
|
||||
DOWNSTREAM_VERSION="3.0.1"
|
||||
DOWNSTREAM_VERSION="4.0.2"
|
||||
KEEP_DOWNSTREAM_TMPDIR="${KEEP_DOWNSTREAM_TMPDIR:-''}"
|
||||
INSTALL_DOWNSTREAM_COLLECTION_PATH="${INSTALL_DOWNSTREAM_COLLECTION_PATH:-}"
|
||||
_build_dir=""
|
||||
@@ -50,6 +50,7 @@ f_text_sub()
|
||||
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/group\/redhat\.openshift\.okd/redhat\.openshift\.openshift/g" {} \;
|
||||
find "${_build_dir}" -type f -name "*.bak" -delete
|
||||
}
|
||||
|
||||
@@ -63,6 +64,7 @@ f_prep()
|
||||
# Files to copy downstream (relative repo root dir path)
|
||||
_file_manifest=(
|
||||
.gitignore
|
||||
.ansible-lint
|
||||
CHANGELOG.rst
|
||||
galaxy.yml
|
||||
LICENSE
|
||||
@@ -76,7 +78,6 @@ f_prep()
|
||||
|
||||
# Directories to recursively copy downstream (relative repo root dir path)
|
||||
_dir_manifest=(
|
||||
.config
|
||||
changelogs
|
||||
ci
|
||||
meta
|
||||
|
||||
@@ -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>['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><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
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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`_.
|
||||
|
||||
|
||||
|
||||
+2
-2
@@ -5,7 +5,7 @@ authors:
|
||||
- willthames (https://github.com/willthames)
|
||||
- Akasurde (https://github.com/akasurde)
|
||||
dependencies:
|
||||
kubernetes.core: '>=3.0.0'
|
||||
kubernetes.core: '>=5.0.0,<6.0.0'
|
||||
description: OKD Collection for Ansible.
|
||||
documentation: ''
|
||||
homepage: ''
|
||||
@@ -24,4 +24,4 @@ tags:
|
||||
- okd
|
||||
- cluster
|
||||
# Also needs to be updated in the Makefile
|
||||
version: 3.0.1
|
||||
version: 4.0.2
|
||||
|
||||
+1
-1
@@ -1,5 +1,5 @@
|
||||
---
|
||||
requires_ansible: '>=2.14.0'
|
||||
requires_ansible: '>=2.15.0'
|
||||
action_groups:
|
||||
okd:
|
||||
- k8s
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
# Want to make sure comments don't break it
|
||||
export NAME=test123
|
||||
NAMESPACE=openshift
|
||||
NGINX_VERSION=1.22-ubi8
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -23,8 +23,8 @@ provisioner:
|
||||
host_vars:
|
||||
localhost:
|
||||
virtualenv: ${MOLECULE_EPHEMERAL_DIRECTORY}/virtualenv
|
||||
virtualenv_command: '{{ ansible_playbook_python }} -m virtualenv'
|
||||
virtualenv_interpreter: '{{ virtualenv }}/bin/python'
|
||||
virtualenv_command: '{{ ansible_playbook_python }} -m venv'
|
||||
virtualenv_interpreter: '{{ virtualenv }}/bin/python3'
|
||||
playbook_namespace: molecule-tests
|
||||
env:
|
||||
ANSIBLE_FORCE_COLOR: 'true'
|
||||
|
||||
@@ -13,6 +13,7 @@
|
||||
- kubernetes>=12.0.0
|
||||
- coverage
|
||||
- python-ldap
|
||||
- packaging
|
||||
virtualenv: "{{ virtualenv }}"
|
||||
virtualenv_command: "{{ virtualenv_command }}"
|
||||
virtualenv_site_packages: no
|
||||
|
||||
@@ -47,8 +47,8 @@
|
||||
assert:
|
||||
that:
|
||||
- result is changed
|
||||
- admins_group
|
||||
- devs_group
|
||||
- admins_group | length > 0
|
||||
- devs_group | length > 0
|
||||
- '"jane.smith@ansible.org" in admins_group.users'
|
||||
- '"jim.adams@ansible.org" in admins_group.users'
|
||||
- '"jordanbulls@ansible.org" in devs_group.users'
|
||||
|
||||
@@ -47,8 +47,8 @@
|
||||
assert:
|
||||
that:
|
||||
- result is changed
|
||||
- banking_group
|
||||
- insurance_group
|
||||
- banking_group | length > 0
|
||||
- insurance_group | length > 0
|
||||
- '"james-allan@ansible.org" in banking_group.users'
|
||||
- '"gordon-kane@ansible.org" in banking_group.users'
|
||||
- '"alice-courtney@ansible.org" in insurance_group.users'
|
||||
|
||||
@@ -17,7 +17,8 @@
|
||||
spec:
|
||||
containers:
|
||||
- name: ldap
|
||||
image: bitnami/openldap
|
||||
# bitnami is no longer supporting this image. we should probably find a replacement
|
||||
image: docker.io/bitnamilegacy/openldap:latest
|
||||
env:
|
||||
- name: LDAP_ADMIN_USERNAME
|
||||
value: "{{ ldap_admin_user }}"
|
||||
|
||||
@@ -13,10 +13,8 @@
|
||||
|
||||
- pip:
|
||||
name:
|
||||
- kubernetes
|
||||
virtualenv: "{{ venv }}"
|
||||
virtualenv_command: "{{ virtualenv_command }}"
|
||||
virtualenv_site_packages: false
|
||||
- python-ldap
|
||||
state: absent
|
||||
|
||||
- name: Load test configurations
|
||||
set_fact:
|
||||
@@ -27,8 +25,6 @@
|
||||
config: "{{ configs.simple }}"
|
||||
register: result
|
||||
ignore_errors: true
|
||||
vars:
|
||||
ansible_python_interpreter: "{{ venv }}/bin/python"
|
||||
|
||||
- name: Check that module failed gracefully
|
||||
assert:
|
||||
@@ -36,6 +32,9 @@
|
||||
- '"Failed to import the required Python library (python-ldap)" in result.msg'
|
||||
|
||||
always:
|
||||
- pip:
|
||||
name:
|
||||
- python-ldap
|
||||
- name: Remove temp directory
|
||||
file:
|
||||
path: "{{ test_dir }}"
|
||||
|
||||
@@ -68,8 +68,8 @@
|
||||
assert:
|
||||
that:
|
||||
- result is changed
|
||||
- admins_group
|
||||
- devs_group
|
||||
- admins_group | length > 0
|
||||
- devs_group | length > 0
|
||||
- '"jane.smith@ansible.org" in admins_group.users'
|
||||
- '"jim.adams@ansible.org" in devs_group.users'
|
||||
- '"jordanbulls@ansible.org" in devs_group.users'
|
||||
@@ -89,8 +89,8 @@
|
||||
assert:
|
||||
that:
|
||||
- result is changed
|
||||
- admins_group
|
||||
- devs_group
|
||||
- admins_group | length > 0
|
||||
- devs_group | length > 0
|
||||
- '"jane.smith@ansible.org" in admins_group.users'
|
||||
- '"jim.adams@ansible.org" in devs_group.users'
|
||||
- '"jordanbulls@ansible.org" in devs_group.users'
|
||||
@@ -110,8 +110,8 @@
|
||||
assert:
|
||||
that:
|
||||
- result is changed
|
||||
- admins_group
|
||||
- devs_group
|
||||
- admins_group | length > 0
|
||||
- devs_group | length > 0
|
||||
- '"cn=Jane,ou=people,ou=rfc2307,"+ldap_root in admins_group.users'
|
||||
- '"cn=Jim,ou=people,ou=rfc2307,"+ldap_root in devs_group.users'
|
||||
- '"cn=Jordan,ou=people,ou=rfc2307,"+ldap_root in devs_group.users'
|
||||
@@ -131,8 +131,8 @@
|
||||
assert:
|
||||
that:
|
||||
- result is changed
|
||||
- admins_group
|
||||
- devs_group
|
||||
- admins_group | length > 0
|
||||
- devs_group | length > 0
|
||||
- '"jane.smith@ansible.org" in admins_group.users'
|
||||
- '"jim.adams@ansible.org" in devs_group.users'
|
||||
- '"jordanbulls@ansible.org" in devs_group.users'
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
- set_fact:
|
||||
test_sa: "clusterrole-sa"
|
||||
test_ns: "clusterrole-ns"
|
||||
test_tn: "clusterrole-tn"
|
||||
|
||||
- name: Ensure namespace
|
||||
kubernetes.core.k8s:
|
||||
@@ -26,34 +27,27 @@
|
||||
name: "{{ test_sa }}"
|
||||
namespace: "{{ test_ns }}"
|
||||
|
||||
- name: Read Service Account
|
||||
kubernetes.core.k8s_info:
|
||||
kind: ServiceAccount
|
||||
namespace: "{{ test_ns }}"
|
||||
name: "{{ test_sa }}"
|
||||
register: result
|
||||
|
||||
- set_fact:
|
||||
secret_token: "{{ result.resources[0]['secrets'][0]['name'] }}"
|
||||
- name: Create SA token
|
||||
kubernetes.core.k8s:
|
||||
definition:
|
||||
apiVersion: v1
|
||||
kind: Secret
|
||||
metadata:
|
||||
name: "{{ test_tn }}"
|
||||
namespace: "{{ test_ns }}"
|
||||
annotations:
|
||||
kubernetes.io/service-account.name: "{{ test_sa }}"
|
||||
type: kubernetes.io/service-account-token
|
||||
|
||||
- name: Get secret details
|
||||
kubernetes.core.k8s_info:
|
||||
kind: Secret
|
||||
namespace: '{{ test_ns }}'
|
||||
name: '{{ secret_token }}'
|
||||
namespace: "{{ test_ns }}"
|
||||
name: "{{ test_tn }}"
|
||||
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:
|
||||
api_token: "{{ _secret.resources[0]['data']['token'] | b64decode }}"
|
||||
when: "'token' in _secret.resources[0]['data']"
|
||||
|
||||
- name: list Node should failed (forbidden user)
|
||||
kubernetes.core.k8s_info:
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
test_ns: "prune-roles"
|
||||
sa_name: "roles-sa"
|
||||
pod_name: "pod-prune"
|
||||
tn_name: "roles-sa-token"
|
||||
role_definition:
|
||||
- name: pod-list
|
||||
labels:
|
||||
@@ -50,34 +51,27 @@
|
||||
name: '{{ sa_name }}'
|
||||
namespace: '{{ test_ns }}'
|
||||
|
||||
- name: Read Service Account
|
||||
kubernetes.core.k8s_info:
|
||||
kind: ServiceAccount
|
||||
namespace: '{{ test_ns }}'
|
||||
name: '{{ sa_name }}'
|
||||
register: sa_out
|
||||
|
||||
- set_fact:
|
||||
secret_token: "{{ sa_out.resources[0]['secrets'][0]['name'] }}"
|
||||
- name: Create SA secret
|
||||
kubernetes.core.k8s:
|
||||
definition:
|
||||
apiVersion: v1
|
||||
kind: Secret
|
||||
metadata:
|
||||
name: "{{ tn_name }}"
|
||||
namespace: "{{ test_ns }}"
|
||||
annotations:
|
||||
kubernetes.io/service-account.name: "{{ sa_name }}"
|
||||
type: kubernetes.io/service-account-token
|
||||
|
||||
- name: Get secret details
|
||||
kubernetes.core.k8s_info:
|
||||
kind: Secret
|
||||
namespace: '{{ test_ns }}'
|
||||
name: '{{ secret_token }}'
|
||||
name: '{{ tn_name }}'
|
||||
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:
|
||||
api_token: "{{ r_secret.resources[0]['data']['token'] | b64decode }}"
|
||||
when: "'token' in r_secret.resources[0]['data']"
|
||||
|
||||
- name: list resources using service account
|
||||
kubernetes.core.k8s_info:
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
parameters:
|
||||
NAMESPACE: openshift
|
||||
NAME: test123
|
||||
NGINX_VERSION: "{{ nginx_version }}"
|
||||
register: result
|
||||
|
||||
- name: Create the rendered resources
|
||||
@@ -32,6 +33,7 @@
|
||||
parameters:
|
||||
NAMESPACE: openshift
|
||||
NAME: test123
|
||||
NGINX_VERSION: "{{ nginx_version }}"
|
||||
state: present
|
||||
namespace_target: process-test
|
||||
register: result
|
||||
@@ -44,6 +46,7 @@
|
||||
NAMESPACE: openshift
|
||||
NAME: test123
|
||||
MEMORY_LIMIT: 1Gi
|
||||
NGINX_VERSION: "{{ nginx_version }}"
|
||||
state: present
|
||||
namespace_target: process-test
|
||||
register: result
|
||||
@@ -55,6 +58,7 @@
|
||||
parameters:
|
||||
NAMESPACE: openshift
|
||||
NAME: test123
|
||||
NGINX_VERSION: "{{ nginx_version }}"
|
||||
state: absent
|
||||
namespace_target: process-test
|
||||
register: result
|
||||
|
||||
@@ -213,5 +213,6 @@
|
||||
ignore_errors: true
|
||||
|
||||
when:
|
||||
- registry.public_hostname
|
||||
- registry.public_hostname is not none
|
||||
- registry.public_hostname | length > 0
|
||||
- registry.check.reached
|
||||
|
||||
@@ -44,10 +44,7 @@
|
||||
|
||||
tasks:
|
||||
- pip:
|
||||
name: kubernetes-validate==1.12.0
|
||||
virtualenv: "{{ virtualenv }}"
|
||||
virtualenv_command: "{{ virtualenv_command }}"
|
||||
virtualenv_site_packages: no
|
||||
name: kubernetes-validate==1.34.1
|
||||
|
||||
- import_tasks: tasks/validate_installed.yml
|
||||
|
||||
@@ -77,6 +74,7 @@
|
||||
- import_tasks: tasks/openshift_process.yml
|
||||
vars:
|
||||
files_dir: '{{ playbook_dir }}/files'
|
||||
nginx_version: 1.22-ubi8
|
||||
always:
|
||||
- name: Delete namespace
|
||||
community.okd.k8s:
|
||||
|
||||
@@ -295,9 +295,9 @@ class OpenShiftMigrateTemplateInstances(AnsibleOpenshiftModule):
|
||||
object_type in transforms.keys()
|
||||
and obj["ref"].get("apiVersion") != transforms[object_type]
|
||||
):
|
||||
ti_elem["status"]["objects"][i]["ref"][
|
||||
"apiVersion"
|
||||
] = transforms[object_type]
|
||||
ti_elem["status"]["objects"][i]["ref"]["apiVersion"] = (
|
||||
transforms[object_type]
|
||||
)
|
||||
ti_to_be_migrated.append(ti_elem)
|
||||
|
||||
return ti_to_be_migrated
|
||||
|
||||
@@ -224,8 +224,10 @@ def get_oauthaccesstoken_objectname_from_token(token_name):
|
||||
"""
|
||||
|
||||
sha256Prefix = "sha256~"
|
||||
content = token_name.strip(sha256Prefix)
|
||||
|
||||
if token_name.startswith(sha256Prefix):
|
||||
content = token_name[len(sha256Prefix) :]
|
||||
else:
|
||||
content = token_name
|
||||
b64encoded = urlsafe_b64encode(hashlib.sha256(content.encode()).digest()).rstrip(
|
||||
b"="
|
||||
)
|
||||
|
||||
@@ -421,9 +421,9 @@ class OpenShiftRoute(AnsibleOpenshiftModule):
|
||||
if tls_insecure_policy == "disallow":
|
||||
tls_insecure_policy = None
|
||||
else:
|
||||
tls_ca_cert = (
|
||||
tls_cert
|
||||
) = tls_dest_ca_cert = tls_key = tls_insecure_policy = None
|
||||
tls_ca_cert = tls_cert = tls_dest_ca_cert = tls_key = (
|
||||
tls_insecure_policy
|
||||
) = None
|
||||
|
||||
route = {
|
||||
"apiVersion": "route.openshift.io/v1",
|
||||
|
||||
@@ -0,0 +1,3 @@
|
||||
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
|
||||
@@ -0,0 +1,3 @@
|
||||
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
|
||||
@@ -8,7 +8,7 @@ install_command = pip install {opts} {packages}
|
||||
|
||||
[testenv:black]
|
||||
deps =
|
||||
black >= 23.0, < 24.0
|
||||
black >= 25.0, < 26.0
|
||||
|
||||
commands =
|
||||
black {toxinidir}/plugins {toxinidir}/tests
|
||||
@@ -16,6 +16,7 @@ commands =
|
||||
[testenv:ansible-lint]
|
||||
deps =
|
||||
ansible-lint==6.21.0
|
||||
ansible-core>=2.15.0,<2.19
|
||||
changedir = {toxinidir}
|
||||
commands =
|
||||
ansible-lint
|
||||
@@ -24,10 +25,12 @@ commands =
|
||||
deps =
|
||||
flake8
|
||||
{[testenv:black]deps}
|
||||
{[testenv:ansible-lint]deps}
|
||||
|
||||
commands =
|
||||
black -v --check --diff {toxinidir}/plugins {toxinidir}/tests
|
||||
flake8 {toxinidir}
|
||||
ansible-lint
|
||||
|
||||
[flake8]
|
||||
# E123, E125 skipped as they are invalid PEP-8.
|
||||
|
||||
Reference in New Issue
Block a user