OAPE-35, OCPBUGS-45486: Rebase openshift/main with upstream v1.37.2

[chiragkyal]

Description of the change:

Rebase this repo to upstream v1.37.2 : https://github.com/operator-framework/ansible-operator-plugins/releases/tag/v1.37.2

Steps Followed

git remote add upstream https://github.com/operator-framework/ansible-operator-plugins.git

git fetch --all

git checkout -b rebase-upstream-v1.37.2

git merge v1.37.2

Solving Merge Conflicts

• Got merge conflicts on the following files. Mostly related to version bumps. Accepted the Incoming Changes for all.

        both modified:   Makefile
	both modified:   go.mod
	both modified:   go.sum
	both modified:   images/ansible-operator/Pipfile
	both modified:   images/ansible-operator/Pipfile.lock
	both modified:   internal/version/version.go
	both modified:   testdata/memcached-molecule-operator/Makefile

• Cross-checked the updated Pipfile and Pipfile.lock should match with upstream.
  • Since we want to keep downstream Pipfile in sync with upstream, avoid regenerating Pipfile.lock
• Stagged those files

git commit

git push origin rebase-upstream-v1.37.2

Update Vendor

go mod tidy && go mod vendor

git add .
git commit -m "UPSTREAM: <drop>: go mod vendor"
git push origin rebase-upstream-v1.37.2

• This PR also incorporates the changes done by OCPBUGS-45486: Updating openshift-enterprise-ansible-operator-container image to be consistent with ART for 4.19 #26 PR because the latest changes are based on golang v1.23.

• Remove RUN dnf remove -y python3-requests file from openshift/Dockerfile because this will remove the package from RHEL's default python3.9, but since we are using python3.12; this line becomes noop now.

Update downstream requirement files

• Conflict resolution

  • setuptools>=77.0.3 is required by charset-normalizer
  • setuptools_scm>=8 is required by requests-unixsocket
  • Add ansible-core to a separate requirements-build1.in due to challenges in conflict resolution. Which ends up causing updates in openshift/install-ansible.sh and OAPE-35: [openshift-4.19] Add new requirements-build file for ansible-operator-plugins openshift-eng/ocp-build-data#6484 PR.
  • Slack thread for future reference.

• Add a new helper script openshift/hack/find_individual_builddeps.py to find deps for individual packages using pip_find_builddeps.py

• Run the following commands for verification

• make -f openshift/Makefile check-collections

• make check-requirements

Motivation for the change:
Closes :

• https://issues.redhat.com/browse/OAPE-35
• https://issues.redhat.com/browse/OCPBUGS-54661

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: chiragkyal

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

• OWNERS [chiragkyal]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[chiragkyal]

/hold

[openshift-ci-robot]

@chiragkyal: This pull request references OAPE-35 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.19.0" version, but no target version was set.

In response to this:

Description of the change:

Motivation for the change:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

[openshift-ci-robot]

@chiragkyal: This pull request references OAPE-35 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.19.0" version, but no target version was set.

In response to this:

Description of the change:

Rebase this repo to upstream v1.37.2 : https://github.com/operator-framework/ansible-operator-plugins/releases/tag/v1.37.2

Steps Followed

git remote add upstream https://github.com/operator-framework/ansible-operator-plugins.git

git fetch --all

git checkout -b rebase-upstream-v1.37.2

git merge v1.37.2

Solving Merge Conflicts

• Got merge conflicts on the following files. Mostly related to version bumps. Accepted the Incoming Changes for all.

       both modified:   Makefile
  both modified:   go.mod
  both modified:   go.sum
  both modified:   images/ansible-operator/Pipfile
  both modified:   images/ansible-operator/Pipfile.lock
  both modified:   internal/version/version.go
  both modified:   testdata/memcached-molecule-operator/Makefile

• Cross-checked the updated Pipfile and Pipfile.lock should match with upstream.
• Stagged those files

git commit

git push origin rebase-upstream-v1.37.2

Update Vendor

go mod tidy && go mod vendor

git add .
git commit -m "UPSTREAM: <drop>: go mod vendor"
git push origin rebase-upstream-v1.37.2

• This PR also incorporates the changes done by OCPBUGS-45486: Updating openshift-enterprise-ansible-operator-container image to be consistent with ART for 4.19 #26 PR because the latest changes are based on golang v1.23.

