OAPE-98: Rebase upstream v1.36.1 #28

chiragkyal · 2025-01-16T17:45:37Z

Description of the change:

Rebase this repo to upstream v1.36.1 : https://github.com/operator-framework/ansible-operator-plugins/releases/tag/v1.36.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.36.1

git merge v1.36.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.36.1

Added 5e8fe25 commit to fix CVE-2024-11079 through updating ansible-core to 2.18.0
Added 7f68a03 to fix CVE-2024-45338 by updating golang.org/x/net
go mod vendor
Updated downstream requirements and base image to support python3.12 and new Pipfile dependencies

Signed-off-by: Jose R. Gonzalez <komish@flutes.dev>

Signed-off-by: Joe Lanford <joe.lanford@gmail.com>

Signed-off-by: Jose R. Gonzalez <komish@flutes.dev>

…s (#105) Signed-off-by: Trilok Geer <tgeer@redhat.com>

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

* Update k8s dependencies to 1.30 * Updated k8s dependencies to 1.30 * Updated kubebuilder to v4 * updating pip and piplock files Signed-off-by: Adam D. Cornett <adc@redhat.com> * updating methods to comply with k8 1.30 Signed-off-by: Adam D. Cornett <adc@redhat.com> * adding new metrics files Signed-off-by: Adam D. Cornett <adc@redhat.com> * fixing generation issues Signed-off-by: Adam D. Cornett <adc@redhat.com> * Attempting to fix tests Signed-off-by: Neo2308 <pradha.krishna.cse17@itbhu.ac.in> * Attempting to fix tests Signed-off-by: Neo2308 <pradha.krishna.cse17@itbhu.ac.in> * Attempting to fix tests Signed-off-by: Neo2308 <pradha.krishna.cse17@itbhu.ac.in> * Attempting to fix tests Signed-off-by: Neo2308 <pradha.krishna.cse17@itbhu.ac.in> * Attempting to fix tests Signed-off-by: Neo2308 <pradha.krishna.cse17@itbhu.ac.in> --------- Signed-off-by: Adam D. Cornett <adc@redhat.com> Signed-off-by: Neo2308 <pradha.krishna.cse17@itbhu.ac.in> Co-authored-by: Adam D. Cornett <adc@redhat.com>

Signed-off-by: Adam D. Cornett <adc@redhat.com>

* in case of failure, we want to update the error to latest run * add a test to validate the message update

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>

… corresponding scaffolding logic (#119) 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>

ansible-operator-plugins release v1.36.1

chiragkyal · 2025-01-16T17:47:08Z

/hold

openshift-ci · 2025-01-16T17:47:35Z

[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 · 2025-01-17T06:39:38Z

/test images

Signed-off-by: chiragkyal <ckyal@redhat.com>

chiragkyal · 2025-01-19T19:50:03Z

/test e2e-ansible

images/ansible-operator/Pipfile

openshift-ci-robot · 2025-01-21T12:29:56Z

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

In response to this:

Description of the change:

Rebase this repo to upstream v1.36.1 : https://github.com/operator-framework/ansible-operator-plugins/releases/tag/v1.36.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.36.1

git merge v1.36.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.36.1
Added 5e8fe25 commit to fix CVE-2024-11079 through updating ansible-core to 2.18.0

Added 7f68a03 to fix CVE-2024-45338 by updating golang.org/x/net

go mod vendor

Updated downstream requirements and base image to support python3.12 and new Pipfile dependencies

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.

Also update the dockerfiles to support python3.12 Signed-off-by: chiragkyal <ckyal@redhat.com>

openshift-ci · 2025-01-21T19:04:34Z

@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 · 2025-01-22T04:56:47Z

/lgtm
/cc @TrilokGeer for final review

openshift-ci · 2025-01-22T04:56:53Z

@arkadeepsen: GitHub didn't allow me to request PR reviews from the following users: final, review, for.

Note that only openshift members and repo collaborators can review this PR, and authors cannot review their own PRs.

In response to this:

/lgtm
/cc @TrilokGeer for final review

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.

TrilokGeer · 2025-01-22T12:02:52Z

/lgtm

arkadeepsen · 2025-01-22T12:09:26Z

/hold cancel

chiragkyal · 2025-01-22T12:13:15Z

/cc @KeenonLee @emmajiafan

KeenonLee

/label qe-approved

openshift-ci-robot · 2025-01-23T04:02:43Z

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

In response to this:

Description of the change:

Rebase this repo to upstream v1.36.1 : https://github.com/operator-framework/ansible-operator-plugins/releases/tag/v1.36.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.36.1

git merge v1.36.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.36.1
Added 5e8fe25 commit to fix CVE-2024-11079 through updating ansible-core to 2.18.0

Added 7f68a03 to fix CVE-2024-45338 by updating golang.org/x/net

go mod vendor

Updated downstream requirements and base image to support python3.12 and new Pipfile dependencies

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.

emmajiafan · 2025-01-23T05:12:24Z

/lgtm

openshift-bot · 2025-01-23T10:18:25Z

[ART PR BUILD NOTIFIER]

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

komish and others added 20 commits October 1, 2024 20:25

Update dependencies to resolve safety-cli alerts

3b42c75

Signed-off-by: Jose R. Gonzalez <komish@flutes.dev>

Update dependencies to resolve safety-cli alerts (#98)

36380eb

bump kubebuilder to 3.15.0

9dcddde

Signed-off-by: Joe Lanford <joe.lanford@gmail.com>

Fix deleted files

311f40b

Bump base image to RHEL9 and Python version to 3.12

0818d9a

Signed-off-by: Jose R. Gonzalez <komish@flutes.dev>

Bump base image to RHEL9 and Python version to 3.12 (#101)

8e08a45

Bump kubebuilder to 3.15.0 (with merge conflicts resolved) (#90)

9a6d15a

Utilize GitHub Actions cache for image builds (#104)

ab6893d

Signed-off-by: Jose R. Gonzalez <komish@flutes.dev>

Updates ansible collections and ansible packages to supported version…

f1aa584

…s (#105) Signed-off-by: Trilok Geer <tgeer@redhat.com>

mark unsafe the non-spec obj parameter (#66)

3acad86

Update github actions to use node 20 (#85)

886b92a

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

updating all non k8s go dependencies to latest (#108)

9871a1e

Signed-off-by: Adam D. Cornett <adc@redhat.com>

in case of failure, we want to update the error to latest run (#62)

acf7594

* in case of failure, we want to update the error to latest run * add a test to validate the message update

adding adding ignore for CVE-2024-8775 (#111)

4e0c617

Signed-off-by: Adam D. Cornett <adc@redhat.com>

prepping for v1.36.0 release (#110)

50d76a4

Signed-off-by: Adam D. Cornett <adc@redhat.com>

removing operator types from issues (#118)

c421872

Signed-off-by: Adam D. Cornett <adc@redhat.com> Co-authored-by: Adam D. Cornett <adc@redhat.com>

adding metrics-require-rbac flag, metrics-secure validation logic and…

7edf4ba

… corresponding scaffolding logic (#119) Signed-off-by: Adam D. Cornett <adc@redhat.com> Co-authored-by: Adam D. Cornett <adc@redhat.com>

prepping for v1.36.1 release (#120)

60db7ce

Signed-off-by: Adam D. Cornett <adc@redhat.com> Co-authored-by: Adam D. Cornett <adc@redhat.com>

Merge tag 'v1.36.1' into rebase-upstream-v1.36.1

143d698

ansible-operator-plugins release v1.36.1

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 16, 2025

openshift-ci bot requested review from everettraven and joelanford January 16, 2025 17:47

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 16, 2025

UPSTREAM: <carry>: update ansible-core to fix CVE-2024-11079

5e8fe25

Signed-off-by: chiragkyal <ckyal@redhat.com>

chiragkyal force-pushed the rebase-upstream-v1.36.1 branch 2 times, most recently from d31f65d to 9175e09 Compare January 17, 2025 12:09

arkadeepsen reviewed Jan 20, 2025

View reviewed changes

images/ansible-operator/Pipfile Outdated Show resolved Hide resolved

chiragkyal force-pushed the rebase-upstream-v1.36.1 branch 2 times, most recently from 5122d42 to 2665c79 Compare January 21, 2025 12:26

chiragkyal force-pushed the rebase-upstream-v1.36.1 branch from ded19ec to bc51af1 Compare January 21, 2025 16:29

UPSTREAM: <carry>: update downstream requirements and downstream image

bfd0561

Also update the dockerfiles to support python3.12 Signed-off-by: chiragkyal <ckyal@redhat.com>

chiragkyal force-pushed the rebase-upstream-v1.36.1 branch from 9c46df1 to bfd0561 Compare January 21, 2025 17:45

openshift-ci bot requested a review from TrilokGeer January 22, 2025 04:56

openshift-ci bot assigned arkadeepsen Jan 22, 2025

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 22, 2025

openshift-ci bot assigned TrilokGeer Jan 22, 2025

openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 22, 2025

openshift-ci bot requested review from KeenonLee and emmajiafan January 22, 2025 12:13

KeenonLee reviewed Jan 23, 2025

View reviewed changes

openshift-ci bot added the qe-approved Signifies that QE has signed off on this PR label Jan 23, 2025

openshift-merge-bot bot merged commit 1f608d1 into openshift:main Jan 23, 2025
5 checks passed

arkadeepsen mentioned this pull request Jan 23, 2025

OCPBUGS-48812: V1.36.1 rebase release 4.18 #29

Merged

chiragkyal deleted the rebase-upstream-v1.36.1 branch January 29, 2025 10:08

chiragkyal mentioned this pull request Jan 29, 2025

add aws cluster profile for ansible-operator-plugin openshift/release#60776

Closed

OAPE-98: Rebase upstream v1.36.1 #28

OAPE-98: Rebase upstream v1.36.1 #28

Uh oh!

Conversation

chiragkyal commented Jan 16, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description of the change:

Steps Followed

Uh oh!

chiragkyal commented Jan 16, 2025

Uh oh!

openshift-ci bot commented Jan 16, 2025

Uh oh!

chiragkyal commented Jan 17, 2025

Uh oh!

chiragkyal commented Jan 19, 2025

Uh oh!

Uh oh!

openshift-ci-robot commented Jan 21, 2025 • edited by openshift-ci bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description of the change:

Steps Followed

Uh oh!

openshift-ci bot commented Jan 21, 2025

Uh oh!

arkadeepsen commented Jan 22, 2025

Uh oh!

openshift-ci bot commented Jan 22, 2025

Uh oh!

TrilokGeer commented Jan 22, 2025

Uh oh!

arkadeepsen commented Jan 22, 2025

Uh oh!

chiragkyal commented Jan 22, 2025

Uh oh!

KeenonLee left a comment

Choose a reason for hiding this comment

Uh oh!

openshift-ci-robot commented Jan 23, 2025 • edited by openshift-ci bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description of the change:

Steps Followed

Uh oh!

Uh oh!

emmajiafan commented Jan 23, 2025

Uh oh!

openshift-bot commented Jan 23, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

13 participants

chiragkyal commented Jan 16, 2025 •

edited

Loading

openshift-ci-robot commented Jan 21, 2025 •

edited by openshift-ci bot

Loading

openshift-ci-robot commented Jan 23, 2025 •

edited by openshift-ci bot

Loading