Skip to content

Byo IAM roles for IPI install#4790

Merged
openshift-merge-robot merged 1 commit intoopenshift:masterfrom
smrowley:byo-instance-roles
Apr 2, 2021
Merged

Byo IAM roles for IPI install#4790
openshift-merge-robot merged 1 commit intoopenshift:masterfrom
smrowley:byo-instance-roles

Conversation

@smrowley
Copy link
Copy Markdown
Contributor

@smrowley smrowley commented Mar 25, 2021

No description provided.

@openshift-ci-robot openshift-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Mar 25, 2021
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

openshift-ci-robot commented Mar 25, 2021

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

staebler
staebler reviewed Mar 26, 2021
View reviewed changes
Comment thread .gitignore Outdated
Comment thread data/data/aws/bootstrap/variables.tf Outdated
Comment thread data/data/aws/iam/variables.tf Outdated
Comment thread data/data/aws/master/variables.tf Outdated
Comment thread data/data/aws/variables-aws.tf Outdated
Comment thread pkg/types/installconfig.go Outdated
Comment thread pkg/types/installconfig.go Outdated
Comment thread pkg/types/installconfig.go Outdated
Comment thread pkg/types/installconfig.go Outdated
Comment thread pkg/types/installconfig.go Outdated
@staebler
Copy link
Copy Markdown
Contributor

staebler commented Mar 26, 2021

/test e2e-aws
/test e2e-aws-shared-vpc

@staebler staebler marked this pull request as ready for review March 26, 2021 19:50
@openshift-ci-robot openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Mar 26, 2021
staebler
staebler reviewed Mar 30, 2021
View reviewed changes
Comment thread pkg/types/aws/machinepool.go Outdated
staebler
staebler reviewed Mar 30, 2021
View reviewed changes
Comment thread .gitignore Outdated
Comment thread pkg/asset/cluster/aws/aws.go Outdated
Comment thread data/data/aws/main.tf Outdated
Comment thread data/data/aws/iam/main.tf Outdated
Comment thread data/data/aws/master/main.tf Outdated
Comment thread pkg/explain/printer_test.go Outdated
Copy link
Copy Markdown
Contributor

@staebler staebler Mar 30, 2021

Choose a reason for hiding this comment

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

There are still gratuitous changes in these tests. Are you finding that these changes are necessary for the tests to pass for some reason?

@smrowley smrowley force-pushed the byo-instance-roles branch from b85480b to 19dfbb5 Compare March 31, 2021 15:38
@openshift-ci-robot openshift-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 31, 2021
@smrowley smrowley force-pushed the byo-instance-roles branch from 19dfbb5 to 7c54988 Compare March 31, 2021 16:56
@openshift-ci-robot openshift-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 31, 2021
staebler
staebler approved these changes Mar 31, 2021
View reviewed changes
Copy link
Copy Markdown
Contributor

@staebler staebler 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-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Mar 31, 2021
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

openshift-ci-robot commented Mar 31, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: staebler

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

The pull request process is described 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-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 31, 2021
@openshift-bot
Copy link
Copy Markdown
Contributor

openshift-bot commented Mar 31, 2021

/retest

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

9 similar comments
@openshift-bot
Copy link
Copy Markdown
Contributor

openshift-bot commented Mar 31, 2021

/retest

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

@openshift-bot
Copy link
Copy Markdown
Contributor

openshift-bot commented Apr 1, 2021

/retest

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

@openshift-bot
Copy link
Copy Markdown
Contributor

openshift-bot commented Apr 1, 2021

/retest

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

@openshift-bot
Copy link
Copy Markdown
Contributor

openshift-bot commented Apr 1, 2021

/retest

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

@openshift-bot
Copy link
Copy Markdown
Contributor

openshift-bot commented Apr 1, 2021

/retest

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

@openshift-bot
Copy link
Copy Markdown
Contributor

openshift-bot commented Apr 1, 2021

/retest

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

@openshift-bot
Copy link
Copy Markdown
Contributor

openshift-bot commented Apr 1, 2021

/retest

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

@openshift-bot
Copy link
Copy Markdown
Contributor

openshift-bot commented Apr 1, 2021

/retest

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

@openshift-bot
Copy link
Copy Markdown
Contributor

openshift-bot commented Apr 1, 2021

/retest

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

@openshift-bot
Copy link
Copy Markdown
Contributor

