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

OSD-24614 : Update osdctl to add justification arguement for infranode resize #598

Merged
merged 4 commits into from
Jul 17, 2024

Conversation

MitaliBhalla
Copy link
Contributor

@MitaliBhalla MitaliBhalla commented Jul 17, 2024

Our current infra node resize SL does mention about the justification of the resize, . However, in our [SOP] (https://github.com/openshift/ops-sop/blob/master/v4/alerts/InfraNodesNeedResizingSRE.md) , the command mentioned doesn't mention about the justification arguement as osdctl refers to other SL that doesn't have the justification arguement. https://github.com/openshift/osdctl/blob/master/cmd/cluster/resize/infra_node.go#L35C43-L35C147
This PR incorporates for :

  1. osdctl to point to the SL that has justification arguement
  2. Add changes accordingly to incorporate the justification arguement

@openshift-ci openshift-ci bot requested review from clcollins and mjlshen July 17, 2024 06:03
@MitaliBhalla MitaliBhalla changed the title OSD-24614 : Update osdctl to add justification arguement for infranode resize [WIP] OSD-24614 : Update osdctl to add justification arguement for infranode resize Jul 17, 2024
@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jul 17, 2024
@MitaliBhalla MitaliBhalla changed the title [WIP] OSD-24614 : Update osdctl to add justification arguement for infranode resize OSD-24614 : Update osdctl to add justification arguement for infranode resize Jul 17, 2024
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jul 17, 2024
Comment on lines +35 to 36
resizedInfraNodeServiceLogTemplate = "https://raw.githubusercontent.com/openshift/managed-notifications/master/osd/infranode_resized.json"
GCPresizedInfraNodeServiceLogTemplate = "https://raw.githubusercontent.com/openshift/managed-notifications/master/osd/gcp/GCP_infranode_resized_auto.json"
Copy link
Contributor

Choose a reason for hiding this comment

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

/hold
Waiting until the service log are properly updated

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 17, 2024
@devppratik
Copy link
Contributor

/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 17, 2024
@devppratik
Copy link
Contributor

/test lint

Copy link
Contributor

@devppratik devppratik left a comment

Choose a reason for hiding this comment

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

Fixing the lint failures. The trailing commas seems to be causing the issue

if mp.Spec.Platform.AWS != nil {
return servicelog.PostCmdOptions{
Template: resizedInfraNodeServiceLogTemplate,
ClusterId: clusterId,
TemplateParams: []string{fmt.Sprintf("INSTANCE_TYPE=%s", instanceType)},
TemplateParams: []string{fmt.Sprintf("INSTANCE_TYPE=%s", instanceType),fmt.Sprintf("JUSTIFICATION=%s", justification)},
Copy link
Contributor

@devppratik devppratik Jul 17, 2024

Choose a reason for hiding this comment

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

Suggested change
TemplateParams: []string{fmt.Sprintf("INSTANCE_TYPE=%s", instanceType),fmt.Sprintf("JUSTIFICATION=%s", justification)},
TemplateParams: []string{fmt.Sprintf("INSTANCE_TYPE=%s", instanceType), fmt.Sprintf("JUSTIFICATION=%s", justification)},

}
} else if mp.Spec.Platform.GCP != nil {
return servicelog.PostCmdOptions{
Template: GCPresizedInfraNodeServiceLogTemplate,
ClusterId: clusterId,
TemplateParams: []string{fmt.Sprintf("INSTANCE_TYPE=%s", instanceType)},
TemplateParams: []string{fmt.Sprintf("INSTANCE_TYPE=%s", instanceType),fmt.Sprintf("JUSTIFICATION=%s", justification)},
Copy link
Contributor

@devppratik devppratik Jul 17, 2024

Choose a reason for hiding this comment

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

Suggested change
TemplateParams: []string{fmt.Sprintf("INSTANCE_TYPE=%s", instanceType),fmt.Sprintf("JUSTIFICATION=%s", justification)},
TemplateParams: []string{fmt.Sprintf("INSTANCE_TYPE=%s", instanceType), fmt.Sprintf("JUSTIFICATION=%s", justification)},

@devppratik
Copy link
Contributor

/label tide/merge-method-squash

@openshift-ci openshift-ci bot added the tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges. label Jul 17, 2024
Copy link
Contributor

openshift-ci bot commented Jul 17, 2024

@MitaliBhalla: 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-sigs/prow repository. I understand the commands that are listed here.

@devppratik
Copy link
Contributor

/lgtm
/approve

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jul 17, 2024
Copy link
Contributor

openshift-ci bot commented Jul 17, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: devppratik, MitaliBhalla

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 Jul 17, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit cdbca4c into openshift:master Jul 17, 2024
5 checks passed
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. tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants