Bug 1958518: aws: restore setting aws platform spec in infra resource #4918

openshift-cherrypick-robot · 2021-05-08T13:24:15Z

This is an automated cherry-pick of #4916

/assign wking

openshift-ci · 2021-05-08T13:24:25Z

@openshift-cherrypick-robot: Bugzilla bug 1958420 has been cloned as Bugzilla bug 1958518. Retitling PR to link against new bug.
/retitle [release-4.7] Bug 1958518: aws: restore setting aws platform spec in infra resource

In response to this:

[release-4.7] Bug 1958420: aws: restore setting aws platform spec in infra resource

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 · 2021-05-08T13:24:30Z

@openshift-cherrypick-robot: This pull request references Bugzilla bug 1958518, which is invalid:

expected dependent Bugzilla bug 1958420 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE), but it is MODIFIED instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

[release-4.7] Bug 1958518: aws: restore setting aws platform spec in infra resource

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.

wking

/lgtm

openshift-ci · 2021-05-08T13:25:17Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: wking

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:

~~OWNERS~~ [wking]

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

pkg/asset/manifests/infrastructure_test.go

staebler · 2021-05-09T02:40:02Z

Removed

installer/pkg/asset/manifests/infrastructure_test.go

Lines 136 to 137 in 6a949c0

    
           ControlPlaneTopology:   configv1.HighlyAvailableTopologyMode, 
        
           InfrastructureTopology: configv1.HighlyAvailableTopologyMode,

. Those two fields do not exist in 4.7.

/lgtm
/hold cancel

The code that set an empty `AWSPlatformSpec` in the infrastructure resource was accidentally removed when adding support for propagating user tags [1]. This causes the installer to panic when the install config included service endpoints. [1] openshift@2033421 https://bugzilla.redhat.com/show_bug.cgi?id=1958420

staebler · 2021-05-09T03:32:40Z

/lgtm

openshift-bot · 2021-05-09T10:23:02Z

/retest

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

openshift-bot · 2021-05-09T10:35:00Z

/retest

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

openshift-bot · 2021-05-09T11:22:59Z

/retest

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

openshift-bot · 2021-05-09T14:47:01Z

/retest

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

openshift-bot · 2021-05-09T14:59:01Z

/retest

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

openshift-bot · 2021-05-09T15:35:01Z

/retest

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

openshift-bot · 2021-05-09T15:47:00Z

/retest

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

openshift-bot · 2021-05-09T15:59:00Z

/retest

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

openshift-bot · 2021-05-09T16:11:03Z

/retest

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

openshift-bot · 2021-05-09T16:22:59Z

/retest

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

openshift-bot · 2021-05-09T16:34:59Z

/retest

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

openshift-bot · 2021-05-09T16:47:00Z

/retest

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

openshift-bot · 2021-05-09T17:47:01Z

/retest

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

openshift-bot · 2021-05-09T17:59:01Z

/retest

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

openshift-bot · 2021-05-09T18:59:00Z

/retest

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

openshift-bot · 2021-05-09T19:35:00Z

/retest

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

openshift-bot · 2021-05-09T19:59:02Z

/retest

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

openshift-bot · 2021-05-09T20:11:00Z

/retest

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

openshift-bot · 2021-05-10T01:01:09Z

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

openshift-ci · 2021-05-10T01:01:12Z

@openshift-bot: This pull request references Bugzilla bug 1958518, which is invalid:

expected dependent Bugzilla bug 1958420 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE), but it is ON_QA instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

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-bot · 2021-05-10T09:21:25Z

/retest

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

openshift-bot · 2021-05-10T10:57:03Z

/retest

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

openshift-bot · 2021-05-10T11:45:03Z

/retest

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

openshift-bot · 2021-05-10T12:21:42Z

/retest

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

wking · 2021-05-10T12:54:45Z

/bugzilla refresh

openshift-ci · 2021-05-10T12:54:52Z

@wking: This pull request references Bugzilla bug 1958518, which is valid.

6 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target release (4.7.z) matches configured target release for branch (4.7.z)
bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
dependent bug Bugzilla bug 1958420 is in the state VERIFIED, which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE))
dependent Bugzilla bug 1958420 targets the "4.8.0" release, which is one of the valid target releases: 4.8.0
bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Bugzilla (yunjiang@redhat.com), skipping review request.