openshift-bot commented Apr 1, 2021

/retest

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

10 similar comments
@openshift-bot
Copy link
Copy Markdown
Contributor

openshift-bot commented Apr 1, 2021

/retest

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

@openshift-bot
Copy link
Copy Markdown
Contributor

openshift-bot commented Apr 1, 2021

/retest

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

@openshift-bot
Copy link
Copy Markdown
Contributor

openshift-bot commented Apr 1, 2021

/retest

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

@openshift-bot
Copy link
Copy Markdown
Contributor

openshift-bot commented Apr 1, 2021

/retest

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

@openshift-bot
Copy link
Copy Markdown
Contributor

openshift-bot commented Apr 1, 2021

/retest

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

@openshift-bot
Copy link
Copy Markdown
Contributor

openshift-bot commented Apr 1, 2021

/retest

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

@openshift-bot
Copy link
Copy Markdown
Contributor

openshift-bot commented Apr 1, 2021

/retest

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

@openshift-bot
Copy link
Copy Markdown
Contributor

openshift-bot commented Apr 1, 2021

/retest

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

@openshift-bot
Copy link
Copy Markdown
Contributor

openshift-bot commented Apr 1, 2021

/retest

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

@openshift-bot
Copy link
Copy Markdown
Contributor

openshift-bot commented Apr 1, 2021

/retest

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

@staebler
Copy link
Copy Markdown
Contributor

staebler commented Apr 1, 2021

/test images

@openshift-bot
Copy link
Copy Markdown
Contributor

openshift-bot commented Apr 1, 2021

/retest

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

2 similar comments
@openshift-bot
Copy link
Copy Markdown
Contributor

openshift-bot commented Apr 1, 2021

/retest

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

@openshift-bot
Copy link
Copy Markdown
Contributor

openshift-bot commented Apr 2, 2021

/retest

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

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Apr 2, 2021

@smrowley: The following tests failed, say /retest to rerun all failed tests:

Test name Commit Details Rerun command
ci/prow/e2e-openstack-upi 19dfbb55671f60365598e066774f7f8afdce2407 link /test e2e-openstack-upi
ci/prow/e2e-aws-workers-rhel7 7c54988 link /test e2e-aws-workers-rhel7
ci/prow/e2e-metal-ipi-ovn-ipv6 7c54988 link /test e2e-metal-ipi-ovn-ipv6
ci/prow/e2e-crc 7c54988 link /test e2e-crc

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.

@openshift-merge-robot openshift-merge-robot merged commit 5fe08f7 into openshift:master Apr 2, 2021
@staebler
Copy link
Copy Markdown
Contributor

staebler commented Apr 2, 2021

/cherry-pick release-4.7

@openshift-cherrypick-robot
Copy link
Copy Markdown

openshift-cherrypick-robot commented Apr 2, 2021

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

Applying: Feature for bring-your-own IAM roles for IPI installs on aws
Using index info to reconstruct a base tree...
M	data/data/aws/bootstrap/main.tf
M	data/data/aws/main.tf
M	data/data/aws/master/main.tf
M	data/data/install.openshift.io_installconfigs.yaml
M	pkg/asset/cluster/aws/aws.go
M	pkg/asset/cluster/tfvars.go
M	pkg/explain/printer_test.go
M	pkg/types/installconfig.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/types/installconfig.go
CONFLICT (content): Merge conflict in pkg/types/installconfig.go
Auto-merging pkg/explain/printer_test.go
Auto-merging pkg/asset/cluster/tfvars.go
Auto-merging pkg/asset/cluster/aws/aws.go
Auto-merging data/data/install.openshift.io_installconfigs.yaml
Auto-merging data/data/aws/master/main.tf
CONFLICT (content): Merge conflict in data/data/aws/master/main.tf
Auto-merging data/data/aws/main.tf
Auto-merging data/data/aws/bootstrap/main.tf
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Feature for bring-your-own IAM roles for IPI installs on aws
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".
Details

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.

This was referenced Apr 2, 2021
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jstuever jstuever Awaiting requested review from jstuever

@patrickdillon patrickdillon Awaiting requested review from patrickdillon

1 more reviewer

@staebler staebler staebler approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@staebler staebler

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.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@smrowley @openshift-ci-robot @staebler @openshift-bot @openshift-cherrypick-robot @openshift-merge-robot