Skip to content

Commit 3b72bb4

Browse files
authored
fix: logging sensite resources (#2003)
1 parent d2fdf38 commit 3b72bb4

File tree

2 files changed

+21
-3
lines changed

2 files changed

+21
-3
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
package io.javaoperatorsdk.operator.processing;
2+
3+
import io.fabric8.kubernetes.api.model.HasMetadata;
4+
import io.fabric8.kubernetes.api.model.Secret;
5+
6+
public class LoggingUtils {
7+
8+
private LoggingUtils() {}
9+
10+
public static boolean isNotSensitiveResource(HasMetadata resource) {
11+
return !(resource instanceof Secret);
12+
}
13+
14+
}

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/SSABasedGenericKubernetesResourceMatcher.java

+7-3
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import io.fabric8.kubernetes.client.utils.KubernetesSerialization;
2020
import io.javaoperatorsdk.operator.OperatorException;
2121
import io.javaoperatorsdk.operator.api.reconciler.Context;
22+
import io.javaoperatorsdk.operator.processing.LoggingUtils;
2223

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

8283
var actualMap = objectMapper.convertValue(actual, Map.class);
8384
var desiredMap = objectMapper.convertValue(desired, Map.class);
84-
85-
log.trace("Original actual: \n {} \n original desired: \n {} ", actual, desiredMap);
85+
if (LoggingUtils.isNotSensitiveResource(desired)) {
86+
log.trace("Original actual: \n {} \n original desired: \n {} ", actual, desiredMap);
87+
}
8688

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

9193
removeIrrelevantValues(desiredMap);
9294

93-
log.debug("Pruned actual: \n {} \n desired: \n {} ", prunedActual, desiredMap);
95+
if (LoggingUtils.isNotSensitiveResource(desired)) {
96+
log.debug("Pruned actual: \n {} \n desired: \n {} ", prunedActual, desiredMap);
97+
}
9498

9599
return prunedActual.equals(desiredMap);
96100
}

0 commit comments

Comments
 (0)