From 38e10ed03bc42c0c04868a2727ac72ee4dd1a0fa Mon Sep 17 00:00:00 2001 From: Priyanka Kanthale Date: Tue, 5 Mar 2024 19:17:31 +0530 Subject: [PATCH 01/12] Update infra_node.go for OSD-20509 --- cmd/cluster/resize/infra_node.go | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/cmd/cluster/resize/infra_node.go b/cmd/cluster/resize/infra_node.go index e26d7d545..6b5df05c1 100644 --- a/cmd/cluster/resize/infra_node.go +++ b/cmd/cluster/resize/infra_node.go @@ -29,7 +29,8 @@ import ( const ( twentyMinuteTimeout = 20 * time.Minute twentySecondIncrement = 20 * time.Second - resizedInfraNodeServiceLogTemplate = "https://raw.githubusercontent.com/openshift/managed-notifications/master/osd/infranode_resized_auto.json" + AWSresizedInfraNodeServiceLogTemplate = "https://raw.githubusercontent.com/openshift/managed-notifications/master/osd/infranode_resized_auto.json" + GCPresizedInfraNodeServiceLogTemplate = "" infraNodeLabel = "node-role.kubernetes.io/infra" temporaryInfraNodeLabel = "osdctl.openshift.io/infra-resize-temporary-machinepool" ) @@ -456,13 +457,27 @@ func getInstanceType(mp *hivev1.MachinePool) (string, error) { return "", errors.New("unsupported platform, only AWS and GCP are supported") } +//Adding change in serviceLog as per the cloud provider. + func generateServiceLog(instanceType, clusterId string) servicelog.PostCmdOptions { - return servicelog.PostCmdOptions{ - Template: resizedInfraNodeServiceLogTemplate, - ClusterId: clusterId, - TemplateParams: []string{fmt.Sprintf("INSTANCE_TYPE=%s", instanceType)}, - } + if mp.Spec.Platform.AWS != nil { + + return servicelog.PostCmdOptions{ + Template: AWSresizedInfraNodeServiceLogTemplate, + ClusterId: clusterId, + TemplateParams: []string{fmt.Sprintf("INSTANCE_TYPE=%s", instanceType)}, + } } + else if mp.Spec.Platform.GCP != nil { + + return servicelog.PostCmdOptions{ + Template: GCPresizedInfraNodeServiceLogTemplate, + ClusterId: clusterId, + TemplateParams: []string{fmt.Sprintf("INSTANCE_TYPE=%s", instanceType)}, + } +} +} + func (r *Resize) terminateCloudInstances(ctx context.Context, nodeList *corev1.NodeList) error { if len(nodeList.Items) == 0 { From a2e3e032bd0dc016e30a156390b69408b2ea50ee Mon Sep 17 00:00:00 2001 From: Priyanka Kanthale Date: Tue, 12 Mar 2024 15:16:21 +0530 Subject: [PATCH 02/12] Update infra_node.go --- cmd/cluster/resize/infra_node.go | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/cmd/cluster/resize/infra_node.go b/cmd/cluster/resize/infra_node.go index 6b5df05c1..aa613d7fb 100644 --- a/cmd/cluster/resize/infra_node.go +++ b/cmd/cluster/resize/infra_node.go @@ -1,7 +1,7 @@ package resize // cspell:ignore embiggen - +/ import ( "context" "errors" @@ -29,7 +29,7 @@ import ( const ( twentyMinuteTimeout = 20 * time.Minute twentySecondIncrement = 20 * time.Second - AWSresizedInfraNodeServiceLogTemplate = "https://raw.githubusercontent.com/openshift/managed-notifications/master/osd/infranode_resized_auto.json" + resizedInfraNodeServiceLogTemplate = "https://raw.githubusercontent.com/openshift/managed-notifications/master/osd/infranode_resized_auto.json" GCPresizedInfraNodeServiceLogTemplate = "" infraNodeLabel = "node-role.kubernetes.io/infra" temporaryInfraNodeLabel = "osdctl.openshift.io/infra-resize-temporary-machinepool" @@ -459,16 +459,16 @@ func getInstanceType(mp *hivev1.MachinePool) (string, error) { //Adding change in serviceLog as per the cloud provider. -func generateServiceLog(instanceType, clusterId string) servicelog.PostCmdOptions { - if mp.Spec.Platform.AWS != nil { +func generateServiceLog(mp *hivev1.MachinePool,instanceType, clusterId string) servicelog.PostCmdOptions { + +if mp.Spec.Platform.AWS != nil { return servicelog.PostCmdOptions{ - Template: AWSresizedInfraNodeServiceLogTemplate, + Template: resizedInfraNodeServiceLogTemplate, ClusterId: clusterId, TemplateParams: []string{fmt.Sprintf("INSTANCE_TYPE=%s", instanceType)}, } -} - else if mp.Spec.Platform.GCP != nil { +} else if mp.Spec.Platform.GCP != nil { return servicelog.PostCmdOptions{ Template: GCPresizedInfraNodeServiceLogTemplate, @@ -476,6 +476,7 @@ func generateServiceLog(instanceType, clusterId string) servicelog.PostCmdOption TemplateParams: []string{fmt.Sprintf("INSTANCE_TYPE=%s", instanceType)}, } } +return servicelog.PostCmdOptions{} } From b71e8f1618ab7de8666be99be7e0efcfbc8414cc Mon Sep 17 00:00:00 2001 From: Priyanka Kanthale Date: Wed, 27 Mar 2024 17:41:43 +0530 Subject: [PATCH 03/12] Update infra_node.go Added the managed notification link --- cmd/cluster/resize/infra_node.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/cluster/resize/infra_node.go b/cmd/cluster/resize/infra_node.go index aa613d7fb..c851681e8 100644 --- a/cmd/cluster/resize/infra_node.go +++ b/cmd/cluster/resize/infra_node.go @@ -30,7 +30,7 @@ const ( twentyMinuteTimeout = 20 * time.Minute twentySecondIncrement = 20 * time.Second resizedInfraNodeServiceLogTemplate = "https://raw.githubusercontent.com/openshift/managed-notifications/master/osd/infranode_resized_auto.json" - GCPresizedInfraNodeServiceLogTemplate = "" + GCPresizedInfraNodeServiceLogTemplate = "https://raw.githubusercontent.com/openshift/managed-notifications/master/osd/gcp/GCP_infranode_resized_auto.json" infraNodeLabel = "node-role.kubernetes.io/infra" temporaryInfraNodeLabel = "osdctl.openshift.io/infra-resize-temporary-machinepool" ) From 96e914f21f78802779076e05c79780ca0de9c2b5 Mon Sep 17 00:00:00 2001 From: Priyanka Kanthale Date: Mon, 1 Apr 2024 17:31:15 +0530 Subject: [PATCH 04/12] Update cmd/cluster/resize/infra_node.go Co-authored-by: Pratik Panda --- cmd/cluster/resize/infra_node.go | 1 - 1 file changed, 1 deletion(-) diff --git a/cmd/cluster/resize/infra_node.go b/cmd/cluster/resize/infra_node.go index c851681e8..8cf752b76 100644 --- a/cmd/cluster/resize/infra_node.go +++ b/cmd/cluster/resize/infra_node.go @@ -1,7 +1,6 @@ package resize // cspell:ignore embiggen -/ import ( "context" "errors" From 556b44779efd22200794d53b6dbdb42331d2ebbf Mon Sep 17 00:00:00 2001 From: Priyanka Kanthale Date: Mon, 1 Apr 2024 17:52:25 +0530 Subject: [PATCH 05/12] Update infra_node.go --- cmd/cluster/resize/infra_node.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/cluster/resize/infra_node.go b/cmd/cluster/resize/infra_node.go index 8cf752b76..9d7be339c 100644 --- a/cmd/cluster/resize/infra_node.go +++ b/cmd/cluster/resize/infra_node.go @@ -283,8 +283,8 @@ func (r *Resize) RunInfra(ctx context.Context) error { } // Delete temp machinepool - log.Printf("deleting temporary machinepool %s, with instance type %s", tempMp.Name, instanceType) - if err := r.hiveAdmin.Delete(ctx, tempMp); err != nil { + log.Printf("deleting temporary machinepool %s, with instance type %s", .Name, instanceType) + if err := r.hiveAdmin.Delete(ctx, ); err != nil { return err } @@ -353,7 +353,7 @@ func (r *Resize) RunInfra(ctx context.Context) error { } } - postCmd := generateServiceLog(r.instanceType, r.clusterId) + postCmd := generateServiceLog(tempMp,r.instanceType, r.clusterId) if err := postCmd.Run(); err != nil { fmt.Println("Failed to generate service log. Please manually send a service log to the customer for the blocked egresses with:") fmt.Printf("osdctl servicelog post %v -t %v -p %v\n", From 1308bc5bf6580833b24269ede117ebfecef49dd4 Mon Sep 17 00:00:00 2001 From: Priyanka Kanthale Date: Mon, 1 Apr 2024 17:57:47 +0530 Subject: [PATCH 06/12] Update infra_node.go --- cmd/cluster/resize/infra_node.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/cluster/resize/infra_node.go b/cmd/cluster/resize/infra_node.go index 9d7be339c..6aaa638b5 100644 --- a/cmd/cluster/resize/infra_node.go +++ b/cmd/cluster/resize/infra_node.go @@ -353,7 +353,7 @@ func (r *Resize) RunInfra(ctx context.Context) error { } } - postCmd := generateServiceLog(tempMp,r.instanceType, r.clusterId) + postCmd := generateServiceLog(tempMp, r.instanceType, r.clusterId) if err := postCmd.Run(); err != nil { fmt.Println("Failed to generate service log. Please manually send a service log to the customer for the blocked egresses with:") fmt.Printf("osdctl servicelog post %v -t %v -p %v\n", From ea970ec92d66f6e373f3830d121fd15badd15fee Mon Sep 17 00:00:00 2001 From: Priyanka Kanthale Date: Tue, 2 Apr 2024 16:35:19 +0530 Subject: [PATCH 07/12] Update infra_node.go --- cmd/cluster/resize/infra_node.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/cluster/resize/infra_node.go b/cmd/cluster/resize/infra_node.go index 6aaa638b5..c4fb59cb2 100644 --- a/cmd/cluster/resize/infra_node.go +++ b/cmd/cluster/resize/infra_node.go @@ -283,7 +283,7 @@ func (r *Resize) RunInfra(ctx context.Context) error { } // Delete temp machinepool - log.Printf("deleting temporary machinepool %s, with instance type %s", .Name, instanceType) + log.Printf("deleting temporary machinepool %s, with instance type %s", tempMp.Name, instanceType) if err := r.hiveAdmin.Delete(ctx, ); err != nil { return err } From 5bb3ece0360a3ccf32b76201c4d6590519f15fc5 Mon Sep 17 00:00:00 2001 From: Priyanka Kanthale Date: Tue, 2 Apr 2024 16:46:32 +0530 Subject: [PATCH 08/12] Update infra_node.go --- cmd/cluster/resize/infra_node.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/cluster/resize/infra_node.go b/cmd/cluster/resize/infra_node.go index c4fb59cb2..ec910c4f9 100644 --- a/cmd/cluster/resize/infra_node.go +++ b/cmd/cluster/resize/infra_node.go @@ -284,7 +284,7 @@ func (r *Resize) RunInfra(ctx context.Context) error { // Delete temp machinepool log.Printf("deleting temporary machinepool %s, with instance type %s", tempMp.Name, instanceType) - if err := r.hiveAdmin.Delete(ctx, ); err != nil { + if err := r.hiveAdmin.Delete(ctx, tempMp); err != nil { return err } From 9271d7e6e86012b8015537ef830454b8f356bd99 Mon Sep 17 00:00:00 2001 From: Priyanka Kanthale Date: Wed, 3 Apr 2024 18:33:49 +0530 Subject: [PATCH 09/12] Update infra_node.go --- cmd/cluster/resize/infra_node.go | 36 ++++++++++++++++---------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/cmd/cluster/resize/infra_node.go b/cmd/cluster/resize/infra_node.go index ec910c4f9..d7aa93572 100644 --- a/cmd/cluster/resize/infra_node.go +++ b/cmd/cluster/resize/infra_node.go @@ -458,24 +458,24 @@ func getInstanceType(mp *hivev1.MachinePool) (string, error) { //Adding change in serviceLog as per the cloud provider. -func generateServiceLog(mp *hivev1.MachinePool,instanceType, clusterId string) servicelog.PostCmdOptions { - -if mp.Spec.Platform.AWS != nil { - - return servicelog.PostCmdOptions{ - Template: resizedInfraNodeServiceLogTemplate, - ClusterId: clusterId, - TemplateParams: []string{fmt.Sprintf("INSTANCE_TYPE=%s", instanceType)}, - } -} else if mp.Spec.Platform.GCP != nil { - - return servicelog.PostCmdOptions{ - Template: GCPresizedInfraNodeServiceLogTemplate, - ClusterId: clusterId, - TemplateParams: []string{fmt.Sprintf("INSTANCE_TYPE=%s", instanceType)}, - } -} -return servicelog.PostCmdOptions{} +func generateServiceLog(mp *hivev1.MachinePool, instanceType, clusterId string) servicelog.PostCmdOptions { + + if mp.Spec.Platform.AWS != nil { + + return servicelog.PostCmdOptions{ + Template: resizedInfraNodeServiceLogTemplate, + ClusterId: clusterId, + TemplateParams: []string{fmt.Sprintf("INSTANCE_TYPE=%s", instanceType)}, + } + } else if mp.Spec.Platform.GCP != nil { + + return servicelog.PostCmdOptions{ + Template: GCPresizedInfraNodeServiceLogTemplate, + ClusterId: clusterId, + TemplateParams: []string{fmt.Sprintf("INSTANCE_TYPE=%s", instanceType)}, + } + } + return servicelog.PostCmdOptions{} } From fe0a65849048a7477019d3333794e9c6dabf2692 Mon Sep 17 00:00:00 2001 From: Priyanka Kanthale Date: Wed, 3 Apr 2024 18:49:11 +0530 Subject: [PATCH 10/12] Update infra_node.go --- cmd/cluster/resize/infra_node.go | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/cmd/cluster/resize/infra_node.go b/cmd/cluster/resize/infra_node.go index d7aa93572..dcaa491ca 100644 --- a/cmd/cluster/resize/infra_node.go +++ b/cmd/cluster/resize/infra_node.go @@ -30,8 +30,8 @@ const ( twentySecondIncrement = 20 * time.Second resizedInfraNodeServiceLogTemplate = "https://raw.githubusercontent.com/openshift/managed-notifications/master/osd/infranode_resized_auto.json" GCPresizedInfraNodeServiceLogTemplate = "https://raw.githubusercontent.com/openshift/managed-notifications/master/osd/gcp/GCP_infranode_resized_auto.json" - infraNodeLabel = "node-role.kubernetes.io/infra" - temporaryInfraNodeLabel = "osdctl.openshift.io/infra-resize-temporary-machinepool" + infraNodeLabel = "node-role.kubernetes.io/infra" + temporaryInfraNodeLabel = "osdctl.openshift.io/infra-resize-temporary-machinepool" ) func newCmdResizeInfra() *cobra.Command { @@ -462,18 +462,18 @@ func generateServiceLog(mp *hivev1.MachinePool, instanceType, clusterId string) if mp.Spec.Platform.AWS != nil { - return servicelog.PostCmdOptions{ - Template: resizedInfraNodeServiceLogTemplate, - ClusterId: clusterId, - TemplateParams: []string{fmt.Sprintf("INSTANCE_TYPE=%s", instanceType)}, - } + return servicelog.PostCmdOptions{ + Template: resizedInfraNodeServiceLogTemplate, + ClusterId: clusterId, + TemplateParams: []string{fmt.Sprintf("INSTANCE_TYPE=%s", instanceType)}, + } } else if mp.Spec.Platform.GCP != nil { - return servicelog.PostCmdOptions{ - Template: GCPresizedInfraNodeServiceLogTemplate, - ClusterId: clusterId, - TemplateParams: []string{fmt.Sprintf("INSTANCE_TYPE=%s", instanceType)}, - } + return servicelog.PostCmdOptions{ + Template: GCPresizedInfraNodeServiceLogTemplate, + ClusterId: clusterId, + TemplateParams: []string{fmt.Sprintf("INSTANCE_TYPE=%s", instanceType)}, + } } return servicelog.PostCmdOptions{} } From 0cefc114bf3b3a50727fb46e69fd1c26c5ea8cfb Mon Sep 17 00:00:00 2001 From: Priyanka Kanthale Date: Wed, 3 Apr 2024 18:57:08 +0530 Subject: [PATCH 11/12] Update infra_node.go --- cmd/cluster/resize/infra_node.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/cluster/resize/infra_node.go b/cmd/cluster/resize/infra_node.go index dcaa491ca..67f652c51 100644 --- a/cmd/cluster/resize/infra_node.go +++ b/cmd/cluster/resize/infra_node.go @@ -26,9 +26,9 @@ import ( ) const ( - twentyMinuteTimeout = 20 * time.Minute - twentySecondIncrement = 20 * time.Second - resizedInfraNodeServiceLogTemplate = "https://raw.githubusercontent.com/openshift/managed-notifications/master/osd/infranode_resized_auto.json" + twentyMinuteTimeout = 20 * time.Minute + twentySecondIncrement = 20 * time.Second + resizedInfraNodeServiceLogTemplate = "https://raw.githubusercontent.com/openshift/managed-notifications/master/osd/infranode_resized_auto.json" GCPresizedInfraNodeServiceLogTemplate = "https://raw.githubusercontent.com/openshift/managed-notifications/master/osd/gcp/GCP_infranode_resized_auto.json" infraNodeLabel = "node-role.kubernetes.io/infra" temporaryInfraNodeLabel = "osdctl.openshift.io/infra-resize-temporary-machinepool" From 6682b7617536e9a26474bac3c18ccac82e83bf59 Mon Sep 17 00:00:00 2001 From: Priyanka Kanthale Date: Wed, 3 Apr 2024 21:54:23 +0530 Subject: [PATCH 12/12] Update infra_node.go --- cmd/cluster/resize/infra_node.go | 1 - 1 file changed, 1 deletion(-) diff --git a/cmd/cluster/resize/infra_node.go b/cmd/cluster/resize/infra_node.go index 67f652c51..3df34df70 100644 --- a/cmd/cluster/resize/infra_node.go +++ b/cmd/cluster/resize/infra_node.go @@ -478,7 +478,6 @@ func generateServiceLog(mp *hivev1.MachinePool, instanceType, clusterId string) return servicelog.PostCmdOptions{} } - func (r *Resize) terminateCloudInstances(ctx context.Context, nodeList *corev1.NodeList) error { if len(nodeList.Items) == 0 { return nil