OCPBUGS-21829: Merge upstream #133

pierreprinetti · 2023-10-20T08:22:04Z

This is a manual merge of upstream/master that resolves conflicts in go.mod, go.sum and vendor/modules.txt.

Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.57.0 to 1.58.2. - [Release notes](https://github.com/grpc/grpc-go/releases) - [Commits](grpc/grpc-go@v1.57.0...v1.58.2) --- updated-dependencies: - dependency-name: google.golang.org/grpc dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>

…go_modules/google.golang.org/grpc-1.58.2 chore(deps): bump google.golang.org/grpc from 1.57.0 to 1.58.2

fix: CVE-2021-25743

Bumps [github.com/onsi/gomega](https://github.com/onsi/gomega) from 1.27.10 to 1.28.0. - [Release notes](https://github.com/onsi/gomega/releases) - [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md) - [Commits](onsi/gomega@v1.27.10...v1.28.0) --- updated-dependencies: - dependency-name: github.com/onsi/gomega dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>

…go_modules/github.com/onsi/gomega-1.28.0 chore(deps): bump github.com/onsi/gomega from 1.27.10 to 1.28.0

increase-snapshot-timeout

…ot-timeout fix: increase snapshot timeout as 20min

Bumps [github.com/onsi/ginkgo/v2](https://github.com/onsi/ginkgo) from 2.12.0 to 2.12.1. - [Release notes](https://github.com/onsi/ginkgo/releases) - [Changelog](https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md) - [Commits](onsi/ginkgo@v2.12.0...v2.12.1) --- updated-dependencies: - dependency-name: github.com/onsi/ginkgo/v2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>

…go_modules/github.com/onsi/ginkgo/v2-2.12.1 chore(deps): bump github.com/onsi/ginkgo/v2 from 2.12.0 to 2.12.1

Bumps [golang.org/x/net](https://github.com/golang/net) from 0.15.0 to 0.16.0. - [Commits](golang/net@v0.15.0...v0.16.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>

…-panic fix: flag panic if a flag is defined after being set

…go_modules/golang.org/x/net-0.16.0 chore(deps): bump golang.org/x/net from 0.15.0 to 0.16.0

Bumps [github.com/onsi/ginkgo/v2](https://github.com/onsi/ginkgo) from 2.12.1 to 2.13.0. - [Release notes](https://github.com/onsi/ginkgo/releases) - [Changelog](https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md) - [Commits](onsi/ginkgo@v2.12.1...v2.13.0) --- updated-dependencies: - dependency-name: github.com/onsi/ginkgo/v2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>

…go_modules/github.com/onsi/ginkgo/v2-2.13.0 chore(deps): bump github.com/onsi/ginkgo/v2 from 2.12.1 to 2.13.0

Bumps [golang.org/x/net](https://github.com/golang/net) from 0.16.0 to 0.17.0. - [Commits](golang/net@v0.16.0...v0.17.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>

…go_modules/golang.org/x/net-0.17.0 chore(deps): bump golang.org/x/net from 0.16.0 to 0.17.0

Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.58.2 to 1.58.3. - [Release notes](https://github.com/grpc/grpc-go/releases) - [Commits](grpc/grpc-go@v1.58.2...v1.58.3) --- updated-dependencies: - dependency-name: google.golang.org/grpc dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>

…go_modules/google.golang.org/grpc-1.58.3 chore(deps): bump google.golang.org/grpc from 1.58.2 to 1.58.3

…nt_config feat: propagate default host configuration files to csi node

Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.58.3 to 1.59.0. - [Release notes](https://github.com/grpc/grpc-go/releases) - [Commits](grpc/grpc-go@v1.58.3...v1.59.0) --- updated-dependencies: - dependency-name: google.golang.org/grpc dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>

…go_modules/google.golang.org/grpc-1.59.0 chore(deps): bump google.golang.org/grpc from 1.58.3 to 1.59.0

Mitigations to CVE-2023-44487 were added to golang.org/x/net v0.17 (c4e9120) and in Go v1.20.10[1]. This PR bumps Go to v1.20 to benefit from the patches to the standard library. Aside, this patch also bump the pseudo-standard golang.org/x/... libraries to their latest available version for good measure. [1]: https://pkg.go.dev/vuln/GO-2023-2102

This change brings no changes in the current code, but asserts that potential future additions use updated versions of the dependencies.

pierreprinetti · 2023-10-20T12:39:40Z

/retest

Bump Go and golang.org/x/... to recent versions

openshift-ci-robot · 2023-10-20T14:36:24Z

@pierreprinetti: This pull request references Jira Issue OCPBUGS-21829, 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.15.0) matches configured target version for branch (4.15.0)
bug is in the state ASSIGNED, 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 (itbrown@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:

This is a manual merge of upstream/master that resolves conflicts in go.mod, go.sum and vendor/modules.txt.

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/test-infra repository.

MaysaMacedo · 2023-10-20T18:01:38Z

In general it LGTM, perhaps the deps failure could be fixed with go mod tidy?

pierreprinetti · 2023-10-20T18:57:28Z

In general it LGTM, perhaps the deps failure could be fixed with go mod tidy?

Unfortunately not. The upstream go.mod lists some dependencies with version “v0.0.0”, and overrides them with real versions in a “replace” stanza. Unfortunately, the tool that is supposed to lint go.mod in that failing job is stricter than the Go toolchain and doesn’t seem to understand “replace”.

EDIT: Kubernetes added a local dependency that needs replacement in every dependent package: https://github.com/kubernetes/kubernetes/blob/4b48ab1fdbdeee3568790e44bea55ea719205025/go.mod#L265

pierreprinetti · 2023-10-23T13:11:46Z

/hold
Wait for kubernetes-csi#528

pierreprinetti · 2023-10-25T12:11:32Z

/hold cancel
Applied kubernetes-csi#528 in the merge commit; the upstream patch should eventually merge gracefully.

pierreprinetti · 2023-10-25T13:16:46Z

/retest

pierreprinetti · 2023-10-25T16:15:51Z

/retest

openshift-ci · 2023-10-25T18:28:35Z

@pierreprinetti: 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/test-infra repository. I understand the commands that are listed here.

mandre

/lgtm
/approve

openshift-ci · 2023-10-26T07:56:37Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mandre, pierreprinetti

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~~ [mandre,pierreprinetti]

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 · 2023-10-26T07:58:21Z

@pierreprinetti: Jira Issue OCPBUGS-21829: All pull requests linked via external trackers have merged:

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

In response to this:

This is a manual merge of upstream/master that resolves conflicts in go.mod, go.sum and vendor/modules.txt.

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/test-infra repository.

openshift-merge-robot · 2023-10-26T16:11:09Z

Fix included in accepted release 4.15.0-0.nightly-2023-10-26-120535

openshift-bot · 2023-11-21T01:13:01Z

[ART PR BUILD NOTIFIER]

This PR has been included in build csi-driver-nfs-container-v4.15.0-202311202349.p0.g8e85ebf.assembly.stream for distgit csi-driver-nfs.
All builds following this will include this PR.

dependabot bot and others added 30 commits September 22, 2023 22:21

Merge pull request kubernetes-csi#506 from kubernetes-csi/dependabot/…

17d9913

…go_modules/google.golang.org/grpc-1.58.2 chore(deps): bump google.golang.org/grpc from 1.57.0 to 1.58.2

chore: upgrade k8s lib to 1.26

3196a6d

doc: fix typo

8e6d14d

test: test framework change due to k8s 1.26 lib upgrade

b458e3a

chore: fix golint

6c32316

test: use ginko/v2 lib in e2e test

938abb3

test: fix DeletePodAndWait failure

8d6a607

Merge pull request kubernetes-csi#511 from andyzhangx/CVE-2021-25743

b8765eb

fix: CVE-2021-25743

Merge pull request kubernetes-csi#510 from kubernetes-csi/dependabot/…

ef83e3a

…go_modules/github.com/onsi/gomega-1.28.0 chore(deps): bump github.com/onsi/gomega from 1.27.10 to 1.28.0

fix: increase snapshot timeout as 20min

2dbf7a3

increase-snapshot-timeout

Merge pull request kubernetes-csi#512 from andyzhangx/increase-snapsh…

eb6b492

…ot-timeout fix: increase snapshot timeout as 20min

Merge pull request kubernetes-csi#513 from kubernetes-csi/dependabot/…

77ad4ef

…go_modules/github.com/onsi/ginkgo/v2-2.12.1 chore(deps): bump github.com/onsi/ginkgo/v2 from 2.12.0 to 2.12.1

fix: flag panic if a flag is defined after being set

5b8c192

Merge pull request kubernetes-csi#516 from andyzhangx/fix-logtostderr…

e524930

…-panic fix: flag panic if a flag is defined after being set

Merge pull request kubernetes-csi#515 from kubernetes-csi/dependabot/…

432ac4b

…go_modules/golang.org/x/net-0.16.0 chore(deps): bump golang.org/x/net from 0.15.0 to 0.16.0

Merge pull request kubernetes-csi#518 from kubernetes-csi/dependabot/…

8e99a91

…go_modules/github.com/onsi/ginkgo/v2-2.13.0 chore(deps): bump github.com/onsi/ginkgo/v2 from 2.12.1 to 2.13.0

Merge pull request kubernetes-csi#519 from kubernetes-csi/dependabot/…

b9d973a

…go_modules/golang.org/x/net-0.17.0 chore(deps): bump golang.org/x/net from 0.16.0 to 0.17.0

Merge pull request kubernetes-csi#520 from kubernetes-csi/dependabot/…

3faec17

…go_modules/google.golang.org/grpc-1.58.3 chore(deps): bump google.golang.org/grpc from 1.58.2 to 1.58.3

feat: propagate default host configuration files to csi node

fda9ff2

Merge pull request kubernetes-csi#521 from vlboiko/propagate_host_mou…

ad1a47b

…nt_config feat: propagate default host configuration files to csi node

Merge pull request kubernetes-csi#523 from kubernetes-csi/dependabot/…

dec5a8c

…go_modules/google.golang.org/grpc-1.59.0 chore(deps): bump google.golang.org/grpc from 1.58.3 to 1.59.0

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 20, 2023

Update k8s.io/apimachinery and k8s.io/apiserver

8b12110

This change brings no changes in the current code, but asserts that potential future additions use updated versions of the dependencies.

Merge pull request kubernetes-csi#527 from shiftstack/bump

32d2422

Bump Go and golang.org/x/... to recent versions

pierreprinetti force-pushed the merge-upstream branch from 5df437e to bed85b4 Compare October 20, 2023 14:33

pierreprinetti changed the title ~~Merge upstream~~ OCPBUGS-21829: Merge upstream Oct 20, 2023

openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Oct 20, 2023

pierreprinetti force-pushed the merge-upstream branch from bed85b4 to 73c6f6b Compare October 23, 2023 13:01

openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 23, 2023

Merge remote-tracking branch 'upstream/master' into merge-upstream

566fcd0

pierreprinetti force-pushed the merge-upstream branch from 73c6f6b to 566fcd0 Compare October 25, 2023 12:10

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

mandre reviewed Oct 26, 2023

View reviewed changes

openshift-ci bot assigned mandre Oct 26, 2023

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Oct 26, 2023

openshift-ci bot merged commit 8e85ebf into openshift:master Oct 26, 2023

pierreprinetti deleted the merge-upstream branch October 26, 2023 09:03

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

OCPBUGS-21829: Merge upstream #133

OCPBUGS-21829: Merge upstream #133

pierreprinetti commented Oct 20, 2023

pierreprinetti commented Oct 20, 2023

openshift-ci-robot commented Oct 20, 2023

MaysaMacedo commented Oct 20, 2023

pierreprinetti commented Oct 20, 2023 •

edited

Loading

pierreprinetti commented Oct 23, 2023

pierreprinetti commented Oct 25, 2023

pierreprinetti commented Oct 25, 2023

pierreprinetti commented Oct 25, 2023

openshift-ci bot commented Oct 25, 2023

mandre left a comment

openshift-ci bot commented Oct 26, 2023

openshift-ci-robot commented Oct 26, 2023

openshift-merge-robot commented Oct 26, 2023

openshift-bot commented Nov 21, 2023

OCPBUGS-21829: Merge upstream #133

OCPBUGS-21829: Merge upstream #133

Conversation

pierreprinetti commented Oct 20, 2023

pierreprinetti commented Oct 20, 2023

openshift-ci-robot commented Oct 20, 2023

MaysaMacedo commented Oct 20, 2023

pierreprinetti commented Oct 20, 2023 • edited Loading

pierreprinetti commented Oct 23, 2023

pierreprinetti commented Oct 25, 2023

pierreprinetti commented Oct 25, 2023

pierreprinetti commented Oct 25, 2023

openshift-ci bot commented Oct 25, 2023

mandre left a comment

Choose a reason for hiding this comment

openshift-ci bot commented Oct 26, 2023

openshift-ci-robot commented Oct 26, 2023

openshift-merge-robot commented Oct 26, 2023

openshift-bot commented Nov 21, 2023

pierreprinetti commented Oct 20, 2023 •

edited

Loading