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

Fix upgrade issue #618

Merged
merged 2 commits into from
Mar 2, 2022
Merged

Conversation

pvasant
Copy link
Contributor

@pvasant pvasant commented Mar 1, 2022

  1. Refactor to remove multiple checking of operator and account role policy update
  2. Add nil check for policy ARN in case of role policy

https://issues.redhat.com/browse/SDA-5570

@openshift-ci openshift-ci bot requested review from tbrisker and zgalor March 1, 2022 16:53
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 1, 2022
@pvasant
Copy link
Contributor Author

pvasant commented Mar 1, 2022

@vkareh @ciaranRoche PTAL


flags.StringVarP(
&args.clusterID,
"clusterID",
Copy link
Member

Choose a reason for hiding this comment

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

Why --clusterID - we always use --cluster (and there's ocm.AddClusterFlag(Cmd)) for that.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@vkareh that is marked as required in AddClusterFlag and we need it hidden just for boilerplate code around upgrade cluster like displayed error message with proper cluster id etc

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@vkareh you are right we dont need it since we are passing as arguments. PTAL

@@ -1472,6 +1472,9 @@ func (c *awsClient) validateRoleUpgradeVersionCompatibility(roleName string,
return false, err
}
for _, attachedPolicy := range attachedPolicies {
if attachedPolicy.PolicyArn == "" {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is the main fix for the issue all others are just refactoring

@vkareh
Copy link
Member

vkareh commented Mar 2, 2022

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Mar 2, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 2, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: pvasant, vkareh

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
Copy link
Contributor

openshift-ci bot commented Mar 2, 2022

@pvasant: all tests passed!

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-merge-robot openshift-merge-robot merged commit 16edbee into openshift:master Mar 2, 2022
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants