Skip to content

OCPBUGS-90521: fix(nodepool): don't explicitly set the MinReadySeconds default #8783

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.

Sign up for GitHub

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

Closed
sdminonne wants to merge 1 commit into from
Closed

OCPBUGS-90521: fix(nodepool): don't explicitly set the MinReadySeconds default #8783

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions hypershift-operator/controllers/nodepool/capi.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,11 +419,6 @@ func (c *CAPI) reconcileMachineDeployment(ctx context.Context, log logr.Logger,
}
machineDeployment.Labels[capiv1.ClusterNameLabel] = capiClusterName

// Set defaults. These are normally set by the CAPI machinedeployment webhook.
// However, since we don't run the webhook, CAPI updates the machinedeployment
// after it has been created with defaults.
machineDeployment.Spec.MinReadySeconds = ptr.To[int32](0)

machineDeployment.Spec.ClusterName = capiClusterName
if machineDeployment.Spec.Selector.MatchLabels == nil {
machineDeployment.Spec.Selector.MatchLabels = map[string]string{}
Expand Down Expand Up @@ -880,7 +875,6 @@ func (c *CAPI) reconcileMachineSet(ctx context.Context,
machineSet.Labels[capiv1.ClusterNameLabel] = capiClusterName

resourcesName := generateName(capiClusterName, nodePool.Spec.ClusterName, nodePool.GetName())
machineSet.Spec.MinReadySeconds = int32(0)

gvk, err := apiutil.GVKForObject(machineTemplateCR, api.Scheme)
if err != nil {
Expand Down
Loading