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

Bug 1952610: Bump dependencies #272

Merged
merged 2 commits into from May 20, 2021

Conversation

dmage
Copy link
Member

@dmage dmage commented May 7, 2021

To support new AWS regions, we need to use a newer version of aws-sdk-go.

@openshift-ci openshift-ci bot added bugzilla/severity-urgent Referenced Bugzilla bug's severity is urgent for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. labels May 7, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 7, 2021

@dmage: This pull request references Bugzilla bug 1952610, which is valid. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.8.0) matches configured target release for branch (4.8.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

Requesting review from QA contact:
/cc @wzheng1

In response to this:

Bug 1952610: Bump dependencies

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-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 7, 2021
@dmage
Copy link
Member Author

dmage commented May 7, 2021

/assign @ricardomaraschini

Copy link
Contributor

@ricardomaraschini ricardomaraschini left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label May 10, 2021
@ricardomaraschini
Copy link
Contributor

/lgtm cancel

@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label May 10, 2021
@dmage
Copy link
Member Author

dmage commented May 19, 2021

/retest

@wzheng1
Copy link

wzheng1 commented May 20, 2021

/lgtm
/label qe-approved
Installation succeeds with the prs: #272,openshift/cluster-image-registry-operator#685

@openshift-ci openshift-ci bot added the qe-approved Signifies that QE has signed off on this PR label May 20, 2021
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label May 20, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 20, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dmage, wzheng1

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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

2 similar comments
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot openshift-merge-robot merged commit baa797a into openshift:master May 20, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 20, 2021

@dmage: Some pull requests linked via external trackers have merged:

The following pull requests linked via external trackers have not merged:

These pull request must merge or be unlinked from the Bugzilla bug in order for it to move to the next state. Once unlinked, request a bug refresh with /bugzilla refresh.

Bugzilla bug 1952610 has not been moved to the MODIFIED state.

In response to this:

Bug 1952610: Bump dependencies

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.

@staebler
Copy link

/cherry-pick release-4.7

@openshift-cherrypick-robot

@staebler: #272 failed to apply on top of branch "release-4.7":

Applying: bump(*)
.git/rebase-apply/patch:7984: trailing whitespace.
          codeCoverageTool: Cobertura 
.git/rebase-apply/patch:53101: trailing whitespace.
* [**CanonicalHost**](https://godoc.org/github.com/gorilla/handlers#CanonicalHost) for re-directing to the preferred host when handling multiple 
.git/rebase-apply/patch:63204: trailing whitespace.
	
.git/rebase-apply/patch:122570: trailing whitespace.
    
.git/rebase-apply/patch:122576: trailing whitespace.
    
warning: squelched 27 whitespace errors
warning: 32 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
CONFLICT (content): Merge conflict in vendor/modules.txt
Removing vendor/k8s.io/client-go/pkg/version/def.bzl
Removing vendor/k8s.io/client-go/kubernetes/typed/settings/v1alpha1/podpreset.go
Removing vendor/k8s.io/api/settings/v1alpha1/types_swagger_doc_generated.go
Removing vendor/k8s.io/api/settings/v1alpha1/types.go
Removing vendor/k8s.io/api/settings/v1alpha1/generated.proto
Removing vendor/k8s.io/api/settings/v1alpha1/generated.pb.go
Removing vendor/k8s.io/api/batch/v2alpha1/types_swagger_doc_generated.go
Removing vendor/k8s.io/api/batch/v2alpha1/types.go
Removing vendor/k8s.io/api/batch/v2alpha1/generated.proto
Removing vendor/google.golang.org/protobuf/internal/genname/name.go
Removing vendor/google.golang.org/protobuf/internal/fieldnum/wrappers_gen.go
Removing vendor/google.golang.org/protobuf/internal/fieldnum/type_gen.go
Removing vendor/google.golang.org/protobuf/internal/fieldnum/timestamp_gen.go
Removing vendor/google.golang.org/protobuf/internal/fieldnum/struct_gen.go
Removing vendor/google.golang.org/protobuf/internal/fieldnum/source_context_gen.go
Removing vendor/google.golang.org/protobuf/internal/fieldnum/field_mask_gen.go
Removing vendor/google.golang.org/protobuf/internal/fieldnum/empty_gen.go
Removing vendor/google.golang.org/protobuf/internal/fieldnum/duration_gen.go
Removing vendor/google.golang.org/protobuf/internal/fieldnum/doc.go
Removing vendor/google.golang.org/protobuf/internal/fieldnum/descriptor_gen.go
Removing vendor/google.golang.org/protobuf/internal/fieldnum/api_gen.go
Removing vendor/google.golang.org/protobuf/internal/fieldnum/any_gen.go
Removing vendor/golang.org/x/sys/unix/zsyscall_darwin_arm.1_11.go
Removing vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.1_11.go
Removing vendor/golang.org/x/sys/unix/zsyscall_darwin_386.1_11.go
Removing vendor/golang.org/x/sys/unix/syscall_darwin_arm64.1_11.go
Removing vendor/golang.org/x/sys/unix/syscall_darwin_arm.1_11.go
Removing vendor/golang.org/x/sys/unix/syscall_darwin_amd64.1_11.go
Removing vendor/golang.org/x/sys/unix/syscall_darwin_386.1_11.go
Removing vendor/github.com/satori/go.uuid/uuid.go
Removing vendor/github.com/satori/go.uuid/README.md
Removing vendor/github.com/satori/go.uuid/.travis.yml
Removing vendor/github.com/prometheus/procfs/cpuinfo_ppc64le.go
Removing vendor/github.com/prometheus/procfs/cpuinfo_mipsle.go
Removing vendor/github.com/prometheus/procfs/cpuinfo_mips64le.go
Removing vendor/github.com/marstr/guid/guid.go
Removing vendor/github.com/marstr/guid/README.md
Removing vendor/github.com/marstr/guid/.travis.yml
Removing vendor/github.com/konsorten/go-windows-terminal-sequences/sequences_dummy.go
Removing vendor/github.com/konsorten/go-windows-terminal-sequences/sequences.go
Removing vendor/github.com/konsorten/go-windows-terminal-sequences/go.mod
Removing vendor/github.com/konsorten/go-windows-terminal-sequences/README.md
Removing vendor/github.com/konsorten/go-windows-terminal-sequences/LICENSE
Removing vendor/github.com/gorilla/handlers/.travis.yml
Removing vendor/github.com/googleapis/gnostic/compiler/extension-handler.go
Removing vendor/github.com/aws/aws-sdk-go/service/s3/endpoint_errors.go
Removing vendor/cloud.google.com/go/compute/metadata/.repo-metadata.json
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 bump(*)
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-4.7

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.

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. bugzilla/severity-urgent Referenced Bugzilla bug's severity is urgent for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. lgtm Indicates that a PR is ready to be merged. qe-approved Signifies that QE has signed off on this PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants