@@ -25,8 +25,6 @@ import (
2525
2626 certmgr "github.com/IBM/ibm-iam-operator/internal/api/certmanager/v1"
2727 ctrlcommon "github.com/IBM/ibm-iam-operator/internal/controller/common"
28- dbconn "github.com/IBM/ibm-iam-operator/internal/database/connectors"
29- "github.com/IBM/ibm-iam-operator/internal/database/migration"
3028 "github.com/IBM/ibm-iam-operator/internal/version"
3129 routev1 "github.com/openshift/api/route/v1"
3230 appsv1 "k8s.io/api/apps/v1"
@@ -36,9 +34,7 @@ import (
3634 corev1 "k8s.io/api/core/v1"
3735 netv1 "k8s.io/api/networking/v1"
3836 k8sErrors "k8s.io/apimachinery/pkg/api/errors"
39- "k8s.io/apimachinery/pkg/api/meta"
4037 "k8s.io/apimachinery/pkg/api/resource"
41- metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
4238 "k8s.io/apimachinery/pkg/runtime"
4339 "k8s.io/apimachinery/pkg/types"
4440 "k8s.io/client-go/discovery"
@@ -79,9 +75,6 @@ var memory550 = resource.NewQuantity(550*1024*1024, resource.BinarySI) // 550M
7975var memory650 = resource .NewQuantity (650 * 1024 * 1024 , resource .BinarySI ) // 650Mi
8076var memory1024 = resource .NewQuantity (1024 * 1024 * 1024 , resource .BinarySI ) // 1024Mi
8177
82- // migrationWait is used when still waiting on a result to be produced by the migration worker
83- var migrationWait time.Duration = 10 * time .Second
84-
8578// opreqWait is used for the resources that interact with and originate from OperandRequests
8679var opreqWait time.Duration = 100 * time .Millisecond
8780
@@ -91,29 +84,6 @@ var defaultLowerWait time.Duration = 5 * time.Millisecond
9184// finalizerName is the finalizer appended to the Authentication CR
9285var finalizerName = "authentication.operator.ibm.com"
9386
94- func (r * AuthenticationReconciler ) loopUntilConditionsSet (ctx context.Context , req ctrl.Request , conditions ... * metav1.Condition ) {
95- reqLogger := logf .FromContext (ctx )
96- conditionsSet := false
97- for ! conditionsSet {
98- authCR := & operatorv1alpha1.Authentication {}
99- if result , err := r .getLatestAuthentication (ctx , req , authCR ); subreconciler .ShouldHaltOrRequeue (result , err ) {
100- reqLogger .Info ("Failed to retrieve Authentication CR for status update; retrying" )
101- continue
102- }
103- for _ , condition := range conditions {
104- if condition == nil {
105- continue
106- }
107- meta .SetStatusCondition (& authCR .Status .Conditions , * condition )
108- }
109- if err := r .Client .Status ().Update (ctx , authCR ); err != nil {
110- reqLogger .Error (err , "Failed to set conditions on Authentication; retrying" , "conditions" , conditions )
111- continue
112- }
113- conditionsSet = true
114- }
115- }
116-
11787func (r * AuthenticationReconciler ) getLatestAuthentication (ctx context.Context , req ctrl.Request , authentication * operatorv1alpha1.Authentication ) (result * ctrl.Result , err error ) {
11888 reqLogger := logf .FromContext (ctx )
11989 if err := r .Get (ctx , req .NamespacedName , authentication ); err != nil {
@@ -174,10 +144,7 @@ type AuthenticationReconciler struct {
174144 DiscoveryClient discovery.DiscoveryClient
175145 Mutex sync.Mutex
176146 clusterType ctrlcommon.ClusterType
177- dbSetupChan chan * migration.Result
178147 needsRollout bool
179- GetPostgresDB func (client.Client , context.Context , ctrl.Request ) (dbconn.DBConn , error )
180- GetMongoDB func (client.Client , context.Context , ctrl.Request ) (dbconn.DBConn , error )
181148}
182149
183150// Reconcile is part of the main kubernetes reconciliation loop which aims to
@@ -284,19 +251,6 @@ func (r *AuthenticationReconciler) Reconcile(ctx context.Context, req ctrl.Reque
284251 return subreconciler .Evaluate (subResult , err )
285252 }
286253
287- // perform any migrations that may be needed before Deployments run
288- if subResult , err := r .handleMigrations (reconcileCtx , req ); subreconciler .ShouldHaltOrRequeue (subResult , err ) {
289- return subreconciler .Evaluate (subResult , err )
290- }
291-
292- if subResult , err := r .setMigrationCompleteStatus (reconcileCtx , req ); subreconciler .ShouldHaltOrRequeue (subResult , err ) {
293- return subreconciler .Evaluate (subResult , err )
294- }
295-
296- if result , err := r .handleMongoDBCleanup (reconcileCtx , req ); subreconciler .ShouldHaltOrRequeue (result , err ) {
297- return subreconciler .Evaluate (result , err )
298- }
299-
300254 reqLogger .Info ("Creating ibm-iam-operand-restricted serviceaccount" )
301255 currentSA := & corev1.ServiceAccount {}
302256 err = r .createSA (instance , currentSA , & needToRequeue )
@@ -307,6 +261,14 @@ func (r *AuthenticationReconciler) Reconcile(ctx context.Context, req ctrl.Reque
307261 r .createRole (instance )
308262 r .createRoleBinding (instance )
309263
264+ if subResult , err := r .ensureMigrationJobRuns (reconcileCtx , req ); subreconciler .ShouldHaltOrRequeue (subResult , err ) {
265+ return subreconciler .Evaluate (subResult , err )
266+ }
267+
268+ if subResult , err := r .checkSAMLPresence (reconcileCtx , req ); subreconciler .ShouldHaltOrRequeue (subResult , err ) {
269+ return subreconciler .Evaluate (subResult , err )
270+ }
271+
310272 // Check if this Certificate already exists and create it if it doesn't
311273 if subResult , err := r .handleCertificates (ctx , req ); subreconciler .ShouldHaltOrRequeue (subResult , err ) {
312274 return subreconciler .Evaluate (subResult , err )
@@ -319,6 +281,11 @@ func (r *AuthenticationReconciler) Reconcile(ctx context.Context, req ctrl.Reque
319281 return
320282 }
321283
284+ // Check if this Job already exists and create it if it doesn't
285+ if subResult , err := r .ensureOIDCClientRegistrationJobRuns (reconcileCtx , req ); subreconciler .ShouldHaltOrRequeue (subResult , err ) {
286+ return subreconciler .Evaluate (subResult , err )
287+ }
288+
322289 // Check if this Secret already exists and create it if it doesn't
323290 if subResult , err = r .handleSecrets (ctx , req ); subreconciler .ShouldHaltOrRequeue (subResult , err ) {
324291 return subreconciler .Evaluate (subResult , err )
@@ -332,12 +299,6 @@ func (r *AuthenticationReconciler) Reconcile(ctx context.Context, req ctrl.Reque
332299 return subreconciler .Evaluate (subResult , err )
333300 }
334301
335- // Check if this Job already exists and create it if it doesn't
336- currentJob := & batchv1.Job {}
337- err = r .handleJob (instance , currentJob , & needToRequeue )
338- if err != nil {
339- return
340- }
341302 // create clusterrole and clusterrolebinding
342303 if subResult , err := r .handleClusterRoles (reconcileCtx , req ); subreconciler .ShouldHaltOrRequeue (subResult , err ) {
343304 return subreconciler .Evaluate (subResult , err )
@@ -351,6 +312,10 @@ func (r *AuthenticationReconciler) Reconcile(ctx context.Context, req ctrl.Reque
351312 // updates redirecturi annotations to serviceaccount
352313 r .handleServiceAccount (instance , & needToRequeue )
353314
315+ if subResult , err = r .ensureMigrationJobSucceeded (ctx , req ); subreconciler .ShouldHaltOrRequeue (subResult , err ) {
316+ return subreconciler .Evaluate (subResult , err )
317+ }
318+
354319 if subResult , err := r .handleDeployments (reconcileCtx , req ); subreconciler .ShouldHaltOrRequeue (subResult , err ) {
355320 return subreconciler .Evaluate (subResult , err )
356321 }
@@ -371,6 +336,10 @@ func (r *AuthenticationReconciler) Reconcile(ctx context.Context, req ctrl.Reque
371336 return subreconciler .Evaluate (subResult , err )
372337 }
373338
339+ if result , err := r .handleMongoDBCleanup (reconcileCtx , req ); subreconciler .ShouldHaltOrRequeue (result , err ) {
340+ return subreconciler .Evaluate (result , err )
341+ }
342+
374343 return subreconciler .Evaluate (subreconciler .DoNotRequeue ())
375344}
376345
@@ -448,12 +417,6 @@ func (r *AuthenticationReconciler) SetupWithManager(mgr ctrl.Manager) error {
448417 return o .GetLabels ()[ctrlcommon .ManagerVersionLabel ] == version .Version
449418 })
450419
451- r .GetPostgresDB = func (c client.Client , ctx context.Context , req ctrl.Request ) (d dbconn.DBConn , err error ) {
452- return GetPostgresDB (c , ctx , req )
453- }
454- r .GetMongoDB = func (c client.Client , ctx context.Context , req ctrl.Request ) (d dbconn.DBConn , err error ) {
455- return GetMongoDB (c , ctx , req )
456- }
457420 authCtrl .Watches (& operatorv1alpha1.Authentication {}, & handler.EnqueueRequestForObject {}, builder .WithPredicates (bootstrappedPred ))
458421 return authCtrl .Named ("controller_authentication" ).
459422 Complete (r )
0 commit comments