Skip to content

Commit 6deb76f

Browse files
[v1.26.x] unpin cryptography dependency for ansible-operator base images (#6290)
* unpin cryptography dependency for ansible-operator base images Signed-off-by: Bryce Palmer <[email protected]> * fix .cncf-maintainers sanity failure Signed-off-by: Bryce Palmer <[email protected]> * fix OWNERS_ALIASES Signed-off-by: Bryce Palmer <[email protected]> * update dead links Signed-off-by: Bryce Palmer <[email protected]> --------- Signed-off-by: Bryce Palmer <[email protected]> Co-authored-by: Bryce Palmer <[email protected]>
1 parent 7f9a821 commit 6deb76f

File tree

7 files changed

+410
-228
lines changed

7 files changed

+410
-228
lines changed

OWNERS_ALIASES

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ aliases:
55
# Contributors who can be contacted to perform admin-related tasks on the repo.
66
# This role is a subset of the approver role.
77
sdk-admins:
8-
- asmacdo
9-
- jmrodri
108
- joelanford
9+
- everettraven
10+
- oceanc80
1111

1212
# Contributors who can approve any PRs in the repo.
1313
sdk-approvers:
@@ -16,7 +16,8 @@ aliases:
1616
- rashmigottipati
1717
- theishshah
1818
- varshaprasad96
19-
- everettraven
19+
- grokspawn
20+
- anik120
2021

2122
# Contributors who can review and LGTM any PRs in the repo.
2223
sdk-reviewers:
@@ -30,3 +31,5 @@ aliases:
3031
- estroz
3132
- camilamacedo86
3233
- marc-obrien
34+
- asmacdo
35+
- jmrodri

images/ansible-operator-2.11-preview/Pipfile

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,7 @@ ansible-runner-http = "==1.0.0"
99
ipaddress = "==1.0.23"
1010
openshift = "~=0.13.0"
1111
jmespath = "==0.10.0"
12-
# cryptography needs to be pinned to 3.3.2 as this is the last version
13-
# before its setup requires rust, which is not available via RPM in the
14-
# base image. This pin should be re-evaluated once the base image is updated.
15-
cryptography = "==3.3.2"
12+
cryptography = "*"
1613
ansible-core = "~=2.11.0"
1714
oauthlib = "==3.2.1"
1815

images/ansible-operator-2.11-preview/Pipfile.lock

Lines changed: 213 additions & 133 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

images/ansible-operator/Pipfile

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,7 @@ ipaddress = "==1.0.23"
1010
openshift = "~=0.13.0"
1111
ansible = "~=2.9.15"
1212
jmespath = "==0.10.0"
13-
# cryptography needs to be pinned to 3.3.2 as this is the last version
14-
# before its setup requires rust, which is not available via RPM in the
15-
# base image. This pin should be re-evaluated once the base image is updated.
16-
cryptography = "==3.3.2"
13+
cryptography = "*"
1714
oauthlib = "==3.2.1"
1815

1916
[dev-packages]

images/ansible-operator/Pipfile.lock

Lines changed: 187 additions & 82 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

website/content/en/docs/building-operators/ansible/testing-guide.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ Our molecule scenarios have the following basic structure:
4848
└── verify.yml
4949
```
5050

51-
- `molecule.yml` is a configuration file for molecule. It defines what driver to use to stand up an environment and the associated configuration, linting rules, and a variety of other configuration options. For full documentation on the options available here, see the [molecule configuration documentation](https://molecule.readthedocs.io/en/latest/configuration.html)
51+
- `molecule.yml` is a configuration file for molecule. It defines what driver to use to stand up an environment and the associated configuration, linting rules, and a variety of other configuration options. For full documentation on the options available here, see the [molecule configuration documentation](https://molecule.readthedocs.io/en/latest/configuration/)
5252

5353
- `prepare.yml` is an Ansible playbook that is run once during the set up of a scenario. You can put any arbitrary Ansible in this playbook. It is used for one-time configuration of your test environment, for example, creating the cluster-wide `CustomResourceDefinition` that your Operator will watch.
5454

website/content/en/docs/upgrading-sdk-version/version-upgrade-guide.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1288,7 +1288,7 @@ which ./bin/openapi-gen > /dev/null || go build -o ./bin/openapi-gen k8s.io/kube
12881288
The Molecule version for Ansible based-operators was upgraded from `2.22` to `3.0.2`. The following changes are required in the default scaffold files.
12891289

12901290
- Remove the `scenario.name` from `molecule.yaml` and then, ensure that any condition with will look for the folder name which determines the scenario name from now on
1291-
- Replace the lint with newer syntax from [documentation](https://molecule.readthedocs.io/en/latest/configuration.html#lint). See:
1291+
- Replace the lint with newer syntax. See:
12921292

12931293
Replace:
12941294

0 commit comments

Comments
 (0)