search

openshift / ocp-release-operator-sdk

Apache License 2.0
16 stars 39 forks source link

OCPBUGS-37598: V1.36.1 rebase master #387

Closed arkadeepsen closed 2 months ago

arkadeepsen commented 3 months ago

Rebase to upstream v1.36.1

arkadeepsen commented 3 months ago

/refresh

openshift-ci-robot commented 3 months ago

@arkadeepsen: This pull request references CFE-1097 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.17.0" version, but no target version was set.

In response to [this](https://github.com/openshift/ocp-release-operator-sdk/pull/387): >Rebase to upstream v1.35.0 > >Ran the following script to create the rebase branch: >``` >./UPSTREAM-MERGE.sh v1.35.0 >``` >Fixed the `patches/03-setversion.patch` file to reflect the correct `SIMPLE_VERSION`. > Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Focp-release-operator-sdk). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.
arkadeepsen commented 3 months ago

/tide refresh

arkadeepsen commented 3 months ago

/test all

arkadeepsen commented 3 months ago

/refresh

openshift-ci-robot commented 3 months ago

@arkadeepsen: This pull request references Jira Issue OCPBUGS-37598, which is invalid:

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

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

In response to [this](https://github.com/openshift/ocp-release-operator-sdk/pull/387): >Rebase to upstream v1.35.0 > >Ran the following script to create the rebase branch: >``` >./UPSTREAM-MERGE.sh v1.35.0 >``` >Fixed the `patches/03-setversion.patch` file to reflect the correct `SIMPLE_VERSION`. > Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Focp-release-operator-sdk). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.
arkadeepsen commented 3 months ago

/jira refresh

openshift-ci-robot commented 3 months ago

@arkadeepsen: This pull request references Jira Issue OCPBUGS-37598, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug * bug is open, matching expected state (open) * bug target version (4.17.0) matches configured target version for branch (4.17.0) * bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)

No GitHub users were found matching the public email listed for the QA contact in Jira (jfan@redhat.com), skipping review request.

In response to [this](https://github.com/openshift/ocp-release-operator-sdk/pull/387#issuecomment-2252469677): >/jira refresh Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Focp-release-operator-sdk). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.
openshift-ci-robot commented 3 months ago

@arkadeepsen: This pull request references Jira Issue OCPBUGS-37598, which is valid.

3 validation(s) were run on this bug * bug is open, matching expected state (open) * bug target version (4.17.0) matches configured target version for branch (4.17.0) * bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

No GitHub users were found matching the public email listed for the QA contact in Jira (jfan@redhat.com), skipping review request.

In response to [this](https://github.com/openshift/ocp-release-operator-sdk/pull/387): >Rebase to upstream v1.35.0 > >- Ran the following script to create the rebase branch: > > ``` > ./UPSTREAM-MERGE.sh v1.35.0 > ``` >- Regenerated the `patches/03-setversion.patch` file to reflect the correct `SIMPLE_VERSION` >- Regenerated the fixsanity patch >- Regenerated the disable security context patch >- Regenerated the `06-build-darwin-binary.patch` file >- Regenerate the `11-openshiftv1-cli.patch` file >- Removed the downstream ansible code >- Updated vendor directory by running the following commands: > ``` > go mod tidy > go mod vendor > ``` Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Focp-release-operator-sdk). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.
arkadeepsen commented 3 months ago

/hold until https://github.com/openshift/ansible-operator-plugins/pull/4 is merged

openshift-ci-robot commented 3 months ago

@arkadeepsen: This pull request references Jira Issue OCPBUGS-37598, which is valid.

3 validation(s) were run on this bug * bug is open, matching expected state (open) * bug target version (4.17.0) matches configured target version for branch (4.17.0) * bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

No GitHub users were found matching the public email listed for the QA contact in Jira (jfan@redhat.com), skipping review request.

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

In response to [this](https://github.com/openshift/ocp-release-operator-sdk/pull/387): >Rebase to upstream v1.36.0 > >- Ran the following script to create the rebase branch: > > ``` > ./UPSTREAM-MERGE.sh v1.36.0 > ``` >- Regenerated the `patches/03-setversion.patch` file to reflect the correct `SIMPLE_VERSION` >- Regenerated the fixsanity patch >- Regenerated the disable security context patch >- Regenerated the `06-build-darwin-binary.patch` file >- Regenerate the `11-openshiftv1-cli.patch` file >- Removed the downstream ansible code >- Updated vendor directory by running the following commands: > ``` > go mod tidy > go mod vendor > ``` Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Focp-release-operator-sdk). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.
KeenonLee commented 3 months ago 
jitli@RedHat:~/work/src/github/sdk/downstream/ocp-release-operator-sdk/build$ ./operator-sdk version
operator-sdk version: "v1.35.0-ocp", commit: "9cbe6d88856086ff9df288da77b4b6dcf656f331", kubernetes version: "v1.29.0", go version: "go1.22.0", GOOS: "darwin", GOARCH: "arm64"

Still "v1.35.0-ocp"

arkadeepsen commented 3 months ago 
jitli@RedHat:~/work/src/github/sdk/downstream/ocp-release-operator-sdk/build$ ./operator-sdk version
operator-sdk version: "v1.35.0-ocp", commit: "9cbe6d88856086ff9df288da77b4b6dcf656f331", kubernetes version: "v1.29.0", go version: "go1.22.0", GOOS: "darwin", GOARCH: "arm64"

Still "v1.35.0-ocp"

Updated the patches/03-setversion.patch file to reflect the correct version v1.36.0-ocp

openshift-ci[bot] commented 3 months ago

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: arkadeepsen

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](https://github.com/openshift/ocp-release-operator-sdk/blob/master/OWNERS)~~ [arkadeepsen] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment
openshift-ci-robot commented 2 months ago

@arkadeepsen: This pull request references Jira Issue OCPBUGS-37598, which is invalid:

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

In response to [this](https://github.com/openshift/ocp-release-operator-sdk/pull/387): >Rebase to upstream v1.36.1 > >- Ran the following script to create the rebase branch: > > ``` > ./UPSTREAM-MERGE.sh v1.36.1 > ``` >- Regenerated the `patches/03-setversion.patch` file to reflect the correct `SIMPLE_VERSION` >- Regenerated the fixsanity patch >- Regenerated the disable security context patch >- Regenerated the `06-build-darwin-binary.patch` file >- Regenerate the `11-openshiftv1-cli.patch` file >- Removed the downstream ansible code >- Updated vendor directory by running the following commands: > ``` > go mod tidy > go mod vendor > ``` Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Focp-release-operator-sdk). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.
arkadeepsen commented 2 months ago

/jira refresh

openshift-ci-robot commented 2 months ago

@arkadeepsen: This pull request references Jira Issue OCPBUGS-37598, which is invalid:

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

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

In response to [this](https://github.com/openshift/ocp-release-operator-sdk/pull/387#issuecomment-2303913037): >/jira refresh Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Focp-release-operator-sdk). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.
arkadeepsen commented 2 months ago

/jira refresh

openshift-ci-robot commented 2 months ago

@arkadeepsen: This pull request references Jira Issue OCPBUGS-37598, which is valid.

3 validation(s) were run on this bug * bug is open, matching expected state (open) * bug target version (4.18.0) matches configured target version for branch (4.18.0) * bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

No GitHub users were found matching the public email listed for the QA contact in Jira (jfan@redhat.com), skipping review request.

In response to [this](https://github.com/openshift/ocp-release-operator-sdk/pull/387#issuecomment-2303914360): >/jira refresh Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Focp-release-operator-sdk). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.
arkadeepsen commented 2 months ago

/jira refresh

openshift-ci-robot commented 2 months ago

@arkadeepsen: This pull request references Jira Issue OCPBUGS-37598, which is valid.

3 validation(s) were run on this bug * bug is open, matching expected state (open) * bug target version (4.18.0) matches configured target version for branch (4.18.0) * bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact: /cc @KeenonLee

In response to [this](https://github.com/openshift/ocp-release-operator-sdk/pull/387#issuecomment-2303916423): >/jira refresh Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Focp-release-operator-sdk). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.
arkadeepsen commented 2 months ago

/test images

arkadeepsen commented 2 months ago

/test e2e-helm

arkadeepsen commented 2 months ago

/test e2e-ansible

openshift-ci[bot] commented 2 months ago

@arkadeepsen: The specified target(s) for /test were not found. The following commands are available to trigger required jobs:

Use /test all to run all jobs.

In response to [this](https://github.com/openshift/ocp-release-operator-sdk/pull/387#issuecomment-2310456231): >/test e2e-ansible Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository.
arkadeepsen commented 2 months ago

/retest

openshift-ci[bot] commented 2 months ago

@arkadeepsen: The following test 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/e2e-ansible f3e495a126271eec4285d5e790e49d8ce19d638b link true /test e2e-ansible

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
arkadeepsen commented 2 months ago

/refresh

chiragkyal commented 2 months ago

Should we update the commit messages with UPSTREAM: <carry>: prefix ?

arkadeepsen commented 2 months ago

Should we update the commit messages with UPSTREAM: <carry>: prefix ?

There are no previous commits with such prefix in this repo. I am using the same convention in this PR. However, I am open to updating the commit messages with the prefix. @TrilokGeer WDYT?

TrilokGeer commented 2 months ago

Should we update the commit messages with UPSTREAM: <carry>: prefix ?

There are no previous commits with such prefix in this repo. I am using the same convention in this PR. However, I am open to updating the commit messages with the prefix. @TrilokGeer WDYT?

https://github.com/openshift/enhancements/blob/master/dev-guide/kubernetes-rebase.md#picking-commits-from-the-previous-rebase-branch-to-the-new-branch

arkadeepsen commented 2 months ago

Should we update the commit messages with UPSTREAM: <carry>: prefix ?

There are no previous commits with such prefix in this repo. I am using the same convention in this PR. However, I am open to updating the commit messages with the prefix. @TrilokGeer WDYT?

https://github.com/openshift/enhancements/blob/master/dev-guide/kubernetes-rebase.md#picking-commits-from-the-previous-rebase-branch-to-the-new-branch

Updated the commit messages

TrilokGeer commented 2 months ago

/lgtm

chiragkyal commented 2 months ago

/unhold

Senthamilarasu-STA commented 2 months ago

/label px-approved

michaelryanpeter commented 2 months ago

/label docs-approved

TrilokGeer commented 2 months ago

The latest tags on 8.10 are not reporting any important vulnerabilities, approving the PR based on present day CVE scan reports.

/lgtm

openshift-ci-robot commented 2 months ago

@arkadeepsen: Jira Issue OCPBUGS-37598: All pull requests linked via external trackers have merged:

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

In response to [this](https://github.com/openshift/ocp-release-operator-sdk/pull/387): >Rebase to upstream v1.36.1 > >- Ran the following script to create the rebase branch: > > ``` > ./UPSTREAM-MERGE.sh v1.36.1 > ``` >- Regenerated the `patches/03-setversion.patch` file to reflect the correct `SIMPLE_VERSION` >- Regenerated the fixsanity patch >- Regenerated the disable security context patch >- Regenerated the `06-build-darwin-binary.patch` file >- Regenerate the `11-openshiftv1-cli.patch` file >- Removed the downstream ansible code >- Updated vendor directory by running the following commands: > ``` > go mod tidy > go mod vendor > ``` Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Focp-release-operator-sdk). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.