@@ -234,7 +234,7 @@ func removeWebhookMutation(predictedLive, live *unstructured.Unstructured, gvkPa
234
234
mfs := & fieldpath.Set {}
235
235
err := mfs .FromJSON (bytes .NewReader (mfEntry .FieldsV1 .Raw ))
236
236
if err != nil {
237
- return nil , fmt .Errorf ("error building managedFields set: %s " , err )
237
+ return nil , fmt .Errorf ("error building managedFields set: %w " , err )
238
238
}
239
239
if comparison .Added != nil && ! comparison .Added .Empty () {
240
240
// exclude the added fields owned by this manager from the comparison
@@ -262,7 +262,7 @@ func removeWebhookMutation(predictedLive, live *unstructured.Unstructured, gvkPa
262
262
// revert modified fields not owned by any manager
263
263
typedPredictedLive , err = typedPredictedLive .Merge (liveModValues )
264
264
if err != nil {
265
- return nil , fmt .Errorf ("error reverting webhook modified fields in predicted live resource: %s " , err )
265
+ return nil , fmt .Errorf ("error reverting webhook modified fields in predicted live resource: %w " , err )
266
266
}
267
267
}
268
268
@@ -271,7 +271,7 @@ func removeWebhookMutation(predictedLive, live *unstructured.Unstructured, gvkPa
271
271
// revert removed fields not owned by any manager
272
272
typedPredictedLive , err = typedPredictedLive .Merge (liveRmValues )
273
273
if err != nil {
274
- return nil , fmt .Errorf ("error reverting webhook removed fields in predicted live resource: %s " , err )
274
+ return nil , fmt .Errorf ("error reverting webhook removed fields in predicted live resource: %w " , err )
275
275
}
276
276
}
277
277
@@ -287,7 +287,7 @@ func jsonStrToUnstructured(jsonString string) (*unstructured.Unstructured, error
287
287
res := make (map [string ]any )
288
288
err := json .Unmarshal ([]byte (jsonString ), & res )
289
289
if err != nil {
290
- return nil , fmt .Errorf ("unmarshal error: %s " , err )
290
+ return nil , fmt .Errorf ("unmarshal error: %w " , err )
291
291
}
292
292
return & unstructured.Unstructured {Object : res }, nil
293
293
}
@@ -770,7 +770,7 @@ func GetLastAppliedConfigAnnotation(live *unstructured.Unstructured) (*unstructu
770
770
var obj unstructured.Unstructured
771
771
err := json .Unmarshal ([]byte (lastAppliedStr ), & obj )
772
772
if err != nil {
773
- return nil , fmt .Errorf ("failed to unmarshal %s in %s: %v " , corev1 .LastAppliedConfigAnnotation , live .GetName (), err )
773
+ return nil , fmt .Errorf ("failed to unmarshal %s in %s: %w " , corev1 .LastAppliedConfigAnnotation , live .GetName (), err )
774
774
}
775
775
return & obj , nil
776
776
}
@@ -1027,7 +1027,7 @@ func HideSecretData(target *unstructured.Unstructured, live *unstructured.Unstru
1027
1027
} else {
1028
1028
lastAppliedData , err := json .Marshal (liveLastAppliedAnnotation )
1029
1029
if err != nil {
1030
- return nil , nil , fmt .Errorf ("error marshaling json: %s " , err )
1030
+ return nil , nil , fmt .Errorf ("error marshaling json: %w " , err )
1031
1031
}
1032
1032
annotations [corev1 .LastAppliedConfigAnnotation ] = string (lastAppliedData )
1033
1033
}
@@ -1055,7 +1055,7 @@ func hide(target, live, liveLastAppliedAnnotation *unstructured.Unstructured, ke
1055
1055
var err error
1056
1056
data , _ , err = unstructured .NestedMap (obj .Object , fields ... )
1057
1057
if err != nil {
1058
- return nil , nil , nil , fmt .Errorf ("unstructured.NestedMap error: %s " , err )
1058
+ return nil , nil , nil , fmt .Errorf ("unstructured.NestedMap error: %w " , err )
1059
1059
}
1060
1060
}
1061
1061
if data == nil {
@@ -1075,7 +1075,7 @@ func hide(target, live, liveLastAppliedAnnotation *unstructured.Unstructured, ke
1075
1075
data [k ] = replacement
1076
1076
err := unstructured .SetNestedField (obj .Object , data , fields ... )
1077
1077
if err != nil {
1078
- return nil , nil , nil , fmt .Errorf ("unstructured.SetNestedField error: %s " , err )
1078
+ return nil , nil , nil , fmt .Errorf ("unstructured.SetNestedField error: %w " , err )
1079
1079
}
1080
1080
}
1081
1081
}
0 commit comments