@@ -36,10 +36,10 @@ import (
3636 "k8s.io/apimachinery/pkg/types"
3737 "k8s.io/client-go/kubernetes"
3838 "k8s.io/client-go/tools/record"
39+ "k8s.io/klog/v2"
3940 ctrl "sigs.k8s.io/controller-runtime"
4041 "sigs.k8s.io/controller-runtime/pkg/client"
4142 "sigs.k8s.io/controller-runtime/pkg/event"
42- "sigs.k8s.io/controller-runtime/pkg/log"
4343 "sigs.k8s.io/controller-runtime/pkg/predicate"
4444
4545 secretsstorecsiv1 "sigs.k8s.io/secrets-store-csi-driver/apis/v1"
@@ -107,13 +107,12 @@ type SecretSyncReconciler struct {
107107//+kubebuilder:rbac:groups=secrets-store.csi.x-k8s.io,resources=secretproviderclasses,verbs=get;list;watch
108108
109109func (r * SecretSyncReconciler ) Reconcile (ctx context.Context , req ctrl.Request ) (ctrl.Result , error ) {
110- logger := log .FromContext (ctx )
111- logger .Info ("Reconciling SecretSync" , "namespace" , req .NamespacedName .String ())
110+ klog .InfoS ("Reconciling SecretSync" , "namespace" , req .NamespacedName .String ())
112111
113112 // get the secret sync object
114113 ss := & secretsyncv1alpha1.SecretSync {}
115114 if err := r .Get (ctx , req .NamespacedName , ss ); err != nil {
116- logger . Error (err , "unable to fetch SecretSync" )
115+ klog . ErrorS (err , "unable to fetch SecretSync" )
117116 return ctrl.Result {}, err
118117 }
119118
@@ -130,7 +129,7 @@ func (r *SecretSyncReconciler) Reconcile(ctx context.Context, req ctrl.Request)
130129 secretName := strings .TrimSpace (ss .Name )
131130 secretObj := ss .Spec .SecretObject
132131 if err := secretutil .ValidateSecretObject (secretName , secretObj ); err != nil {
133- logger . Error (err , "failed to validate secret object" , "secretName" , secretName )
132+ klog . ErrorS (err , "failed to validate secret object" , "secretName" , secretName )
134133 r .updateStatusConditions (ctx , ss , ConditionTypeUnknown , conditionType , ConditionReasonUserInputValidationFailed , true )
135134 return ctrl.Result {}, err
136135 }
@@ -143,7 +142,7 @@ func (r *SecretSyncReconciler) Reconcile(ctx context.Context, req ctrl.Request)
143142 // get the service account token
144143 serviceAccountTokenAttrs , err := r .TokenClient .SecretProviderServiceAccountTokenAttrs (ss .Namespace , ss .Spec .ServiceAccountName , r .Audiences )
145144 if err != nil {
146- logger . Error (err , "failed to get service account token" , "name" , ss .Spec .ServiceAccountName )
145+ klog . ErrorS (err , "failed to get service account token" , "name" , ss .Spec .ServiceAccountName )
147146
148147 conditionReason := ConditionReasonSecretPatchFailedUnknownError
149148 if checkIfErrorMessageCanBeDisplayed (err .Error ()) {
@@ -158,7 +157,7 @@ func (r *SecretSyncReconciler) Reconcile(ctx context.Context, req ctrl.Request)
158157 // get the secret provider class object
159158 spc := & secretsstorecsiv1.SecretProviderClass {}
160159 if err := r .Get (ctx , client.ObjectKey {Name : ss .Spec .SecretProviderClassName , Namespace : req .Namespace }, spc ); err != nil {
161- logger . Error (err , "failed to get secret provider class" , "name" , ss .Spec .SecretProviderClassName )
160+ klog . ErrorS (err , "failed to get secret provider class" , "name" , ss .Spec .SecretProviderClassName )
162161 r .updateStatusConditions (ctx , ss , ConditionTypeUnknown , conditionType , ConditionReasonControllerSpcError , true )
163162 return ctrl.Result {}, err
164163 }
@@ -180,15 +179,15 @@ func (r *SecretSyncReconciler) Reconcile(ctx context.Context, req ctrl.Request)
180179
181180 paramsJSON , err := json .Marshal (parameters )
182181 if err != nil {
183- logger . Error (err , "failed to marshal parameters" )
182+ klog . ErrorS (err , "failed to marshal parameters" )
184183 r .updateStatusConditions (ctx , ss , ConditionTypeUnknown , conditionType , ConditionReasonControllerInternalError , true )
185184 return ctrl.Result {}, err
186185 }
187186
188187 providerName := string (spc .Spec .Provider )
189188 providerClient , err := r .ProviderClients .Get (ctx , providerName )
190189 if err != nil {
191- logger . Error (err , "failed to get provider client" , "provider" , providerName )
190+ klog . ErrorS (err , "failed to get provider client" , "provider" , providerName )
192191 r .updateStatusConditions (ctx , ss , ConditionTypeUnknown , conditionType , ConditionReasonControllerSpcError , true )
193192 return ctrl.Result {}, err
194193 }
@@ -197,7 +196,7 @@ func (r *SecretSyncReconciler) Reconcile(ctx context.Context, req ctrl.Request)
197196 var secretsJSON []byte
198197 secretsJSON , err = json .Marshal (secretRefData )
199198 if err != nil {
200- logger . Error (err , "failed to marshal secret" )
199+ klog . ErrorS (err , "failed to marshal secret" )
201200 r .updateStatusConditions (ctx , ss , ConditionTypeUnknown , conditionType , ConditionReasonControllerInternalError , true )
202201 return ctrl.Result {}, err
203202 }
@@ -206,23 +205,23 @@ func (r *SecretSyncReconciler) Reconcile(ctx context.Context, req ctrl.Request)
206205
207206 objectVersions , files , err := provider .MountContent (ctx , providerClient , string (paramsJSON ), string (secretsJSON ), oldObjectVersions )
208207 if err != nil {
209- logger . Error (err , "failed to get secrets from provider" , "provider" , providerName )
208+ klog . ErrorS (err , "failed to get secrets from provider" , "provider" , providerName )
210209 r .updateStatusConditions (ctx , ss , ConditionTypeUnknown , conditionType , ConditionReasonFailedProviderError , true )
211210 return ctrl.Result {}, err
212211 }
213212
214213 secretType := secretutil .GetSecretType (strings .TrimSpace (secretObj .Type ))
215214 var datamap map [string ][]byte
216215 if datamap , err = secretutil .GetSecretData (secretObj .Data , secretType , files ); err != nil {
217- logger . Error (err , "failed to get secret data" , "secretName" , secretName )
216+ klog . ErrorS (err , "failed to get secret data" , "secretName" , secretName )
218217 r .updateStatusConditions (ctx , ss , ConditionTypeUnknown , conditionType , ConditionReasonUserInputValidationFailed , true )
219218 return ctrl.Result {}, err
220219 }
221220
222221 // Compute the hash of the secret
223222 syncHash , err := r .computeSecretDataObjectHash (datamap , spc , ss )
224223 if err != nil {
225- logger . Error (err , "failed to compute secret data object hash" , "secretName" , secretName )
224+ klog . ErrorS (err , "failed to compute secret data object hash" , "secretName" , secretName )
226225 return ctrl.Result {}, err
227226 }
228227
@@ -263,7 +262,7 @@ func (r *SecretSyncReconciler) Reconcile(ctx context.Context, req ctrl.Request)
263262
264263 // Attempt to create or update the secret.
265264 if err = r .serverSidePatchSecret (ctx , ss , secretName , req .Namespace , datamap , objectVersions , labels , annotations , secretType ); err != nil {
266- logger . Error (err , "failed to patch secret" , "secretName" , secretName )
265+ klog . ErrorS (err , "failed to patch secret" , "secretName" , secretName )
267266
268267 // Rollback to the previous hash and the previous last successful sync time.
269268 ss .Status .SyncHash = prevSecretHash
@@ -296,7 +295,7 @@ func (r *SecretSyncReconciler) Reconcile(ctx context.Context, req ctrl.Request)
296295 return ctrl.Result {}, err
297296 }
298297
299- logger .V (4 ).Info ("Done... updated status" , "syncHash" , syncHash , "lastSuccessfulSyncTime" , ss .Status .LastSuccessfulSyncTime )
298+ klog .V (4 ).InfoS ("Done... updated status" , "syncHash" , syncHash , "lastSuccessfulSyncTime" , ss .Status .LastSuccessfulSyncTime )
300299 return ctrl.Result {}, nil
301300}
302301
0 commit comments