Merge pull request #3034 from hunterkepley/ocm-18786

openshift-merge-bot[bot] · web-flow · commit 3cf3412dbadf · 2025-10-02T19:22:07.000Z
OCM-18786 | fix: Do not prompt capres in govcloud env
diff --git a/pkg/machinepool/machinepool.go b/pkg/machinepool/machinepool.go
@@ -767,7 +767,7 @@ func (m *machinePool) CreateNodePools(r *rosa.Runtime, cmd *cobra.Command, clust
 	// Capacity reservation ID
 	capacityReservationId := args.CapacityReservationId
 
-	if interactive.Enabled() && !autoscaling {
+	if interactive.Enabled() && !autoscaling && !fedramp.Enabled() {
 		capacityReservationId, err = interactive.GetString(interactive.Input{
 			Question: "Capacity Reservation ID",
 			Help:     cmd.Flags().Lookup("capacity-reservation-id").Usage,
@@ -905,7 +905,7 @@ func (m *machinePool) CreateNodePools(r *rosa.Runtime, cmd *cobra.Command, clust
 		rootDiskSize,
 	)
 
-	if capacityReservationId != "" {
+	if capacityReservationId != "" && !fedramp.Enabled() && !autoscaling {
 		awsNodepoolBuilder = awsNodepoolBuilder.CapacityReservation(capacityReservation)
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -767,7 +767,7 @@ func (m machinePool) CreateNodePools(r rosa.Runtime, cmd *cobra.Command, clust`
`767`	`767`	`// Capacity reservation ID`
`768`	`768`	`capacityReservationId := args.CapacityReservationId`
`769`	`769`
`770`		`- if interactive.Enabled() && !autoscaling {`
	`770`	`+ if interactive.Enabled() && !autoscaling && !fedramp.Enabled() {`
`771`	`771`	`capacityReservationId, err = interactive.GetString(interactive.Input{`
`772`	`772`	`Question: "Capacity Reservation ID",`
`773`	`773`	`Help: cmd.Flags().Lookup("capacity-reservation-id").Usage,`
`@@ -905,7 +905,7 @@ func (m machinePool) CreateNodePools(r rosa.Runtime, cmd *cobra.Command, clust`
`905`	`905`	`rootDiskSize,`
`906`	`906`	`)`
`907`	`907`
`908`		`- if capacityReservationId != "" {`
	`908`	`+ if capacityReservationId != "" && !fedramp.Enabled() && !autoscaling {`
`909`	`909`	`awsNodepoolBuilder = awsNodepoolBuilder.CapacityReservation(capacityReservation)`
`910`	`910`	`}`
`911`	`911`