Skip to content

Commit a9d945b

Browse files
Revert "skip host customization check for cncf (#1158)" (#1159)
This reverts commit a341559.
1 parent a341559 commit a9d945b

File tree

1 file changed

+2
-15
lines changed

1 file changed

+2
-15
lines changed

internal/controller/bootstrap/authentication_bootstrap_controller.go

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -129,24 +129,11 @@ func (r *BootstrapReconciler) makeAuthenticationCorrections(ctx context.Context,
129129
return subreconciler.RequeueWithError(err)
130130
}
131131

132-
//call bootstrapIngressCustomization only if cluster is OCP
133-
var domainName string
134-
if domainName, err = authctrl.GetCNCFDomain(ctx, r.Client, authCR); err != nil {
135-
log.Error(err, "Could not retrieve cluster configuration; requeueing")
132+
if err = r.bootstrapIngressCustomization(debugCtx, authCR); err != nil {
133+
log.Error(err, "Failed to update ingress customization")
136134
return subreconciler.RequeueWithError(err)
137135
}
138136

139-
// if the env identified as CNCF
140-
if domainName != "" {
141-
log.Info("Env type is CNCF, skipping bootstrapIngressCustomization")
142-
} else {
143-
log.Info("Env Type is OCP")
144-
if err = r.bootstrapIngressCustomization(debugCtx, authCR); err != nil {
145-
log.Error(err, "Failed to update ingress customization")
146-
return subreconciler.RequeueWithError(err)
147-
}
148-
}
149-
150137
log.Info("Updating Authentication with version label and bootstrapped values")
151138
authCR.Labels[common.ManagerVersionLabel] = version.Version
152139

0 commit comments

Comments
 (0)