Skip to content

Comments

CFE-1021: Rebase to latest upstream master#61

Closed
bharath-b-rh wants to merge 136 commits intoopenshift:masterfrom
bharath-b-rh:rebase-master
Closed

CFE-1021: Rebase to latest upstream master#61
bharath-b-rh wants to merge 136 commits intoopenshift:masterfrom
bharath-b-rh:rebase-master

Conversation

@bharath-b-rh
Copy link

https://issues.redhat.com/browse/CFE-1021

Rebase to latest upstream master which contains the commit required for openshift/enhancements#1217 proposed to support GCP tags in OCP, which requires gcp-pd-csi-driver to add user tags passed in command line args or the StorageClassobject to resources created by it.

Diff to upstream: https://github.com/openshift/gcp-pd-csi-driver/compare/master...bharath-b-rh:gcp-pd-csi-driver:rebase-master?expand=1

dependabot bot and others added 30 commits January 15, 2024 10:51
Bumps golang from 1.21.5 to 1.21.6.

---
updated-dependencies:
- dependency-name: golang
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps the golang-x group with 1 update: [golang.org/x/tools](https://github.com/golang/tools).


Updates `golang.org/x/tools` from 0.16.1 to 0.17.0
- [Release notes](https://github.com/golang/tools/releases)
- [Commits](golang/tools@v0.16.1...v0.17.0)

---
updated-dependencies:
- dependency-name: golang.org/x/tools
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: golang-x
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps the google-golang group with 1 update: [google.golang.org/api](https://github.com/googleapis/google-api-go-client).


Updates `google.golang.org/api` from 0.156.0 to 0.157.0
- [Release notes](https://github.com/googleapis/google-api-go-client/releases)
- [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md)
- [Commits](googleapis/google-api-go-client@v0.156.0...v0.157.0)

---
updated-dependencies:
- dependency-name: google.golang.org/api
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: google-golang
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps the onsi group with 2 updates: [github.com/onsi/ginkgo/v2](https://github.com/onsi/ginkgo) and [github.com/onsi/gomega](https://github.com/onsi/gomega).


Updates `github.com/onsi/ginkgo/v2` from 2.14.0 to 2.15.0
- [Release notes](https://github.com/onsi/ginkgo/releases)
- [Changelog](https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md)
- [Commits](onsi/ginkgo@v2.14.0...v2.15.0)

Updates `github.com/onsi/gomega` from 1.30.0 to 1.31.1
- [Release notes](https://github.com/onsi/gomega/releases)
- [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md)
- [Commits](onsi/gomega@v1.30.0...v1.31.1)

---
updated-dependencies:
- dependency-name: github.com/onsi/ginkgo/v2
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: onsi
- dependency-name: github.com/onsi/gomega
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: onsi
...

Signed-off-by: dependabot[bot] <support@github.com>
…ot/go_modules/golang-x-159a68acba

Bump the golang-x group with 1 update
…ot/docker/golang-1.21.6

Bump golang from 1.21.5 to 1.21.6
…ot/go_modules/google-golang-9353f3e5ae

Bump the google-golang group with 1 update
…ot/go_modules/onsi-9ab196c076

Bump the onsi group with 2 updates
update klog version to latest. change %w unwrap to %v
Bumps the google-golang group with 2 updates: [google.golang.org/api](https://github.com/googleapis/google-api-go-client) and [google.golang.org/grpc](https://github.com/grpc/grpc-go).


Updates `google.golang.org/api` from 0.157.0 to 0.159.0
- [Release notes](https://github.com/googleapis/google-api-go-client/releases)
- [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md)
- [Commits](googleapis/google-api-go-client@v0.157.0...v0.159.0)

Updates `google.golang.org/grpc` from 1.60.1 to 1.61.0
- [Release notes](https://github.com/grpc/grpc-go/releases)
- [Commits](grpc/grpc-go@v1.60.1...v1.61.0)

---
updated-dependencies:
- dependency-name: google.golang.org/api
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: google-golang
- dependency-name: google.golang.org/grpc
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: google-golang
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps the k8s-dependencies group with 1 update: [k8s.io/mount-utils](https://github.com/kubernetes/mount-utils).


Updates `k8s.io/mount-utils` from 0.29.0-alpha.2 to 0.30.0-alpha.0
- [Commits](kubernetes/mount-utils@v0.29.0-alpha.2...v0.30.0-alpha.0)

---
updated-dependencies:
- dependency-name: k8s.io/mount-utils
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: k8s-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
…ot/go_modules/google-golang-692e79fb93

Bump the google-golang group with 2 updates
…ot/go_modules/k8s-dependencies-e94bdd615c

Bump the k8s-dependencies group with 1 update
Bumps the google-golang group with 1 update: [google.golang.org/api](https://github.com/googleapis/google-api-go-client).


Updates `google.golang.org/api` from 0.159.0 to 0.161.0
- [Release notes](https://github.com/googleapis/google-api-go-client/releases)
- [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md)
- [Commits](googleapis/google-api-go-client@v0.159.0...v0.161.0)

---
updated-dependencies:
- dependency-name: google.golang.org/api
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: google-golang
...

Signed-off-by: dependabot[bot] <support@github.com>
…ot/go_modules/google-golang-74cb9e1d69

Bump the google-golang group with 1 update
Bumps the cloud-go group with 3 updates: [cloud.google.com/go/kms](https://github.com/googleapis/google-cloud-go), [cloud.google.com/go/compute](https://github.com/googleapis/google-cloud-go) and [cloud.google.com/go/iam](https://github.com/googleapis/google-cloud-go).


Updates `cloud.google.com/go/kms` from 1.15.5 to 1.15.6
- [Release notes](https://github.com/googleapis/google-cloud-go/releases)
- [Changelog](https://github.com/googleapis/google-cloud-go/blob/main/CHANGES.md)
- [Commits](googleapis/google-cloud-go@kms/v1.15.5...kms/v1.15.6)

Updates `cloud.google.com/go/compute` from 1.23.3 to 1.23.4
- [Release notes](https://github.com/googleapis/google-cloud-go/releases)
- [Changelog](https://github.com/googleapis/google-cloud-go/blob/main/documentai/CHANGES.md)
- [Commits](googleapis/google-cloud-go@compute/v1.23.3...compute/v1.23.4)

Updates `cloud.google.com/go/iam` from 1.1.5 to 1.1.6
- [Release notes](https://github.com/googleapis/google-cloud-go/releases)
- [Changelog](https://github.com/googleapis/google-cloud-go/blob/main/CHANGES.md)
- [Commits](googleapis/google-cloud-go@iam/v1.1.5...iam/v1.1.6)

---
updated-dependencies:
- dependency-name: cloud.google.com/go/kms
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: cloud-go
- dependency-name: cloud.google.com/go/compute
  dependency-type: indirect
  update-type: version-update:semver-patch
  dependency-group: cloud-go
- dependency-name: cloud.google.com/go/iam
  dependency-type: indirect
  update-type: version-update:semver-patch
  dependency-group: cloud-go
...

Signed-off-by: dependabot[bot] <support@github.com>
…ot/go_modules/cloud-go-1bc66bd06d

Bump the cloud-go group with 3 updates
dependabot bot and others added 17 commits April 19, 2024 01:52
Bumps the golang-x group with 8 updates:

| Package | From | To |
| --- | --- | --- |
| [golang.org/x/oauth2](https://github.com/golang/oauth2) | `0.18.0` | `0.19.0` |
| [golang.org/x/sys](https://github.com/golang/sys) | `0.18.0` | `0.19.0` |
| [golang.org/x/crypto](https://github.com/golang/crypto) | `0.21.0` | `0.22.0` |
| [golang.org/x/mod](https://github.com/golang/mod) | `0.16.0` | `0.17.0` |
| [golang.org/x/net](https://github.com/golang/net) | `0.22.0` | `0.24.0` |
| [golang.org/x/sync](https://github.com/golang/sync) | `0.6.0` | `0.7.0` |
| [golang.org/x/term](https://github.com/golang/term) | `0.18.0` | `0.19.0` |
| [golang.org/x/tools](https://github.com/golang/tools) | `0.19.0` | `0.20.0` |


Updates `golang.org/x/oauth2` from 0.18.0 to 0.19.0
- [Commits](golang/oauth2@v0.18.0...v0.19.0)

Updates `golang.org/x/sys` from 0.18.0 to 0.19.0
- [Commits](golang/sys@v0.18.0...v0.19.0)

Updates `golang.org/x/crypto` from 0.21.0 to 0.22.0
- [Commits](golang/crypto@v0.21.0...v0.22.0)

Updates `golang.org/x/mod` from 0.16.0 to 0.17.0
- [Commits](golang/mod@v0.16.0...v0.17.0)

Updates `golang.org/x/net` from 0.22.0 to 0.24.0
- [Commits](golang/net@v0.22.0...v0.24.0)

Updates `golang.org/x/sync` from 0.6.0 to 0.7.0
- [Commits](golang/sync@v0.6.0...v0.7.0)

Updates `golang.org/x/term` from 0.18.0 to 0.19.0
- [Commits](golang/term@v0.18.0...v0.19.0)

Updates `golang.org/x/tools` from 0.19.0 to 0.20.0
- [Release notes](https://github.com/golang/tools/releases)
- [Commits](golang/tools@v0.19.0...v0.20.0)

---
updated-dependencies:
- dependency-name: golang.org/x/oauth2
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: golang-x
- dependency-name: golang.org/x/sys
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: golang-x
- dependency-name: golang.org/x/crypto
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: golang-x
- dependency-name: golang.org/x/mod
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: golang-x
- dependency-name: golang.org/x/net
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: golang-x
- dependency-name: golang.org/x/sync
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: golang-x
- dependency-name: golang.org/x/term
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: golang-x
- dependency-name: golang.org/x/tools
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: golang-x
...

Signed-off-by: dependabot[bot] <support@github.com>
…ot/go_modules/golang-x-bce76a89c4

Bump the golang-x group with 8 updates
…un-patch-1

Update isVolumePathMounted log message
…k-at-unstage

Add support for checking if a device is being used by a filesystem
Bumps the cloud-go group with 1 update: [cloud.google.com/go/compute/metadata](https://github.com/googleapis/google-cloud-go).


Updates `cloud.google.com/go/compute/metadata` from 0.2.3 to 0.3.0
- [Release notes](https://github.com/googleapis/google-cloud-go/releases)
- [Changelog](https://github.com/googleapis/google-cloud-go/blob/main/CHANGES.md)
- [Commits](googleapis/google-cloud-go@netapp/v0.2.3...v0.3.0)

---
updated-dependencies:
- dependency-name: cloud.google.com/go/compute/metadata
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: cloud-go
...

Signed-off-by: dependabot[bot] <support@github.com>
…ot/docker/golang-1.22.2

Bump golang from 1.22.1 to 1.22.2
…ot/go_modules/cloud-go-34bfff6078

Bump cloud.google.com/go/compute/metadata from 0.2.3 to 0.3.0 in the cloud-go group
…ager-tags

Support to add ResoureManagerTags to GCP Compute Disk, Image, Snapshot
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Apr 30, 2024
@openshift-ci-robot
Copy link

openshift-ci-robot commented Apr 30, 2024

@bharath-b-rh: This pull request references CFE-1021 which is a valid jira issue.

Details

In response to this:

https://issues.redhat.com/browse/CFE-1021

Rebase to latest upstream master which contains the commit required for openshift/enhancements#1217 proposed to support GCP tags in OCP, which requires gcp-pd-csi-driver to add user tags passed in command line args or the StorageClassobject to resources created by it.

Diff to upstream: https://github.com/openshift/gcp-pd-csi-driver/compare/master...bharath-b-rh:gcp-pd-csi-driver:rebase-master?expand=1

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 mpatlasov and tsmetana April 30, 2024 05:46
@openshift-ci
Copy link

openshift-ci bot commented Apr 30, 2024

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: bharath-b-rh
Once this PR has been reviewed and has the lgtm label, please assign gnufied for approval. For more information see the Kubernetes Code Review Process.

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

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

@openshift-ci
Copy link

openshift-ci bot commented Apr 30, 2024

@bharath-b-rh: The following tests 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-gcp-csi 24c4c0b link true /test e2e-gcp-csi
ci/prow/e2e-gcp-ovn-upgrade 24c4c0b link true /test e2e-gcp-ovn-upgrade
ci/prow/e2e-gcp-csi-extended 24c4c0b link false /test e2e-gcp-csi-extended
ci/prow/verify-deps 24c4c0b link true /test verify-deps
ci/prow/e2e-gcp 24c4c0b link true /test e2e-gcp
ci/prow/images 24c4c0b link true /test images

Full PR test history. Your PR dashboard.

Details

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.

@bharath-b-rh
Copy link
Author

CI jobs are failing due to mismatch in expected go version. Should I update the version here

@jsafrane
Copy link

jsafrane commented Apr 30, 2024

/hold
we do not rebase to unreleased master. You must wait for an upstream tag. Or cherry-pick just the code that you need, if it's small enough.

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 30, 2024
@bharath-b-rh
Copy link
Author

we do not rebase to unreleased master. You must wait for an upstream tag. Or cherry-pick just the code that you need, if it's small enough.

Thank you for taking a look at the PR @jsafrane !!
Sorry, I was not aware. I tried doing a cherry-pick, but there are some other changes made in upstream which are required for successful compilation of the code.

@bharath-b-rh bharath-b-rh deleted the rebase-master branch May 27, 2024 10:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type.

Projects

None yet

Development

Successfully merging this pull request may close these issues.