Skip to content

[release-4.15] OCPBUGS-32404: Fix failure to create a second hostedcluster in the same namespace #3907

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

Merged
openshift-merge-bot merged 1 commit into from
Jun 19, 2024
Merged

[release-4.15] OCPBUGS-32404: Fix failure to create a second hostedcluster in the same namespace #3907

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
16 changes: 8 additions & 8 deletions hypershift-operator/controllers/hostedcluster/hostedcluster_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -526,12 +526,6 @@ func (r *HostedClusterReconciler) reconcile(ctx context.Context, req ctrl.Reques
// Part zero: fix up conversion
originalSpec := hcluster.Spec.DeepCopy()

createOrUpdate := r.createOrUpdate(req)

if err = r.reconcileCLISecrets(ctx, createOrUpdate, hcluster); err != nil {
return ctrl.Result{}, fmt.Errorf("failed to reconcile the CLI secrets: %w", err)
}

// Reconcile converted AWS roles.
if hcluster.Spec.Platform.AWS != nil {
if err := r.dereferenceAWSRoles(ctx, &hcluster.Spec.Platform.AWS.RolesRef, hcluster.Namespace); err != nil {
Expand All @@ -549,6 +543,8 @@ func (r *HostedClusterReconciler) reconcile(ctx context.Context, req ctrl.Reques
}
}

createOrUpdate := r.createOrUpdate(req)

// Reconcile platform defaults
if err := r.reconcilePlatformDefaultSettings(ctx, hcluster, createOrUpdate, log); err != nil {
return ctrl.Result{}, err
Expand Down Expand Up @@ -1065,6 +1061,10 @@ func (r *HostedClusterReconciler) reconcile(ctx context.Context, req ctrl.Reques
return ctrl.Result{}, err
}

if err = r.reconcileCLISecrets(ctx, createOrUpdate, hcluster); err != nil {
return ctrl.Result{}, fmt.Errorf("failed to reconcile the CLI secrets: %w", err)
}

// Set the infraID as Tag on all created AWS
if err := r.reconcileAWSResourceTags(ctx, hcluster); err != nil {
return ctrl.Result{}, err
Expand Down Expand Up @@ -2290,7 +2290,7 @@ func (r *HostedClusterReconciler) reconcileCLISecrets(ctx context.Context, creat
})

if err != nil {
return fmt.Errorf("failed to retrieve cli created secrets")
return fmt.Errorf("failed to retrieve cli created secrets: %v", err)
}

ownerRef := config.OwnerRefFrom(hcluster)
Expand All @@ -2300,7 +2300,7 @@ func (r *HostedClusterReconciler) reconcileCLISecrets(ctx context.Context, creat
return nil
})
if err != nil {
return fmt.Errorf("failed to set secret's owner reference")
return fmt.Errorf("failed to set '%s' secret's owner reference: %v", secret.Name, err)
}
if res == controllerutil.OperationResultUpdated {
log.Info("added owner reference of the Hosted cluster, to the secret", "secret", secret.Name)
Expand Down