diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/LoggingUtils.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/LoggingUtils.java new file mode 100644 index 0000000000..1a180f6698 --- /dev/null +++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/LoggingUtils.java @@ -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); + } + +} diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/SSABasedGenericKubernetesResourceMatcher.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/SSABasedGenericKubernetesResourceMatcher.java index ae23fb8afa..f4718b45c3 100644 --- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/SSABasedGenericKubernetesResourceMatcher.java +++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/SSABasedGenericKubernetesResourceMatcher.java @@ -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. @@ -81,8 +82,9 @@ 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(actualMap.size()); keepOnlyManagedFields(prunedActual, actualMap, @@ -90,7 +92,9 @@ public boolean matches(R actual, R desired, Context context) { 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); }