Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ansible bump deps #4734

Merged
merged 2 commits into from
Apr 9, 2021
Merged

Ansible bump deps #4734

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
839071e
Bump python and ansible dependencies
fabianvf Apr 8, 2021
65faf7c
Update changelog to obey formatting conventions
fabianvf Apr 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 12 additions & 0 deletions changelog/fragments/ansible-dep-bump.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# entries is a list of entries to include in
# release notes and/or the migration guide
entries:
- description: >
Update dependencies for Ansible-based Operators. Pulls in 0.12 of the
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
Update dependencies for Ansible-based Operators. Pulls in 0.12 of the
For Ansible-based Operators, update of dependencies. Pulls in 0.12 of the

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just nits.

  • According to the template, we ought to For Language-based ... Please, give a look at the template.
  • Also, we might need to create another one for the scaffolds using (ansible/v1) update of the dependencies and with the steps in the migration section to let the users are able to do that manually
  • Then, it is missing ()` for the versions and the info from X to Y.

openshift Python client, 12.0.1 of the kubernetes Python client, 0.2.0
of the operator_sdk.util Ansible collection, and 1.2.1 of the
community.kubernetes Ansible collection.
kind: "change"
breaking: false
6 changes: 3 additions & 3 deletions images/ansible-operator/Pipfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ verify_ssl = true
name = "pypi"

[packages]
ansible-runner = "==1.4.6"
ansible-runner = "~=1.4.7"
ansible-runner-http = "==1.0.0"
ipaddress = "==1.0.23"
openshift = "==0.11.2"
ansible = "==2.10.7"
openshift = "~=0.12.0"
ansible = "~=2.9.15"
jmespath = "==0.10.0"
# cryptography needs to be pinned to 3.3.2 as this is the last version
# before its setup requires rust, which is not available via RPM in the
Expand Down
51 changes: 14 additions & 37 deletions images/ansible-operator/Pipfile.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions internal/plugins/ansible/v1/scaffolds/internal/templates/requirements.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ func (f *RequirementsYml) SetTemplateDefaults() error {
const requirementsYmlTmpl = `---
collections:
- name: community.kubernetes
version: "==1.1.1"
version: "1.2.1"
- name: operator_sdk.util
version: "0.1.0"
version: "0.2.0"
`
4 changes: 2 additions & 2 deletions testdata/ansible/memcached-operator/requirements.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
collections:
- name: community.kubernetes
version: "==1.1.1"
version: "1.2.1"
- name: operator_sdk.util
version: "0.1.0"
version: "0.2.0"