Motivation for the change:
Closes : https://issues.redhat.com/browse/OAPE-35

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

[openshift-ci-robot]

@chiragkyal: This pull request references OAPE-35 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.19.0" version, but no target version was set.

In response to this:

Description of the change:

Rebase this repo to upstream v1.37.2 : https://github.com/operator-framework/ansible-operator-plugins/releases/tag/v1.37.2

Steps Followed

git remote add upstream https://github.com/operator-framework/ansible-operator-plugins.git

git fetch --all

git checkout -b rebase-upstream-v1.37.2

git merge v1.37.2

Solving Merge Conflicts

• Got merge conflicts on the following files. Mostly related to version bumps. Accepted the Incoming Changes for all.

       both modified:   Makefile
  both modified:   go.mod
  both modified:   go.sum
  both modified:   images/ansible-operator/Pipfile
  both modified:   images/ansible-operator/Pipfile.lock
  both modified:   internal/version/version.go
  both modified:   testdata/memcached-molecule-operator/Makefile

• Cross-checked the updated Pipfile and Pipfile.lock should match with upstream.
  • Since we want to keep downstream Pipfile in sync with upstream, avoid regenerating Pipfile.lock
• Stagged those files

git commit

git push origin rebase-upstream-v1.37.2

Update Vendor

go mod tidy && go mod vendor

git add .
git commit -m "UPSTREAM: <drop>: go mod vendor"
git push origin rebase-upstream-v1.37.2

• This PR also incorporates the changes done by OCPBUGS-45486: Updating openshift-enterprise-ansible-operator-container image to be consistent with ART for 4.19 #26 PR because the latest changes are based on golang v1.23.

Motivation for the change:
Closes : https://issues.redhat.com/browse/OAPE-35

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

[openshift-ci-robot]

@chiragkyal: This pull request references OAPE-35 which is a valid jira issue.

This pull request references Jira Issue OCPBUGS-45486, which is valid.

3 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (4.19.0) matches configured target version for branch (4.19.0)
• bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @emmajiafan

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

Description of the change:

Rebase this repo to upstream v1.37.2 : https://github.com/operator-framework/ansible-operator-plugins/releases/tag/v1.37.2

Steps Followed

git remote add upstream https://github.com/operator-framework/ansible-operator-plugins.git

git fetch --all

git checkout -b rebase-upstream-v1.37.2

git merge v1.37.2

Solving Merge Conflicts

• Got merge conflicts on the following files. Mostly related to version bumps. Accepted the Incoming Changes for all.

       both modified:   Makefile
  both modified:   go.mod
  both modified:   go.sum
  both modified:   images/ansible-operator/Pipfile
  both modified:   images/ansible-operator/Pipfile.lock
  both modified:   internal/version/version.go
  both modified:   testdata/memcached-molecule-operator/Makefile

• Cross-checked the updated Pipfile and Pipfile.lock should match with upstream.
  • Since we want to keep downstream Pipfile in sync with upstream, avoid regenerating Pipfile.lock
• Stagged those files

git commit

git push origin rebase-upstream-v1.37.2

Update Vendor

go mod tidy && go mod vendor

git add .
git commit -m "UPSTREAM: <drop>: go mod vendor"
git push origin rebase-upstream-v1.37.2

• This PR also incorporates the changes done by OCPBUGS-45486: Updating openshift-enterprise-ansible-operator-container image to be consistent with ART for 4.19 #26 PR because the latest changes are based on golang v1.23.

Motivation for the change:
Closes : https://issues.redhat.com/browse/OAPE-35

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

[openshift-ci-robot]

@chiragkyal: This pull request references OAPE-35 which is a valid jira issue.

This pull request references Jira Issue OCPBUGS-45486, which is valid.

3 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (4.19.0) matches configured target version for branch (4.19.0)
• bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @emmajiafan

In response to this:

Description of the change:

Rebase this repo to upstream v1.37.2 : https://github.com/operator-framework/ansible-operator-plugins/releases/tag/v1.37.2

Steps Followed

git remote add upstream https://github.com/operator-framework/ansible-operator-plugins.git

git fetch --all

git checkout -b rebase-upstream-v1.37.2

git merge v1.37.2

Solving Merge Conflicts

