diff --git a/k8-operator/controllers/infisicaldynamicsecret/conditions.go b/k8-operator/controllers/infisicaldynamicsecret/conditions.go index 417451952..a26e5b71d 100644 --- a/k8-operator/controllers/infisicaldynamicsecret/conditions.go +++ b/k8-operator/controllers/infisicaldynamicsecret/conditions.go @@ -10,7 +10,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) -func (r *InfisicalDynamicSecretReconciler) SetReconcileAutoRedeploymentStatus(ctx context.Context, logger logr.Logger, infisicalDynamicSecret *v1alpha1.InfisicalDynamicSecret, numDeployments int, errorToConditionOn error) { +func (r *InfisicalDynamicSecretReconciler) SetReconcileAutoRedeploymentConditionStatus(ctx context.Context, logger logr.Logger, infisicalDynamicSecret *v1alpha1.InfisicalDynamicSecret, numDeployments int, errorToConditionOn error) { if infisicalDynamicSecret.Status.Conditions == nil { infisicalDynamicSecret.Status.Conditions = []metav1.Condition{} } @@ -37,7 +37,7 @@ func (r *InfisicalDynamicSecretReconciler) SetReconcileAutoRedeploymentStatus(ct } } -func (r *InfisicalDynamicSecretReconciler) SetAuthenticatedStatus(ctx context.Context, logger logr.Logger, infisicalDynamicSecret *v1alpha1.InfisicalDynamicSecret, errorToConditionOn error) { +func (r *InfisicalDynamicSecretReconciler) SetAuthenticatedConditionStatus(ctx context.Context, logger logr.Logger, infisicalDynamicSecret *v1alpha1.InfisicalDynamicSecret, errorToConditionOn error) { if infisicalDynamicSecret.Status.Conditions == nil { infisicalDynamicSecret.Status.Conditions = []metav1.Condition{} } @@ -64,7 +64,7 @@ func (r *InfisicalDynamicSecretReconciler) SetAuthenticatedStatus(ctx context.Co } } -func (r *InfisicalDynamicSecretReconciler) SetLeaseRenewalStatus(ctx context.Context, logger logr.Logger, infisicalDynamicSecret *v1alpha1.InfisicalDynamicSecret, errorToConditionOn error) { +func (r *InfisicalDynamicSecretReconciler) SetLeaseRenewalConditionStatus(ctx context.Context, logger logr.Logger, infisicalDynamicSecret *v1alpha1.InfisicalDynamicSecret, errorToConditionOn error) { if infisicalDynamicSecret.Status.Conditions == nil { infisicalDynamicSecret.Status.Conditions = []metav1.Condition{} } @@ -91,7 +91,7 @@ func (r *InfisicalDynamicSecretReconciler) SetLeaseRenewalStatus(ctx context.Con } } -func (r *InfisicalDynamicSecretReconciler) SetCreatedLeaseStatus(ctx context.Context, logger logr.Logger, infisicalDynamicSecret *v1alpha1.InfisicalDynamicSecret, errorToConditionOn error) { +func (r *InfisicalDynamicSecretReconciler) SetCreatedLeaseConditionStatus(ctx context.Context, logger logr.Logger, infisicalDynamicSecret *v1alpha1.InfisicalDynamicSecret, errorToConditionOn error) { if infisicalDynamicSecret.Status.Conditions == nil { infisicalDynamicSecret.Status.Conditions = []metav1.Condition{} } @@ -118,7 +118,7 @@ func (r *InfisicalDynamicSecretReconciler) SetCreatedLeaseStatus(ctx context.Con } } -func (r *InfisicalDynamicSecretReconciler) SetReconcileStatus(ctx context.Context, logger logr.Logger, infisicalDynamicSecret *v1alpha1.InfisicalDynamicSecret, errorToConditionOn error) { +func (r *InfisicalDynamicSecretReconciler) SetReconcileConditionStatus(ctx context.Context, logger logr.Logger, infisicalDynamicSecret *v1alpha1.InfisicalDynamicSecret, errorToConditionOn error) { if infisicalDynamicSecret.Status.Conditions == nil { infisicalDynamicSecret.Status.Conditions = []metav1.Condition{} } diff --git a/k8-operator/controllers/infisicaldynamicsecret/infisicaldynamicsecret_controller.go b/k8-operator/controllers/infisicaldynamicsecret/infisicaldynamicsecret_controller.go index a7c5464a9..5d2470067 100644 --- a/k8-operator/controllers/infisicaldynamicsecret/infisicaldynamicsecret_controller.go +++ b/k8-operator/controllers/infisicaldynamicsecret/infisicaldynamicsecret_controller.go @@ -134,7 +134,7 @@ func (r *InfisicalDynamicSecretReconciler) Reconcile(ctx context.Context, req ct } nextReconcile, err := r.ReconcileInfisicalDynamicSecret(ctx, logger, &infisicalDynamicSecretCRD) - r.SetReconcileStatus(ctx, logger, &infisicalDynamicSecretCRD, err) + r.SetReconcileConditionStatus(ctx, logger, &infisicalDynamicSecretCRD, err) if err == nil && nextReconcile.Seconds() >= 5 { requeueTime = nextReconcile @@ -148,7 +148,7 @@ func (r *InfisicalDynamicSecretReconciler) Reconcile(ctx context.Context, req ct } numDeployments, err := controllerhelpers.ReconcileDeploymentsWithManagedSecrets(ctx, r.Client, logger, infisicalDynamicSecretCRD.Spec.ManagedSecretReference) - r.SetReconcileAutoRedeploymentStatus(ctx, logger, &infisicalDynamicSecretCRD, numDeployments, err) + r.SetReconcileAutoRedeploymentConditionStatus(ctx, logger, &infisicalDynamicSecretCRD, numDeployments, err) if err != nil { logger.Error(err, fmt.Sprintf("unable to reconcile auto redeployment. Will requeue after [requeueTime=%v]", requeueTime)) diff --git a/k8-operator/controllers/infisicaldynamicsecret/infisicaldynamicsecret_helper.go b/k8-operator/controllers/infisicaldynamicsecret/infisicaldynamicsecret_helper.go index c923a0be0..861880d95 100644 --- a/k8-operator/controllers/infisicaldynamicsecret/infisicaldynamicsecret_helper.go +++ b/k8-operator/controllers/infisicaldynamicsecret/infisicaldynamicsecret_helper.go @@ -330,7 +330,7 @@ func (r *InfisicalDynamicSecretReconciler) ReconcileInfisicalDynamicSecret(ctx c if authDetails.AuthStrategy == "" { logger.Info("No authentication strategy found. Attempting to authenticate") authDetails, err = r.handleAuthentication(ctx, *infisicalDynamicSecret, infisicalClient) - r.SetAuthenticatedStatus(ctx, logger, infisicalDynamicSecret, err) + r.SetAuthenticatedConditionStatus(ctx, logger, infisicalDynamicSecret, err) if err != nil { return nextReconcile, fmt.Errorf("unable to authenticate [err=%s]", err) @@ -374,7 +374,7 @@ func (r *InfisicalDynamicSecretReconciler) ReconcileInfisicalDynamicSecret(ctx c if infisicalDynamicSecret.Status.Lease == nil { err := r.CreateDynamicSecretLease(ctx, logger, infisicalClient, infisicalDynamicSecret, destination) - r.SetCreatedLeaseStatus(ctx, logger, infisicalDynamicSecret, err) + r.SetCreatedLeaseConditionStatus(ctx, logger, infisicalDynamicSecret, err) return defaultNextReconcile, err // Short requeue after creation } else { @@ -412,7 +412,7 @@ func (r *InfisicalDynamicSecretReconciler) ReconcileInfisicalDynamicSecret(ctx c maxTTLThreshold)) err := r.CreateDynamicSecretLease(ctx, logger, infisicalClient, infisicalDynamicSecret, destination) - r.SetCreatedLeaseStatus(ctx, logger, infisicalDynamicSecret, err) + r.SetCreatedLeaseConditionStatus(ctx, logger, infisicalDynamicSecret, err) return defaultNextReconcile, err // Short requeue after creation } } @@ -421,7 +421,7 @@ func (r *InfisicalDynamicSecretReconciler) ReconcileInfisicalDynamicSecret(ctx c if now.After(leaseExpiresAt) { logger.Info("Lease has expired, creating new lease...") err = r.CreateDynamicSecretLease(ctx, logger, infisicalClient, infisicalDynamicSecret, destination) - r.SetCreatedLeaseStatus(ctx, logger, infisicalDynamicSecret, err) + r.SetCreatedLeaseConditionStatus(ctx, logger, infisicalDynamicSecret, err) return defaultNextReconcile, err // Short requeue after creation } @@ -432,12 +432,12 @@ func (r *InfisicalDynamicSecretReconciler) ReconcileInfisicalDynamicSecret(ctx c renewalThreshold)) err = r.RenewDynamicSecretLease(ctx, logger, infisicalClient, infisicalDynamicSecret, destination) - r.SetLeaseRenewalStatus(ctx, logger, infisicalDynamicSecret, err) + r.SetLeaseRenewalConditionStatus(ctx, logger, infisicalDynamicSecret, err) if err == constants.ErrInvalidLease { logger.Info("Failed to renew expired lease, creating new lease...") err = r.CreateDynamicSecretLease(ctx, logger, infisicalClient, infisicalDynamicSecret, destination) - r.SetCreatedLeaseStatus(ctx, logger, infisicalDynamicSecret, err) + r.SetCreatedLeaseConditionStatus(ctx, logger, infisicalDynamicSecret, err) } return defaultNextReconcile, err // Short requeue after renewal/creation