STOR-2018: Rebase external-attacher to v4.7.0 for OCP 4.18 #80
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Bumps the github-dependencies group with 6 updates: | Package | From | To | | --- | --- | --- | | [github.com/go-logr/logr](https://github.com/go-logr/logr) | `1.4.1` | `1.4.2` | | [go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc](https://github.com/open-telemetry/opentelemetry-go-contrib) | `0.51.0` | `0.52.0` | | [go.opentelemetry.io/otel](https://github.com/open-telemetry/opentelemetry-go) | `1.26.0` | `1.27.0` | | [go.opentelemetry.io/otel/metric](https://github.com/open-telemetry/opentelemetry-go) | `1.26.0` | `1.27.0` | | [go.opentelemetry.io/otel/trace](https://github.com/open-telemetry/opentelemetry-go) | `1.26.0` | `1.27.0` | | [google.golang.org/genproto/googleapis/rpc](https://github.com/googleapis/go-genproto) | `0.0.0-20240318140521-94a12d6c2237` | `0.0.0-20240520151616-dc85e6b867a5` | Updates `github.com/go-logr/logr` from 1.4.1 to 1.4.2 - [Release notes](https://github.com/go-logr/logr/releases) - [Changelog](https://github.com/go-logr/logr/blob/master/CHANGELOG.md) - [Commits](go-logr/logr@v1.4.1...v1.4.2) Updates `go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc` from 0.51.0 to 0.52.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-go-contrib/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-go-contrib/blob/main/CHANGELOG.md) - [Commits](open-telemetry/opentelemetry-go-contrib@zpages/v0.51.0...zpages/v0.52.0) Updates `go.opentelemetry.io/otel` from 1.26.0 to 1.27.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-go/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-go/blob/main/CHANGELOG.md) - [Commits](open-telemetry/opentelemetry-go@v1.26.0...v1.27.0) Updates `go.opentelemetry.io/otel/metric` from 1.26.0 to 1.27.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-go/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-go/blob/main/CHANGELOG.md) - [Commits](open-telemetry/opentelemetry-go@v1.26.0...v1.27.0) Updates `go.opentelemetry.io/otel/trace` from 1.26.0 to 1.27.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-go/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-go/blob/main/CHANGELOG.md) - [Commits](open-telemetry/opentelemetry-go@v1.26.0...v1.27.0) Updates `google.golang.org/genproto/googleapis/rpc` from 0.0.0-20240318140521-94a12d6c2237 to 0.0.0-20240520151616-dc85e6b867a5 - [Commits](https://github.com/googleapis/go-genproto/commits) --- updated-dependencies: - dependency-name: github.com/go-logr/logr dependency-type: indirect update-type: version-update:semver-patch dependency-group: github-dependencies - dependency-name: go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc dependency-type: indirect update-type: version-update:semver-minor dependency-group: github-dependencies - dependency-name: go.opentelemetry.io/otel dependency-type: indirect update-type: version-update:semver-minor dependency-group: github-dependencies - dependency-name: go.opentelemetry.io/otel/metric dependency-type: indirect update-type: version-update:semver-minor dependency-group: github-dependencies - dependency-name: go.opentelemetry.io/otel/trace dependency-type: indirect update-type: version-update:semver-minor dependency-group: github-dependencies - dependency-name: google.golang.org/genproto/googleapis/rpc dependency-type: indirect update-type: version-update:semver-patch dependency-group: github-dependencies ... Signed-off-by: dependabot[bot] <[email protected]>
…go_modules/github-dependencies-0ba335d4d8 Bump the github-dependencies group with 6 updates
The same context.WithTimeout was used in different places when calling the CSI drivers. With recent changes, the code execution started taking longer and the context would hit its timeout on the 2nd driver call. This change use a separate context.WithTimeout for each CSI call
…/fix-attacher-timeout Fix timeout on short CSI calls during attacher initialization
Bumps the k8s-dependencies group with 1 update: [github.com/kubernetes-csi/csi-lib-utils](https://github.com/kubernetes-csi/csi-lib-utils). Updates `github.com/kubernetes-csi/csi-lib-utils` from 0.18.0 to 0.18.1 - [Release notes](https://github.com/kubernetes-csi/csi-lib-utils/releases) - [Commits](kubernetes-csi/csi-lib-utils@v0.18.0...v0.18.1) --- updated-dependencies: - dependency-name: github.com/kubernetes-csi/csi-lib-utils dependency-type: direct:production update-type: version-update:semver-patch dependency-group: k8s-dependencies ... Signed-off-by: dependabot[bot] <[email protected]>
Bumps the github-dependencies group with 2 updates: [github.com/emicklei/go-restful/v3](https://github.com/emicklei/go-restful) and [github.com/prometheus/procfs](https://github.com/prometheus/procfs). Updates `github.com/emicklei/go-restful/v3` from 3.12.0 to 3.12.1 - [Release notes](https://github.com/emicklei/go-restful/releases) - [Changelog](https://github.com/emicklei/go-restful/blob/v3/CHANGES.md) - [Commits](emicklei/go-restful@v3.12.0...v3.12.1) Updates `github.com/prometheus/procfs` from 0.15.0 to 0.15.1 - [Release notes](https://github.com/prometheus/procfs/releases) - [Commits](prometheus/procfs@v0.15.0...v0.15.1) --- updated-dependencies: - dependency-name: github.com/emicklei/go-restful/v3 dependency-type: indirect update-type: version-update:semver-patch dependency-group: github-dependencies - dependency-name: github.com/prometheus/procfs dependency-type: indirect update-type: version-update:semver-patch dependency-group: github-dependencies ... Signed-off-by: dependabot[bot] <[email protected]>
…go_modules/k8s-dependencies-96c6e50859 Bump github.com/kubernetes-csi/csi-lib-utils from 0.18.0 to 0.18.1 in the k8s-dependencies group
…go_modules/github-dependencies-c403a9ef0b Bump the github-dependencies group with 2 updates
Bumps the k8s-dependencies group with 1 update in the / directory: [k8s.io/klog/v2](https://github.com/kubernetes/klog). Updates `k8s.io/klog/v2` from 2.120.1 to 2.130.1 - [Release notes](https://github.com/kubernetes/klog/releases) - [Changelog](https://github.com/kubernetes/klog/blob/main/RELEASE.md) - [Commits](kubernetes/klog@v2.120.1...v2.130.1) --- updated-dependencies: - dependency-name: k8s.io/klog/v2 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: k8s-dependencies ... Signed-off-by: dependabot[bot] <[email protected]>
…go_modules/k8s-dependencies-f351cbf957 Bump k8s.io/klog/v2 from 2.120.1 to 2.130.1 in the k8s-dependencies group across 1 directory
update Kubernetes to 1.31.0-rc.0
988496a1 Merge pull request kubernetes-csi#257 from jakobmoellerdev/csi-prow-sidecar-e2e-path 028f8c69 chore: bump to Go 1.22.5 69bd71e8 chore: add CSI_PROW_SIDECAR_E2E_PATH f40f0ccd Merge pull request kubernetes-csi#256 from solumath/master cfa92106 Instruction update 379a1bb9 Merge pull request kubernetes-csi#255 from humblec/sidecar-md a5667bbb fix typo in sidecar release process 49676850 Merge pull request kubernetes-csi#254 from bells17/add-github-actions d9bd160c Update skip list in codespell GitHub Action f5aebfc9 Add GitHub Actions workflows git-subtree-dir: release-tools git-subtree-split: 988496a1fc3849ed793e03012fdd56813d13d46c
Update kubernetes to 1.31
Bumps the github-dependencies group with 5 updates in the / directory: | Package | From | To | | --- | --- | --- | | [github.com/container-storage-interface/spec](https://github.com/container-storage-interface/spec) | `1.9.0` | `1.10.0` | | [go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc](https://github.com/open-telemetry/opentelemetry-go-contrib) | `0.52.0` | `0.53.0` | | [golang.org/x/net](https://github.com/golang/net) | `0.26.0` | `0.28.0` | | [golang.org/x/oauth2](https://github.com/golang/oauth2) | `0.21.0` | `0.22.0` | | [golang.org/x/time](https://github.com/golang/time) | `0.5.0` | `0.6.0` | Updates `github.com/container-storage-interface/spec` from 1.9.0 to 1.10.0 - [Release notes](https://github.com/container-storage-interface/spec/releases) - [Commits](container-storage-interface/spec@v1.9.0...v1.10.0) Updates `go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc` from 0.52.0 to 0.53.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-go-contrib/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-go-contrib/blob/main/CHANGELOG.md) - [Commits](open-telemetry/opentelemetry-go-contrib@zpages/v0.52.0...zpages/v0.53.0) Updates `golang.org/x/net` from 0.26.0 to 0.28.0 - [Commits](golang/net@v0.26.0...v0.28.0) Updates `golang.org/x/oauth2` from 0.21.0 to 0.22.0 - [Commits](golang/oauth2@v0.21.0...v0.22.0) Updates `golang.org/x/sys` from 0.21.0 to 0.23.0 - [Commits](golang/sys@v0.21.0...v0.23.0) Updates `golang.org/x/term` from 0.21.0 to 0.23.0 - [Commits](golang/term@v0.21.0...v0.23.0) Updates `golang.org/x/text` from 0.16.0 to 0.17.0 - [Release notes](https://github.com/golang/text/releases) - [Commits](golang/text@v0.16.0...v0.17.0) Updates `golang.org/x/time` from 0.5.0 to 0.6.0 - [Commits](golang/time@v0.5.0...v0.6.0) --- updated-dependencies: - dependency-name: github.com/container-storage-interface/spec dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-dependencies - dependency-name: go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc dependency-type: indirect update-type: version-update:semver-minor dependency-group: github-dependencies - dependency-name: golang.org/x/net dependency-type: indirect update-type: version-update:semver-minor dependency-group: github-dependencies - dependency-name: golang.org/x/oauth2 dependency-type: indirect update-type: version-update:semver-minor dependency-group: github-dependencies - dependency-name: golang.org/x/sys dependency-type: indirect update-type: version-update:semver-minor dependency-group: github-dependencies - dependency-name: golang.org/x/term dependency-type: indirect update-type: version-update:semver-minor dependency-group: github-dependencies - dependency-name: golang.org/x/text dependency-type: indirect update-type: version-update:semver-minor dependency-group: github-dependencies - dependency-name: golang.org/x/time dependency-type: indirect update-type: version-update:semver-minor dependency-group: github-dependencies ... Signed-off-by: dependabot[bot] <[email protected]>
Bump the github-dependencies group across 1 directory with 9 updates
Bumps the github-dependencies group with 2 updates: [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) and [golang.org/x/sys](https://github.com/golang/sys). Updates `github.com/prometheus/client_golang` from 1.19.1 to 1.20.0 - [Release notes](https://github.com/prometheus/client_golang/releases) - [Changelog](https://github.com/prometheus/client_golang/blob/main/CHANGELOG.md) - [Commits](prometheus/client_golang@v1.19.1...v1.20.0) Updates `golang.org/x/sys` from 0.23.0 to 0.24.0 - [Commits](golang/sys@v0.23.0...v0.24.0) --- updated-dependencies: - dependency-name: github.com/prometheus/client_golang dependency-type: indirect update-type: version-update:semver-minor dependency-group: github-dependencies - dependency-name: golang.org/x/sys dependency-type: indirect update-type: version-update:semver-minor dependency-group: github-dependencies ... Signed-off-by: dependabot[bot] <[email protected]>
…go_modules/github-dependencies-860bece92e Bump the github-dependencies group with 2 updates
Update changelog 4.7.0
|
@rhrmo: This pull request references STOR-2018 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.18.0" version, but no target version was set. In response to this:
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
added
the
jira/valid-reference
|
/hold |
openshift-ci
bot
added
the
do-not-merge/hold
|
/retest |
|
@jsafrane it does not show up when I search through commits from last common ancestor: but you are right, it should be there, I think... is just adding the commit in it's proper order enough? |
|
squash everything into |
And remove .github
|
/unhold |
openshift-ci
bot
removed
the
do-not-merge/hold
|
/retest-required |
|
@rhrmo: 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. |
|
/lgtm |
openshift-ci
bot
added
px-approved
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: jsafrane, rhrmo 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 |
openshift-ci
bot
added
the
approved
|
The CI result looks good. |
openshift-ci
bot
added
the
qe-approved
|
@rhrmo: This pull request references STOR-2018 which is a valid jira issue. In response to this:
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. |
|
[ART PR BUILD NOTIFIER] Distgit: csi-attacher |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Diff to upstream 4.7.0:
kubernetes-csi/external-attacher@v4.7.0...rhrmo:rebase-4.7.0
Changes between 4.6.1 (OCP 4.17) and 4.7.0 (OCP 4.18):
Full changelogs:
https://github.com/kubernetes-csi/external-attacher/blob/release-4.7/CHANGELOG/CHANGELOG-4.7.md
@openshift/storage