From 3b977e3564717957359c71bcd5720f1d7175c3c7 Mon Sep 17 00:00:00 2001 From: Jimmy Conner Date: Sat, 12 Sep 2026 00:01:30 -0500 Subject: [PATCH 1/4] Remove unused openshift package, include kubernetes --- requirements/requirements.in | 2 +- requirements/requirements.txt | 11 ++--------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/requirements/requirements.in b/requirements/requirements.in index 21cfc58be..4c16a61ac 100644 --- a/requirements/requirements.in +++ b/requirements/requirements.in @@ -35,9 +35,9 @@ irc jaraco.functools>= 4 jinja2>=3.1.6 # CVE-2025-27516 jsonschema +kubernetes Markdown>=3.8.1 # CVE-2025-69534 # used for formatting API help msal>=1.37.0 # cryptography>=49 compatibility (msal<1.37 caps cryptography<49) -openshift packaging==26.3 pexpect==4.7.0 # UPGRADE BLOCKER: 4.8+ enforces ansible-runner's searchwindowsize=100, see library notes prometheus-client diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 39d7da6a4..f4f7c79a1 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -213,7 +213,7 @@ jsonschema-specifications==2025.9.1 jwcrypto==1.6.0 # via django-oauth-toolkit kubernetes==36.0.3 - # via openshift + # via -r /awx_devel/requirements/requirements.in libvalkey==4.1.0 # via valkey lockfile==0.12.2 @@ -258,8 +258,6 @@ oauthlib==3.3.1 # django-oauth-toolkit # requests-oauthlib # social-auth-core -openshift==0.13.2 - # via -r /awx_devel/requirements/requirements.in packaging==26.3 # via # -r /awx_devel/requirements/requirements.in @@ -321,9 +319,7 @@ pyparsing==3.3.2 pyrad==2.5.4 # via django-radius python-daemon==3.1.2 - # via - # -r /awx_devel/requirements/requirements.in - # ansible-runner + # via -r /awx_devel/requirements/requirements.in python-dateutil==2.9.0.post0 # via # botocore @@ -336,8 +332,6 @@ python-ldap==3.4.7 # via # -r /awx_devel/requirements/requirements.in # django-auth-ldap -python-string-utils==1.0.0 - # via openshift python-tss-sdk==2.0.1 # via -r /awx_devel/requirements/requirements.in python3-openid==3.2.0 @@ -403,7 +397,6 @@ shellingham==1.5.4 six==1.17.0 # via # kubernetes - # openshift # pygerduty # python-dateutil # tacacs-plus From 37e8ff1c9b9805bf38256ac348e1a49ec65e3831 Mon Sep 17 00:00:00 2001 From: Jimmy Conner Date: Sat, 12 Sep 2026 00:23:51 -0500 Subject: [PATCH 2/4] ansible-runner dropped python-daemon finally --- requirements/requirements.in | 1 - requirements/requirements.txt | 4 ---- 2 files changed, 5 deletions(-) diff --git a/requirements/requirements.in b/requirements/requirements.in index 4c16a61ac..18625f98e 100644 --- a/requirements/requirements.in +++ b/requirements/requirements.in @@ -48,7 +48,6 @@ pygithub pyjwt[crypto] # used by vendored awx/dab jwt_consumer (formerly a django-ansible-base dep) pyopenssl>=26.4.0 # tracks cryptography pin above (pyopenssl 26.3.0 requires cryptography>=49) pyparsing>=3 # 3.x renamed the API; the grammar in awx/main/utils/filters.py needs ignore_whitespace(), which 2.x does not have -python-daemon>3.0.0 python-dsv-sdk>=1.0.4 python-tss-sdk>=1.2.1 python-ldap>=3.4.5 # CVE-2025-61911 CVE-2025-61912 diff --git a/requirements/requirements.txt b/requirements/requirements.txt index f4f7c79a1..e498ea150 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -216,8 +216,6 @@ kubernetes==36.0.3 # via -r /awx_devel/requirements/requirements.in libvalkey==4.1.0 # via valkey -lockfile==0.12.2 - # via python-daemon lxml==6.1.3 # via # python3-saml @@ -318,8 +316,6 @@ pyparsing==3.3.2 # via -r /awx_devel/requirements/requirements.in pyrad==2.5.4 # via django-radius -python-daemon==3.1.2 - # via -r /awx_devel/requirements/requirements.in python-dateutil==2.9.0.post0 # via # botocore From 7479a5474f12abaef7606a772f4529fbc187e186 Mon Sep 17 00:00:00 2001 From: Jimmy Conner Date: Sat, 12 Sep 2026 00:26:04 -0500 Subject: [PATCH 3/4] We don't use pexpect, so remove our pin Still included in by ansible-runner --- requirements/requirements.in | 1 - requirements/requirements.txt | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/requirements/requirements.in b/requirements/requirements.in index 18625f98e..9b7d08412 100644 --- a/requirements/requirements.in +++ b/requirements/requirements.in @@ -39,7 +39,6 @@ kubernetes Markdown>=3.8.1 # CVE-2025-69534 # used for formatting API help msal>=1.37.0 # cryptography>=49 compatibility (msal<1.37 caps cryptography<49) packaging==26.3 -pexpect==4.7.0 # UPGRADE BLOCKER: 4.8+ enforces ansible-runner's searchwindowsize=100, see library notes prometheus-client psycopg psutil diff --git a/requirements/requirements.txt b/requirements/requirements.txt index e498ea150..d07be9ad3 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -266,9 +266,7 @@ packaging==26.3 # vcs-versioning # wheel pexpect==4.7.0 - # via - # -r /awx_devel/requirements/requirements.in - # ansible-runner + # via ansible-runner pip==26.2.1 # via -r /awx_devel/requirements/requirements.in pkgconfig==1.6.0 From b748a6f435201f3aeb77ed83b3ebfbc33f0277e7 Mon Sep 17 00:00:00 2001 From: Jimmy Conner Date: Sat, 12 Sep 2026 01:12:03 -0500 Subject: [PATCH 4/4] Remove licenses and fix minikube --- docs/development/kind.md | 2 +- docs/development/minikube.md | 2 +- licenses/lockfile.txt | 21 -- licenses/openshift.txt | 201 ------------------ licenses/python-daemon.txt | 201 ------------------ licenses/python-string-utils.txt | 21 -- .../minikube/tasks/preflight.yml | 28 ++- 7 files changed, 22 insertions(+), 454 deletions(-) delete mode 100644 licenses/lockfile.txt delete mode 100644 licenses/openshift.txt delete mode 100644 licenses/python-daemon.txt delete mode 100644 licenses/python-string-utils.txt diff --git a/docs/development/kind.md b/docs/development/kind.md index f4d197f0f..a2aec4366 100644 --- a/docs/development/kind.md +++ b/docs/development/kind.md @@ -37,7 +37,7 @@ Clone the [awx-operator](https://github.com/ansible/awx-operator). For the following playbooks to work, you will need to: ```bash - pip install openshift + pip install kubernetes ``` If you are not changing any code in the operator itself, git checkout the latest version from https://github.com/ansible/awx-operator/releases, and then follow the instructions in the awx-operator [README](https://github.com/ansible/awx-operator#basic-install). diff --git a/docs/development/minikube.md b/docs/development/minikube.md index 71158b65e..81f6a0f76 100644 --- a/docs/development/minikube.md +++ b/docs/development/minikube.md @@ -32,7 +32,7 @@ Clone the [awx-operator](https://github.com/ansible/awx-operator). For the following playbooks to work, you will need to: ``` -$ pip install openshift +$ pip install kubernetes ``` If you are not changing any code in the operator itself, git checkout the latest version from https://github.com/ansible/awx-operator/releases, and then follow the instructions in the awx-operator [README](https://github.com/ansible/awx-operator#basic-install). diff --git a/licenses/lockfile.txt b/licenses/lockfile.txt deleted file mode 100644 index 610c0793f..000000000 --- a/licenses/lockfile.txt +++ /dev/null @@ -1,21 +0,0 @@ -This is the MIT license: http://www.opensource.org/licenses/mit-license.php - -Copyright (c) 2007 Skip Montanaro. - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to -deal in the Software without restriction, including without limitation the -rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -sell copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -IN THE SOFTWARE. diff --git a/licenses/openshift.txt b/licenses/openshift.txt deleted file mode 100644 index 8dada3eda..000000000 --- a/licenses/openshift.txt +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "{}" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright {yyyy} {name of copyright owner} - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/licenses/python-daemon.txt b/licenses/python-daemon.txt deleted file mode 100644 index 261eeb9e9..000000000 --- a/licenses/python-daemon.txt +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/licenses/python-string-utils.txt b/licenses/python-string-utils.txt deleted file mode 100644 index f68b07f41..000000000 --- a/licenses/python-string-utils.txt +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2016 Davide Zanotti - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/tools/docker-compose-minikube/minikube/tasks/preflight.yml b/tools/docker-compose-minikube/minikube/tasks/preflight.yml index 989b782b8..124382cfa 100644 --- a/tools/docker-compose-minikube/minikube/tasks/preflight.yml +++ b/tools/docker-compose-minikube/minikube/tasks/preflight.yml @@ -1,12 +1,24 @@ --- -- name: Check if Kubernetes python module is installed - shell: pip freeze | grep openshift - register: _pip_openshift - ignore_errors: true +# The k8s / k8s_info tasks in this role come from the kubernetes.core +# collection, which needs the `kubernetes` python package importable by the +# interpreter Ansible uses for localhost (not necessarily whatever `pip` is on +# $PATH). The legacy `openshift` package is not required. +- name: Check if the kubernetes python module is installed + command: >- + {{ ansible_facts.python.executable | default(ansible_playbook_python) }} + -c "import kubernetes; print(kubernetes.__version__)" + register: _py_kubernetes + changed_when: false + failed_when: false -- name: Preflight check - require openshift python module +- name: Preflight check - require kubernetes python module assert: - fail_msg: "The openshift python module was not found. You can either install it via 'pip install openshift' or using your distro package manager." + fail_msg: >- + The kubernetes python module was not found for + {{ ansible_facts.python.executable | default(ansible_playbook_python) }}. + It is required by the kubernetes.core k8s/k8s_info modules used by this role. + Install it with 'pip install kubernetes' or via your distro package manager + (e.g. python3-kubernetes). + success_msg: "Found kubernetes python module {{ _py_kubernetes.stdout }}" that: - - _pip_openshift.rc == 0 - - "'openshift==' in _pip_openshift.stdout" + - _py_kubernetes.rc == 0