Skip to content

CFE-1022: Rebase to latest upstream master#36

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

CFE-1022: Rebase to latest upstream master#36
bharath-b-rh wants to merge 181 commits intoopenshift:masterfrom
bharath-b-rh:rebase-master

Conversation

@bharath-b-rh
Copy link
Copy Markdown

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

Rebase to latest upstream master which contains the commit required for openshift/enhancements#1217 proposed to support GCP tags in OCP, which requires gcp-filestore-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-filestore-csi-driver/compare/master...bharath-b-rh:ocp-gcp-filestore-csi-driver:rebase-master?expand=1

leiyiz and others added 30 commits July 19, 2023 10:48
update changelog and prow tag for 1.6.0-rc1
Refactor singleshare CreateSnapshot
…e-test

Add test for DeleteSnapshot Multishare
…ore-changelog

Updating changelog for release v1.6.1, v1.5.7, v1.4.7, v1.3.17
Bump go version to 1.20.8 to fix for CVE fixing
…tch-6

Remove ARG BUILDPLATFORM from Dockerfile
k8s-ci-robot and others added 19 commits April 15, 2024 09:11
issue-639: Add labels from command line option to filestore backup resource
Bumps the golang-x group with 5 updates:

| Package | From | To |
| --- | --- | --- |
| [golang.org/x/net](https://github.com/golang/net) | `0.22.0` | `0.24.0` |
| [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/term](https://github.com/golang/term) | `0.18.0` | `0.19.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/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/term` from 0.18.0 to 0.19.0
- [Commits](golang/term@v0.18.0...v0.19.0)

---
updated-dependencies:
- dependency-name: golang.org/x/net
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: golang-x
- 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/term
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: golang-x
...

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

Bump the golang-x group with 5 updates
Bumps the google-golang group with 1 update: [google.golang.org/grpc](https://github.com/grpc/grpc-go).


Updates `google.golang.org/grpc` from 1.62.1 to 1.63.2
- [Release notes](https://github.com/grpc/grpc-go/releases)
- [Commits](grpc/grpc-go@v1.62.1...v1.63.2)

---
updated-dependencies:
- 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>
…t/go_modules/google-golang-b5842cd3e0

Bump google.golang.org/grpc from 1.62.1 to 1.63.2 in the google-golang group
…t/docker/cmd/webhook/golang-1.22.2

Bump golang from 1.22.1 to 1.22.2 in /cmd/webhook
…t/docker/golang-1.22.2

Bump golang from 1.22.1 to 1.22.2
Bumps the google-golang group with 2 updates: [google.golang.org/api](https://github.com/googleapis/google-api-go-client) and [google.golang.org/genproto/googleapis/rpc](https://github.com/googleapis/go-genproto).


Updates `google.golang.org/api` from 0.172.0 to 0.176.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.172.0...v0.176.0)

Updates `google.golang.org/genproto/googleapis/rpc` from 0.0.0-20240318140521-94a12d6c2237 to 0.0.0-20240415180920-8c6c420018be
- [Commits](https://github.com/googleapis/go-genproto/commits)

---
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/genproto/googleapis/rpc
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: google-golang
...

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


Updates `github.com/onsi/gomega` from 1.32.0 to 1.33.0
- [Release notes](https://github.com/onsi/gomega/releases)
- [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md)
- [Commits](onsi/gomega@v1.32.0...v1.33.0)

---
updated-dependencies:
- 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>
…t/go_modules/google-golang-2f7b24221c

Bump the google-golang group with 2 updates
…t/go_modules/onsi-64ab4fdf8a

Bump github.com/onsi/gomega from 1.32.0 to 1.33.0 in the onsi group
issue-567: Support to add ResoureManagerTags to GCP Filestore resources
@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
Copy Markdown

openshift-ci-robot commented Apr 30, 2024

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

Details

In response to this:

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

Rebase to latest upstream master which contains the commit required for openshift/enhancements#1217 proposed to support GCP tags in OCP, which requires gcp-filestore-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-filestore-csi-driver/compare/master...bharath-b-rh:ocp-gcp-filestore-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
Copy link
Copy Markdown

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 dobsonj 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
Copy Markdown

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/security 2d910a8 link false /test security
ci/prow/unit 2d910a8 link true /test unit

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.

@jsafrane
Copy link
Copy Markdown

/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 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.