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.

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

[release-4.17] OCPBUGS-47493: MGMT-19537: Bump golang.org/x/net to 0.33.0 #989

Merged
merged 3 commits into from
Jan 9, 2025

Conversation

adriengentil
Copy link
Contributor

Remove pin on golang.org/x/net

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Dec 20, 2024
@openshift-ci-robot
Copy link

openshift-ci-robot commented Dec 20, 2024

@adriengentil: This pull request references MGMT-19537 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 task to target the "4.17.z" version, but no target version was set.

In response to this:

Remove pin on golang.org/x/net

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 javipolo and rccrdpccl December 20, 2024 15:04
@openshift-ci openshift-ci bot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Dec 20, 2024
@adriengentil adriengentil changed the title [release-4.17] MGMT-19537: Bump golang.org/x/net to 0.33.0 [release-4.17] OCPBUGS-47493: MGMT-19537: Bump golang.org/x/net to 0.33.0 Dec 20, 2024
@openshift-ci-robot
Copy link

@adriengentil: This pull request references Jira Issue OCPBUGS-47493, which is invalid:

  • expected dependent Jira Issue OCPBUGS-47491 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is POST instead

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:

Remove pin on golang.org/x/net

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 openshift-ci-robot added the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Dec 20, 2024
danmanor and others added 3 commits December 20, 2024 10:30
The change to use `go.uber.org/mock` instead of the deprecated
`github.com/golang/mock` was was mostly done in the past. But the
_Dockerfile_ wasn't updated to use the new `mockgen` command.  As a
result if one installs the `mockgen` with the command from the
dockerfile and then runs `make generate` the resulting code doesn't
build:

```
$ grep mockgen Dockerfile.assisted-installer-build
  go install github.com/golang/mock/[email protected] && \

$ go install github.com/golang/mock/[email protected]

$ make generate
go generate ..
make format
make[1]: Entering directory '/files/projects/assisted-installer/repository'
make[1]: Leaving directory '/files/projects/assisted-installer/repository'

$ make build
CGO_ENABLED=0  go build -o build/installer src/main/main.go
src/main/drymock/dry_mode_k8s_mock.go:308:36: cannot use mockController (variable of type *"go.uber.org/mock/gomock".Controller) as *"github.com/golang/mock/gomock".Controller value in argument to k8s_client.NewMockK8SClient
make: *** [Makefile:68: installer] Error 1
```

To avoid this issue this patch updates the _Dockerfile_ to use the
`go.uber.org/mock` package.

There are also some minor white space changes introduced by running `go
generate`.

Signed-off-by: Juan Hernandez <[email protected]>
@adriengentil adriengentil force-pushed the release-4.17-update-x-net branch from b3d7f06 to 762873e Compare December 20, 2024 15:34
@openshift-ci openshift-ci bot added the downstream-change-needed Requires updating downstream image label Dec 20, 2024
Copy link

openshift-ci bot commented Dec 20, 2024

@adriengentil: 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.

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Dec 22, 2024
Copy link

openshift-ci bot commented Dec 22, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: adriengentil, gamli75

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 [adriengentil,gamli75]

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

@bfournie
Copy link

bfournie commented Jan 6, 2025

/label backport-risk-assessed

@openshift-ci openshift-ci bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Jan 6, 2025
@bmanzari
Copy link

bmanzari commented Jan 6, 2025

/label cherry-pick-approved

@openshift-ci openshift-ci bot added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Jan 6, 2025
@adriengentil
Copy link
Contributor Author

/jira refresh

@openshift-ci-robot openshift-ci-robot added the jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. label Jan 9, 2025
@openshift-ci-robot
Copy link

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

7 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.17.z) matches configured target version for branch (4.17.z)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note text is set and does not match the template
  • dependent bug Jira Issue OCPBUGS-47491 is in the state Closed (Done), which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
  • dependent Jira Issue OCPBUGS-47491 targets the "4.18.0" version, which is one of the valid target versions: 4.18.0
  • bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Jira ([email protected]), skipping review request.

In response to this:

/jira refresh

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 openshift-ci-robot removed the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Jan 9, 2025
@adriengentil adriengentil removed the downstream-change-needed Requires updating downstream image label Jan 9, 2025
@openshift-merge-bot openshift-merge-bot bot merged commit faffde9 into release-4.17 Jan 9, 2025
3 checks passed
@openshift-merge-bot openshift-merge-bot bot deleted the release-4.17-update-x-net branch January 9, 2025 16:20
@openshift-ci-robot
Copy link

@adriengentil: Jira Issue OCPBUGS-47493: All pull requests linked via external trackers have merged:

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

In response to this:

Remove pin on golang.org/x/net

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-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

Distgit: ose-agent-installer-orchestrator
This PR has been included in build ose-agent-installer-orchestrator-container-v4.17.0-202501091636.p0.gfaffde9.assembly.stream.el9.
All builds following this will include this PR.

@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

Distgit: ose-agent-installer-csr-approver
This PR has been included in build ose-agent-installer-csr-approver-container-v4.17.0-202501091636.p0.gfaffde9.assembly.stream.el9.
All builds following this will include this PR.

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. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants