Skip to content

Conversation

chiragkyal
Copy link
Member

@chiragkyal chiragkyal commented Jan 15, 2025

Description of the change:

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

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.1

git merge v1.37.1

Solving Merge Conflicts

  • Got merge conflicts on images/ansible-operator/Pipfile and images/ansible-operator/Pipfile.lock
  • Accepted the upcoming upstream changes for images/ansible-operator/Pipfile
  • Re-generated the Pipfile.lock using these steps.
  • Stagged those files
git commit

git push origin rebase-upstream-v1.37.1
go mod tidy && go mod vendor

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

acornett21 and others added 8 commits October 22, 2024 12:12
Signed-off-by: Adam D. Cornett <adc@redhat.com>
… corresponding scaffolding logic (#116)

Signed-off-by: Adam D. Cornett <adc@redhat.com>
Signed-off-by: Adam D. Cornett <adc@redhat.com>
* Update k8s dependencies to 1.31

* Updated k8s dependencies to 1.31
* Updated kubebuilder, controller-runtime, operator-lib & operator-registry
* Updated pipfile

Signed-off-by: Neo2308 <pradha.krishna.cse17@itbhu.ac.in>

* Fixing tests

Signed-off-by: Neo2308 <pradha.krishna.cse17@itbhu.ac.in>

* Update kind & setup-envtest versions

Signed-off-by: Neo2308 <pradha.krishna.cse17@itbhu.ac.in>

* Regenerate go mod file

Signed-off-by: Neo2308 <pradha.krishna.cse17@itbhu.ac.in>

* Update to latest patch versions

Signed-off-by: Neo2308 <pradha.krishna.cse17@itbhu.ac.in>

---------

Signed-off-by: Neo2308 <pradha.krishna.cse17@itbhu.ac.in>
Signed-off-by: Adam D. Cornett <adc@redhat.com>
Signed-off-by: Adam D. Cornett <adc@redhat.com>
Signed-off-by: Adam D. Cornett <adc@redhat.com>
Co-authored-by: Adam D. Cornett <adc@redhat.com>
Signed-off-by: Adam D. Cornett <adc@redhat.com>
Co-authored-by: Adam D. Cornett <adc@redhat.com>
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jan 15, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jan 15, 2025

@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 openshift-ci bot requested review from anik120 and joelanford January 15, 2025 12:12
Copy link

openshift-ci bot commented Jan 15, 2025

[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:

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 15, 2025
@chiragkyal
Copy link
Member Author

/hold

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 15, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jan 15, 2025

@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.1 : https://github.com/operator-framework/ansible-operator-plugins/releases/tag/v1.37.1

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.1

git merge v1.37.1

Solving Merge Conflicts

  • Got merge conflicts on images/ansible-operator/Pipfile and images/ansible-operator/Pipfile.lock
  • Accepted the upcoming upstream changes for images/ansible-operator/Pipfile
  • Re-generated the Pipfile.lock using these steps.
  • Stagged those files
git commit

git push origin rebase-upstream-v1.37.1
go mod tidy && go mod vendor

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

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-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 23, 2025
ansible-operator-plugins release v1.37.1
@chiragkyal chiragkyal force-pushed the rebase-upstream-v1.37.1 branch from 90b2e0c to c9b82df Compare February 5, 2025 13:17
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 5, 2025
Copy link

openshift-ci bot commented Feb 5, 2025

@chiragkyal: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/images c9b82df link true /test images
ci/prow/sanity c9b82df link true /test sanity
ci/prow/e2e-ansible c9b82df link true /test e2e-ansible
ci/prow/unit c9b82df link true /test unit

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.

@chiragkyal
Copy link
Member Author

/close

@openshift-ci openshift-ci bot closed this Apr 9, 2025
Copy link

openshift-ci bot commented Apr 9, 2025

@chiragkyal: Closed this PR.

In response to this:

/close

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.

@chiragkyal chiragkyal deleted the rebase-upstream-v1.37.1 branch April 9, 2025 05:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants