From bdceea4c91328e6ad69c30a3829211ce701978fa Mon Sep 17 00:00:00 2001 From: Daniel Hougaard Date: Fri, 14 Mar 2025 06:59:04 +0400 Subject: [PATCH] requested changes --- .../api/v1alpha1/infisicalsecret_types.go | 3 ++- .../secrets.infisical.com_infisicalsecrets.yaml | 1 - .../controllers/infisicalsecret/conditions.go | 17 ++++++++++++++++- .../infisicalsecret_controller.go | 7 +------ 4 files changed, 19 insertions(+), 9 deletions(-) diff --git a/k8-operator/api/v1alpha1/infisicalsecret_types.go b/k8-operator/api/v1alpha1/infisicalsecret_types.go index 622a93471..8f871dfa6 100644 --- a/k8-operator/api/v1alpha1/infisicalsecret_types.go +++ b/k8-operator/api/v1alpha1/infisicalsecret_types.go @@ -138,7 +138,8 @@ type InfisicalSecretSpec struct { ManagedSecretReference ManagedKubeSecretConfig `json:"managedSecretReference"` // +kubebuilder:validation:Optional - ManagedKubeSecretReferences []ManagedKubeSecretConfig `json:"managedKubeSecretReferences"` + ManagedKubeSecretReferences []ManagedKubeSecretConfig `json:"managedKubeSecretReferences"` + // +kubebuilder:validation:Optional ManagedKubeConfigMapReferences []ManagedKubeConfigMapConfig `json:"managedKubeConfigMapReferences"` // +kubebuilder:default:=60 diff --git a/k8-operator/config/crd/bases/secrets.infisical.com_infisicalsecrets.yaml b/k8-operator/config/crd/bases/secrets.infisical.com_infisicalsecrets.yaml index c7d36e0a2..49ed43a77 100644 --- a/k8-operator/config/crd/bases/secrets.infisical.com_infisicalsecrets.yaml +++ b/k8-operator/config/crd/bases/secrets.infisical.com_infisicalsecrets.yaml @@ -419,7 +419,6 @@ spec: - secretNamespace type: object required: - - managedKubeConfigMapReferences - resyncInterval type: object status: diff --git a/k8-operator/controllers/infisicalsecret/conditions.go b/k8-operator/controllers/infisicalsecret/conditions.go index 6b8467caf..b9d09d5e2 100644 --- a/k8-operator/controllers/infisicalsecret/conditions.go +++ b/k8-operator/controllers/infisicalsecret/conditions.go @@ -11,7 +11,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) -func (r *InfisicalSecretReconciler) SetReadyToSyncSecretsConditions(ctx context.Context, infisicalSecret *v1alpha1.InfisicalSecret, secretsCount int, errorToConditionOn error) { +func (r *InfisicalSecretReconciler) SetReadyToSyncSecretsConditions(ctx context.Context, logger logr.Logger, infisicalSecret *v1alpha1.InfisicalSecret, secretsCount int, errorToConditionOn error) { if infisicalSecret.Status.Conditions == nil { infisicalSecret.Status.Conditions = []metav1.Condition{} } @@ -38,6 +38,11 @@ func (r *InfisicalSecretReconciler) SetReadyToSyncSecretsConditions(ctx context. Message: fmt.Sprintf("Infisical controller has started syncing your secrets. Last reconcile synced %d secrets", secretsCount), }) } + + err := r.Client.Status().Update(ctx, infisicalSecret) + if err != nil { + logger.Error(err, "Could not set condition for ReadyToSyncSecrets") + } } func (r *InfisicalSecretReconciler) SetInfisicalTokenLoadCondition(ctx context.Context, logger logr.Logger, infisicalSecret *v1alpha1.InfisicalSecret, authStrategy util.AuthStrategyType, errorToConditionOn error) { @@ -60,6 +65,11 @@ func (r *InfisicalSecretReconciler) SetInfisicalTokenLoadCondition(ctx context.C Message: fmt.Sprintf("Failed to load Infisical Token from the provided Kubernetes secret because: %v", errorToConditionOn), }) } + + err := r.Client.Status().Update(ctx, infisicalSecret) + if err != nil { + logger.Error(err, "Could not set condition for LoadedInfisicalToken") + } } func (r *InfisicalSecretReconciler) SetInfisicalAutoRedeploymentReady(ctx context.Context, logger logr.Logger, infisicalSecret *v1alpha1.InfisicalSecret, numDeployments int, errorToConditionOn error) { @@ -82,4 +92,9 @@ func (r *InfisicalSecretReconciler) SetInfisicalAutoRedeploymentReady(ctx contex Message: fmt.Sprintf("Failed reconcile deployments because: %v", errorToConditionOn), }) } + + err := r.Client.Status().Update(ctx, infisicalSecret) + if err != nil { + logger.Error(err, "Could not set condition for AutoRedeployReady") + } } diff --git a/k8-operator/controllers/infisicalsecret/infisicalsecret_controller.go b/k8-operator/controllers/infisicalsecret/infisicalsecret_controller.go index 4655a163c..301f3856f 100644 --- a/k8-operator/controllers/infisicalsecret/infisicalsecret_controller.go +++ b/k8-operator/controllers/infisicalsecret/infisicalsecret_controller.go @@ -153,7 +153,7 @@ func (r *InfisicalSecretReconciler) Reconcile(ctx context.Context, req ctrl.Requ } secretsCount, err := r.ReconcileInfisicalSecret(ctx, logger, &infisicalSecretCRD, managedKubeSecretReferences, managedKubeConfigMapReferences) - r.SetReadyToSyncSecretsConditions(ctx, &infisicalSecretCRD, secretsCount, err) + r.SetReadyToSyncSecretsConditions(ctx, logger, &infisicalSecretCRD, secretsCount, err) if err != nil { logger.Error(err, fmt.Sprintf("unable to reconcile InfisicalSecret. Will requeue after [requeueTime=%v]", requeueTime)) @@ -165,11 +165,6 @@ func (r *InfisicalSecretReconciler) Reconcile(ctx context.Context, req ctrl.Requ numDeployments, err := controllerhelpers.ReconcileDeploymentsWithMultipleManagedSecrets(ctx, r.Client, logger, managedKubeSecretReferences) r.SetInfisicalAutoRedeploymentReady(ctx, logger, &infisicalSecretCRD, numDeployments, err) - err = r.Client.Status().Update(ctx, &infisicalSecretCRD) - if err != nil { - logger.Error(err, "Could not set condition for AutoRedeployReady") - } - if err != nil { logger.Error(err, fmt.Sprintf("unable to reconcile auto redeployment. Will requeue after [requeueTime=%v]", requeueTime)) return ctrl.Result{