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

[OCPCLOUD-1860] Merge https://github.com/kubernetes/cloud-provider-aws:master into master #34

Merged

Conversation

cloud-team-rebase-bot[bot]
Copy link

No description provided.

prasita123 and others added 30 commits August 10, 2022 16:43
This cleans up some of the documentation for the
`ecr-credential-provider` command to expand on some details and fix some
minor formatting in the example configuration.

Signed-off-by: Sean McGinnis <sean.mcginnis@gmail.com>
Time.Unix() returns the time in seconds so need to multiply the duration by time.Second
Updates the v1 provider's isRegionValid function to return an error
instead of boolean. This fixes the bug, where errors returned from EC2
instance metadata service client were suppressed and interpreted upstream
as an invalid configured region.

The isRegionValid function was renamed to validateRegion to also
communicate its behavior instead of a boolean check.
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 26, 2023
cloud-team-rebase-bot and others added 9 commits January 26, 2023 12:04
# Conflicts:
#	.github/workflows/tag-release.yml
Service handling logic in k8s.io/cloud-provider v0.25.(0,1,2)
is broken. This issue was fixed upstream, but not released yet.
We are expecting that this fixes will be included into v0.25.3, but
now need to replace released `cloud-provider` library version with
the latest version from `release-1.25` branch.

Xref: kubernetes/kubernetes#112793

This commit is expected to be dropped during next rebase.
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 26, 2023
@elmiko
Copy link

elmiko commented Jan 26, 2023

/ok-to-test

@openshift-ci openshift-ci bot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jan 26, 2023
@elmiko elmiko changed the title Merge https://github.com/kubernetes/cloud-provider-aws:master into master [OCPCLOUD-1860] Merge https://github.com/kubernetes/cloud-provider-aws:master into master Jan 30, 2023
@elmiko
Copy link

elmiko commented Jan 30, 2023

this rebase will contain the upstream 1.26 changes

/approve
/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 30, 2023
@openshift-ci
Copy link

openshift-ci bot commented Jan 30, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: elmiko

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-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 30, 2023
@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD fe991de and 2 for PR HEAD 94c8b52 in total

@elmiko
Copy link

elmiko commented Jan 31, 2023

/retest-required

1 similar comment
@elmiko
Copy link

elmiko commented Feb 1, 2023

/retest-required

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD fe991de and 2 for PR HEAD 94c8b52 in total

@openshift-ci
Copy link

openshift-ci bot commented Feb 1, 2023

@cloud-team-rebase-bot[bot]: The following test 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/openshift-e2e-aws-ovn-techpreview-upgrade 94c8b52 link false /test openshift-e2e-aws-ovn-techpreview-upgrade

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.

@elmiko
Copy link

elmiko commented Feb 2, 2023

/retest-required

@openshift-merge-robot openshift-merge-robot merged commit e512fac into openshift:master Feb 2, 2023
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. lgtm Indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test.
Projects
None yet
Development

Successfully merging this pull request may close these issues.