• Got merge conflicts on the following files. Mostly related to version bumps. Accepted the Incoming Changes for all.

       both modified:   Makefile
  both modified:   go.mod
  both modified:   go.sum
  both modified:   images/ansible-operator/Pipfile
  both modified:   images/ansible-operator/Pipfile.lock
  both modified:   internal/version/version.go
  both modified:   testdata/memcached-molecule-operator/Makefile

• Cross-checked the updated Pipfile and Pipfile.lock should match with upstream.
  • Since we want to keep downstream Pipfile in sync with upstream, avoid regenerating Pipfile.lock
• Stagged those files

git commit

git push origin rebase-upstream-v1.37.2

Update Vendor

go mod tidy && go mod vendor

git add .
git commit -m "UPSTREAM: <drop>: go mod vendor"
git push origin rebase-upstream-v1.37.2

• This PR also incorporates the changes done by OCPBUGS-45486: Updating openshift-enterprise-ansible-operator-container image to be consistent with ART for 4.19 #26 PR because the latest changes are based on golang v1.23.

Update downstream requirement files

• This time we got two issues
  • Conflict with setuptools_scm version, solved by adding requests-unixsocket into requirements-build.in
  • Strange issue with pip_find_builddeps.py script, where running it once creates extra setuptools>=77.0.3 deps, but running twice removes this. We had to add a hack to run this script twice. We could not find any better option. Slack thread.
• Run the following commands for verification
• make -f openshift/Makefile check-collections
• make check-requirements

Motivation for the change:
Closes :

• https://issues.redhat.com/browse/OAPE-35
• https://issues.redhat.com/browse/OCPBUGS-54661

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

[openshift-ci-robot]

@chiragkyal: This pull request references OAPE-35 which is a valid jira issue.

This pull request references Jira Issue OCPBUGS-45486, which is valid.

3 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (4.19.0) matches configured target version for branch (4.19.0)
• bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @emmajiafan

In response to this:

Description of the change:

Rebase this repo to upstream v1.37.2 : https://github.com/operator-framework/ansible-operator-plugins/releases/tag/v1.37.2

Steps Followed

git remote add upstream https://github.com/operator-framework/ansible-operator-plugins.git

git fetch --all

git checkout -b rebase-upstream-v1.37.2

git merge v1.37.2

Solving Merge Conflicts

• Got merge conflicts on the following files. Mostly related to version bumps. Accepted the Incoming Changes for all.

       both modified:   Makefile
  both modified:   go.mod
  both modified:   go.sum
  both modified:   images/ansible-operator/Pipfile
  both modified:   images/ansible-operator/Pipfile.lock
  both modified:   internal/version/version.go
  both modified:   testdata/memcached-molecule-operator/Makefile

• Cross-checked the updated Pipfile and Pipfile.lock should match with upstream.
  • Since we want to keep downstream Pipfile in sync with upstream, avoid regenerating Pipfile.lock
• Stagged those files

git commit

git push origin rebase-upstream-v1.37.2

Update Vendor

go mod tidy && go mod vendor

git add .
git commit -m "UPSTREAM: <drop>: go mod vendor"
git push origin rebase-upstream-v1.37.2

• This PR also incorporates the changes done by OCPBUGS-45486: Updating openshift-enterprise-ansible-operator-container image to be consistent with ART for 4.19 #26 PR because the latest changes are based on golang v1.23.

Update downstream requirement files

• This time we got two issues

  • Conflict with setuptools_scm version, solved by adding requests-unixsocket into requirements-build.in
  • Strange issue with pip_find_builddeps.py script, where running it once creates extra setuptools>=77.0.3 deps, but running twice removes this. We had to add a hack to run this script twice. We could not find any better option. Slack thread.

• Add a new helper script openshift/hack/find_individual_builddeps.py to find deps for individual packages using pip_find_builddeps.py

• Run the following commands for verification

• make -f openshift/Makefile check-collections

• make check-requirements

Motivation for the change:
Closes :

• https://issues.redhat.com/browse/OAPE-35
• https://issues.redhat.com/browse/OCPBUGS-54661

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

[openshift-ci-robot]

@chiragkyal: This pull request references OAPE-35 which is a valid jira issue.

This pull request references Jira Issue OCPBUGS-45486, which is valid.

3 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (4.19.0) matches configured target version for branch (4.19.0)
• bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @emmajiafan

