Skip to content

Commit

Permalink
fix: logging sensite resources (#2003)
Browse files Browse the repository at this point in the history
  • Loading branch information
csviri authored Aug 7, 2023
1 parent d2fdf38 commit 3b72bb4
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 3 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
package io.javaoperatorsdk.operator.processing;

import io.fabric8.kubernetes.api.model.HasMetadata;
import io.fabric8.kubernetes.api.model.Secret;

public class LoggingUtils {

private LoggingUtils() {}

public static boolean isNotSensitiveResource(HasMetadata resource) {
return !(resource instanceof Secret);
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import io.fabric8.kubernetes.client.utils.KubernetesSerialization;
import io.javaoperatorsdk.operator.OperatorException;
import io.javaoperatorsdk.operator.api.reconciler.Context;
import io.javaoperatorsdk.operator.processing.LoggingUtils;

/**
* Matches the actual state on the server vs the desired state. Based on the managedFields of SSA.
Expand Down Expand Up @@ -81,16 +82,19 @@ public boolean matches(R actual, R desired, Context<?> context) {

var actualMap = objectMapper.convertValue(actual, Map.class);
var desiredMap = objectMapper.convertValue(desired, Map.class);

log.trace("Original actual: \n {} \n original desired: \n {} ", actual, desiredMap);
if (LoggingUtils.isNotSensitiveResource(desired)) {
log.trace("Original actual: \n {} \n original desired: \n {} ", actual, desiredMap);
}

var prunedActual = new HashMap<String, Object>(actualMap.size());
keepOnlyManagedFields(prunedActual, actualMap,
managedFieldsEntry.getFieldsV1().getAdditionalProperties(), objectMapper);

removeIrrelevantValues(desiredMap);

log.debug("Pruned actual: \n {} \n desired: \n {} ", prunedActual, desiredMap);
if (LoggingUtils.isNotSensitiveResource(desired)) {
log.debug("Pruned actual: \n {} \n desired: \n {} ", prunedActual, desiredMap);
}

return prunedActual.equals(desiredMap);
}
Expand Down

0 comments on commit 3b72bb4

Please sign in to comment.