From ea0216361fba5a4befd83210d773ca7ae41610c3 Mon Sep 17 00:00:00 2001 From: 10000-ki <10000ki6472@gmail.com> Date: Sun, 29 Sep 2024 16:05:03 +0900 Subject: [PATCH 1/6] feat: print diff resource as yaml Signed-off-by: 10000-ki <10000ki6472@gmail.com> --- .../kubernetes/SSABasedGenericKubernetesResourceMatcher.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 f79f12b49f..512740bc67 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 @@ -104,7 +104,9 @@ public boolean matches(R actual, R desired, Context context) { removeIrrelevantValues(desiredMap); if (LoggingUtils.isNotSensitiveResource(desired)) { - log.debug("Pruned actual: \n {} \n desired: \n {} ", prunedActual, desiredMap); + var actualYml = objectMapper.asYaml(prunedActual); + var desiredYml = objectMapper.asYaml(desiredMap); + log.debug("Pruned actual: \n {} \n desired: \n {} ", actualYml, desiredYml); } return prunedActual.equals(desiredMap); From 2633cfda537402d4df7929ac5edbce732fc2166d Mon Sep 17 00:00:00 2001 From: 10000-ki <10000ki6472@gmail.com> Date: Sun, 29 Sep 2024 16:11:30 +0900 Subject: [PATCH 2/6] feat: fix naming Signed-off-by: 10000-ki <10000ki6472@gmail.com> --- .../SSABasedGenericKubernetesResourceMatcher.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 512740bc67..9cf26bb449 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 @@ -104,9 +104,9 @@ public boolean matches(R actual, R desired, Context context) { removeIrrelevantValues(desiredMap); if (LoggingUtils.isNotSensitiveResource(desired)) { - var actualYml = objectMapper.asYaml(prunedActual); - var desiredYml = objectMapper.asYaml(desiredMap); - log.debug("Pruned actual: \n {} \n desired: \n {} ", actualYml, desiredYml); + var actualYaml = objectMapper.asYaml(prunedActual); + var desiredYaml = objectMapper.asYaml(desiredMap); + log.debug("Pruned actual: \n {} \n desired: \n {} ", actualYaml, desiredYaml); } return prunedActual.equals(desiredMap); From 72911d651efe4268dade07d05e5a5377d1c28ab3 Mon Sep 17 00:00:00 2001 From: 10000-ki <10000ki6472@gmail.com> Date: Mon, 30 Sep 2024 17:07:41 +0900 Subject: [PATCH 3/6] feat: logging in yaml format only in debug mode Signed-off-by: 10000-ki <10000ki6472@gmail.com> --- .../SSABasedGenericKubernetesResourceMatcher.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) 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 9cf26bb449..612b7edd82 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 @@ -104,14 +104,22 @@ public boolean matches(R actual, R desired, Context context) { removeIrrelevantValues(desiredMap); if (LoggingUtils.isNotSensitiveResource(desired)) { - var actualYaml = objectMapper.asYaml(prunedActual); - var desiredYaml = objectMapper.asYaml(desiredMap); - log.debug("Pruned actual: \n {} \n desired: \n {} ", actualYaml, desiredYaml); + logDiff(prunedActual, desiredMap, objectMapper); } return prunedActual.equals(desiredMap); } + private void logDiff(Map prunedActualMap, Map desiredMap, KubernetesSerialization serialization) { + if (log.isDebugEnabled()) { + var actualYaml = serialization.asYaml(prunedActualMap); + var desiredYaml = serialization.asYaml(desiredMap); + log.debug("Pruned actual: \n {} \n desired: \n {} ", actualYaml, desiredYaml); + } else { + log.debug("Pruned actual: \n {} \n desired: \n {} ", prunedActualMap, desiredMap); + } + } + /** * Correct for known issue with SSA */ From 200983b5509665cb1e3fb5998c8d7464d7152943 Mon Sep 17 00:00:00 2001 From: 10000-ki <10000ki6472@gmail.com> Date: Mon, 30 Sep 2024 17:11:28 +0900 Subject: [PATCH 4/6] feat: fix log msg Signed-off-by: 10000-ki <10000ki6472@gmail.com> --- .../kubernetes/SSABasedGenericKubernetesResourceMatcher.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 612b7edd82..fa9c5b7df7 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 @@ -114,9 +114,9 @@ private void logDiff(Map prunedActualMap, Map de if (log.isDebugEnabled()) { var actualYaml = serialization.asYaml(prunedActualMap); var desiredYaml = serialization.asYaml(desiredMap); - log.debug("Pruned actual: \n {} \n desired: \n {} ", actualYaml, desiredYaml); + log.debug("Pruned actual yaml: \n {} \n desired yaml: \n {} ", actualYaml, desiredYaml); } else { - log.debug("Pruned actual: \n {} \n desired: \n {} ", prunedActualMap, desiredMap); + log.debug("Pruned actual map: \n {} \n desired map: \n {} ", prunedActualMap, desiredMap); } } From c09abc210c08fd748f4abac47a23fe6b85da6c82 Mon Sep 17 00:00:00 2001 From: 10000-ki <10000ki6472@gmail.com> Date: Mon, 30 Sep 2024 17:13:34 +0900 Subject: [PATCH 5/6] feat: fix lint error Signed-off-by: 10000-ki <10000ki6472@gmail.com> --- .../kubernetes/SSABasedGenericKubernetesResourceMatcher.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 fa9c5b7df7..cd8c2d4691 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 @@ -110,7 +110,8 @@ public boolean matches(R actual, R desired, Context context) { return prunedActual.equals(desiredMap); } - private void logDiff(Map prunedActualMap, Map desiredMap, KubernetesSerialization serialization) { + private void logDiff(Map prunedActualMap, Map desiredMap, + KubernetesSerialization serialization) { if (log.isDebugEnabled()) { var actualYaml = serialization.asYaml(prunedActualMap); var desiredYaml = serialization.asYaml(desiredMap); From 96920abbe7322c0fa20f36c22065ebec8c067b87 Mon Sep 17 00:00:00 2001 From: 10000-ki <10000ki6472@gmail.com> Date: Tue, 1 Oct 2024 00:46:38 +0900 Subject: [PATCH 6/6] feat: remove useless code Signed-off-by: 10000-ki <10000ki6472@gmail.com> --- .../kubernetes/SSABasedGenericKubernetesResourceMatcher.java | 2 -- 1 file changed, 2 deletions(-) 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 cd8c2d4691..bd4a6aa1d3 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 @@ -116,8 +116,6 @@ private void logDiff(Map prunedActualMap, Map de var actualYaml = serialization.asYaml(prunedActualMap); var desiredYaml = serialization.asYaml(desiredMap); log.debug("Pruned actual yaml: \n {} \n desired yaml: \n {} ", actualYaml, desiredYaml); - } else { - log.debug("Pruned actual map: \n {} \n desired map: \n {} ", prunedActualMap, desiredMap); } }