In response to this:

Description of the change:

Rebase this repo to upstream v1.37.2 : https://github.com/operator-framework/ansible-operator-plugins/releases/tag/v1.37.2

Steps Followed

git remote add upstream https://github.com/operator-framework/ansible-operator-plugins.git

git fetch --all

git checkout -b rebase-upstream-v1.37.2

git merge v1.37.2

Solving Merge Conflicts

• Got merge conflicts on the following files. Mostly related to version bumps. Accepted the Incoming Changes for all.

       both modified:   Makefile
  both modified:   go.mod
  both modified:   go.sum
  both modified:   images/ansible-operator/Pipfile
  both modified:   images/ansible-operator/Pipfile.lock
  both modified:   internal/version/version.go
  both modified:   testdata/memcached-molecule-operator/Makefile

• Cross-checked the updated Pipfile and Pipfile.lock should match with upstream.
  • Since we want to keep downstream Pipfile in sync with upstream, avoid regenerating Pipfile.lock
• Stagged those files

git commit

git push origin rebase-upstream-v1.37.2

Update Vendor

go mod tidy && go mod vendor

git add .
git commit -m "UPSTREAM: <drop>: go mod vendor"
git push origin rebase-upstream-v1.37.2

• This PR also incorporates the changes done by OCPBUGS-45486: Updating openshift-enterprise-ansible-operator-container image to be consistent with ART for 4.19 #26 PR because the latest changes are based on golang v1.23.

Update downstream requirement files

• This time we got two issues

  • Conflict with setuptools_scm version, solved by adding requests-unixsocket into requirements-build.in
  • Strange issue with pip_find_builddeps.py script, where running it once creates extra setuptools>=77.0.3 deps, but running twice removes this. We had to add a hack to run this script twice. We could not find any better option. Slack thread.

• Add a new helper script openshift/hack/find_individual_builddeps.py to find deps for individual packages using pip_find_builddeps.py

• Run the following commands for verification

• make -f openshift/Makefile check-collections

• make check-requirements

Motivation for the change:
Closes :

• https://issues.redhat.com/browse/OAPE-35
• https://issues.redhat.com/browse/OCPBUGS-54661

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

[chiragkyal]

@emmajiafan This PR is not yet ready for QE testing, we are still working on some fixes. We will let you know once we are good with the changes. Mind removing the labels?

[emmajiafan]

@emmajiafan This PR is not yet ready for QE testing, we are still working on some fixes. We will let you know once we are good with the changes. Mind removing the labels?

no problem.

[openshift-ci-robot]

@chiragkyal: This pull request references OAPE-35 which is a valid jira issue.

This pull request references Jira Issue OCPBUGS-45486, which is valid.

3 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (4.19.0) matches configured target version for branch (4.19.0)
• bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @emmajiafan

In response to this:

Description of the change:

Rebase this repo to upstream v1.37.2 : https://github.com/operator-framework/ansible-operator-plugins/releases/tag/v1.37.2

Steps Followed

git remote add upstream https://github.com/operator-framework/ansible-operator-plugins.git

git fetch --all

git checkout -b rebase-upstream-v1.37.2

git merge v1.37.2

Solving Merge Conflicts

• Got merge conflicts on the following files. Mostly related to version bumps. Accepted the Incoming Changes for all.

       both modified:   Makefile
  both modified:   go.mod
  both modified:   go.sum
  both modified:   images/ansible-operator/Pipfile
  both modified:   images/ansible-operator/Pipfile.lock
  both modified:   internal/version/version.go
  both modified:   testdata/memcached-molecule-operator/Makefile

• Cross-checked the updated Pipfile and Pipfile.lock should match with upstream.
  • Since we want to keep downstream Pipfile in sync with upstream, avoid regenerating Pipfile.lock
• Stagged those files

git commit

git push origin rebase-upstream-v1.37.2

Update Vendor

go mod tidy && go mod vendor

git add .
git commit -m "UPSTREAM: <drop>: go mod vendor"
git push origin rebase-upstream-v1.37.2

• This PR also incorporates the changes done by OCPBUGS-45486: Updating openshift-enterprise-ansible-operator-container image to be consistent with ART for 4.19 #26 PR because the latest changes are based on golang v1.23.