In response to this:

/bugzilla refresh

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 · 2021-05-10T13:17:25Z

@openshift-cherrypick-robot: The following tests failed, say /retest to rerun all failed tests:

Test name	Commit	Details	Rerun command
ci/prow/e2e-crc	`e5acba9`	link	`/test e2e-crc`
ci/prow/e2e-libvirt	`e5acba9`	link	`/test e2e-libvirt`

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.

openshift-bot · 2021-05-10T13:21:05Z

/retest

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

openshift-ci · 2021-05-10T13:27:04Z

@openshift-cherrypick-robot: All pull requests linked via external trackers have merged:

openshift/installer#4918

Bugzilla bug 1958518 has been moved to the MODIFIED state.

In response to this:

Bug 1958518: aws: restore setting aws platform spec in infra resource

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 bot assigned wking May 8, 2021

openshift-cherrypick-robot mentioned this pull request May 8, 2021

Bug 1958420: aws: restore setting aws platform spec in infra resource #4916

Merged

openshift-ci bot changed the title ~~[release-4.7] Bug 1958420: aws: restore setting aws platform spec in infra resource~~ [release-4.7] Bug 1958518: aws: restore setting aws platform spec in infra resource May 8, 2021

openshift-ci bot added the bugzilla/severity-urgent Referenced Bugzilla bug's severity is urgent for the branch this PR is targeting. label May 8, 2021

openshift-ci bot added the bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label May 8, 2021

openshift-ci bot requested review from jhixson74 and jstuever May 8, 2021 13:24

wking approved these changes May 8, 2021

View reviewed changes

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label May 8, 2021

wking changed the title ~~[release-4.7] Bug 1958518: aws: restore setting aws platform spec in infra resource~~ Bug 1958518: aws: restore setting aws platform spec in infra resource May 8, 2021

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 8, 2021

wking reviewed May 8, 2021

View reviewed changes

pkg/asset/manifests/infrastructure_test.go Outdated Show resolved Hide resolved

wking added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 8, 2021

staebler force-pushed the cherry-pick-4916-to-release-4.7 branch from f60d7f8 to fc6eb99 Compare May 9, 2021 02:38

openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label May 9, 2021

openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 9, 2021

openshift-ci bot assigned staebler May 9, 2021

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label May 9, 2021

staebler force-pushed the cherry-pick-4916-to-release-4.7 branch from fc6eb99 to e5acba9 Compare May 9, 2021 03:07

openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label May 9, 2021

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label May 9, 2021

openshift-ci bot added bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. and removed bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels May 10, 2021

knobunc added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label May 10, 2021

openshift-merge-robot merged commit 47dadce into openshift:release-4.7 May 10, 2021

Bug 1958518: aws: restore setting aws platform spec in infra resource #4918

Bug 1958518: aws: restore setting aws platform spec in infra resource #4918

Conversation

openshift-cherrypick-robot commented May 8, 2021

openshift-ci bot commented May 8, 2021

openshift-ci bot commented May 8, 2021

wking left a comment

Choose a reason for hiding this comment

openshift-ci bot commented May 8, 2021

staebler commented May 9, 2021

staebler commented May 9, 2021

openshift-bot commented May 9, 2021

openshift-bot commented May 9, 2021

openshift-bot commented May 9, 2021

openshift-bot commented May 9, 2021

openshift-bot commented May 9, 2021

openshift-bot commented May 9, 2021

openshift-bot commented May 9, 2021

openshift-bot commented May 9, 2021

openshift-bot commented May 9, 2021

openshift-bot commented May 9, 2021

openshift-bot commented May 9, 2021

openshift-bot commented May 9, 2021

openshift-bot commented May 9, 2021

openshift-bot commented May 9, 2021

openshift-bot commented May 9, 2021

openshift-bot commented May 9, 2021

openshift-bot commented May 9, 2021

openshift-bot commented May 9, 2021

openshift-bot commented May 10, 2021

openshift-ci bot commented May 10, 2021

openshift-bot commented May 10, 2021

openshift-bot commented May 10, 2021

openshift-bot commented May 10, 2021

openshift-bot commented May 10, 2021

wking commented May 10, 2021

openshift-ci bot commented May 10, 2021

openshift-ci bot commented May 10, 2021

openshift-bot commented May 10, 2021

openshift-ci bot commented May 10, 2021