• Remove RUN dnf remove -y python3-requests file from openshift/Dockerfile because this will remove the package from RHEL's default python3.9, but since we are using python3.12; this line becomes noop now.

Update downstream requirement files

• Conflict resolution

  • setuptools>=77.0.3 is required by charset-normalizer
  • setuptools_scm>=8 is required by requests-unixsocket
  • Add ansible-core to a separate requirements-build1.in due to challenges in conflict resolution. Which ends up causing updates in openshift/install-ansible.sh and OAPE-35: [openshift-4.19] Add new requirements-build file for ansible-operator-plugins openshift-eng/ocp-build-data#6484 PR.
  • Slack thread for future reference.

• Add a new helper script openshift/hack/find_individual_builddeps.py to find deps for individual packages using pip_find_builddeps.py

• Run the following commands for verification

• make -f openshift/Makefile check-collections

• make check-requirements

Motivation for the change:
Closes :

• https://issues.redhat.com/browse/OAPE-35
• https://issues.redhat.com/browse/OCPBUGS-54661

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

[openshift-ci]

@chiragkyal: all tests passed!

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

[arkadeepsen]

Adding required labels for merging
/lgtm
/hold cancel

[openshift-ci-robot]

@chiragkyal: Jira Issue OCPBUGS-45486: All pull requests linked via external trackers have merged:

• openshift/ansible-operator-plugins#37

Jira Issue OCPBUGS-45486 has been moved to the MODIFIED state.

In response to this:

Description of the change:

Rebase this repo to upstream v1.37.2 : https://github.com/operator-framework/ansible-operator-plugins/releases/tag/v1.37.2

Steps Followed

git remote add upstream https://github.com/operator-framework/ansible-operator-plugins.git

git fetch --all

git checkout -b rebase-upstream-v1.37.2

git merge v1.37.2

Solving Merge Conflicts

• Got merge conflicts on the following files. Mostly related to version bumps. Accepted the Incoming Changes for all.

       both modified:   Makefile
  both modified:   go.mod
  both modified:   go.sum
  both modified:   images/ansible-operator/Pipfile
  both modified:   images/ansible-operator/Pipfile.lock
  both modified:   internal/version/version.go
  both modified:   testdata/memcached-molecule-operator/Makefile

• Cross-checked the updated Pipfile and Pipfile.lock should match with upstream.
  • Since we want to keep downstream Pipfile in sync with upstream, avoid regenerating Pipfile.lock
• Stagged those files

git commit

git push origin rebase-upstream-v1.37.2

Update Vendor

go mod tidy && go mod vendor

git add .
git commit -m "UPSTREAM: <drop>: go mod vendor"
git push origin rebase-upstream-v1.37.2

• This PR also incorporates the changes done by OCPBUGS-45486: Updating openshift-enterprise-ansible-operator-container image to be consistent with ART for 4.19 #26 PR because the latest changes are based on golang v1.23.

• Remove RUN dnf remove -y python3-requests file from openshift/Dockerfile because this will remove the package from RHEL's default python3.9, but since we are using python3.12; this line becomes noop now.

Update downstream requirement files

• Conflict resolution

  • setuptools>=77.0.3 is required by charset-normalizer
  • setuptools_scm>=8 is required by requests-unixsocket
  • Add ansible-core to a separate requirements-build1.in due to challenges in conflict resolution. Which ends up causing updates in openshift/install-ansible.sh and OAPE-35: [openshift-4.19] Add new requirements-build file for ansible-operator-plugins openshift-eng/ocp-build-data#6484 PR.
  • Slack thread for future reference.

• Add a new helper script openshift/hack/find_individual_builddeps.py to find deps for individual packages using pip_find_builddeps.py

• Run the following commands for verification

• make -f openshift/Makefile check-collections

• make check-requirements

Motivation for the change:
Closes :

• https://issues.redhat.com/browse/OAPE-35
• https://issues.redhat.com/browse/OCPBUGS-54661

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

[chiragkyal]

/cc @emmajiafan
for post-merge testing

[openshift-bot]

[ART PR BUILD NOTIFIER]

Distgit: openshift-enterprise-ansible-operator
This PR has been included in build openshift-enterprise-ansible-operator-container-v4.19.0-202504111744.p0.gcf5337c.assembly.stream.el9.
All builds following this will include this PR.