From 12d6c0a0d04eef5d5200d30ff3c57a80360aad5d Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Fri, 5 Jan 2024 14:41:19 +0100
Subject: [PATCH] OZG-4453 enhance logging
---
.../de/ozgcloud/operator/ElasticsearchReconciler.java | 8 ++++----
.../ozgcloud/operator/OzgCloudElasticsearchService.java | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/ElasticsearchReconciler.java b/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/ElasticsearchReconciler.java
index f1a2ba0..24899d8 100644
--- a/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/ElasticsearchReconciler.java
+++ b/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/ElasticsearchReconciler.java
@@ -27,17 +27,17 @@ public class ElasticsearchReconciler implements Reconciler<OzgCloudElasticsearch
public UpdateControl<OzgCloudElasticsearchCustomResource> reconcile(OzgCloudElasticsearchCustomResource resource,
Context<OzgCloudElasticsearchCustomResource> context) {
try {
- LOG.info("{}: Reconcile user", resource.getMetadata().getName());
var namespace = resource.getMetadata().getNamespace();
+ LOG.info("{}: Reconcile user", namespace);
var secret = service.getOrCreateCredentialSecret(resource, context);
service.createIndexIfMissing(namespace);
service.createSecurityRoleIfMissing(namespace);
service.createSecurityUserIfMissing(namespace, getPassword(secret));
service.createCertificateIfMissing(namespace);
- LOG.info("{}: Reconcile user successful.", resource.getMetadata().getName());
+ LOG.info("{}: Reconcile user successful.", namespace);
return OzgCloudElasticsearchUpdateControlBuilder.fromResource(resource).withStatus(CustomResourceStatus.OK).build();
} catch (Exception exception) {
- LOG.warn(resource.getMetadata().getName() + ": Reconcile user failed.", exception);
+ LOG.warn(resource.getMetadata().getNamespace() + ": Reconcile user failed.", exception);
return buildExceptionUpdateControl(resource, exception);
}
}
@@ -73,7 +73,7 @@ public class ElasticsearchReconciler implements Reconciler<OzgCloudElasticsearch
service.deleteIndexIfExists(namespace);
return DeleteControl.defaultDelete();
} catch (Exception e) {
- LOG.warn(resource.getMetadata().getName() + ": Could not cleanup elasticsearch resource.", e);
+ LOG.warn(resource.getMetadata().getNamespace() + ": Could not cleanup elasticsearch resource.", e);
return DeleteControl.defaultDelete();
}
}
diff --git a/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/OzgCloudElasticsearchService.java b/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/OzgCloudElasticsearchService.java
index 57f19ad..d7207e4 100644
--- a/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/OzgCloudElasticsearchService.java
+++ b/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/OzgCloudElasticsearchService.java
@@ -29,18 +29,18 @@ public class OzgCloudElasticsearchService {
public Secret getOrCreateCredentialSecret(OzgCloudElasticsearchCustomResource resource, Context<OzgCloudElasticsearchCustomResource> context) {
try {
- LOG.debug("{}: Get or create secret.", resource.getMetadata().getName());
+ LOG.debug("{}: Get or create secret.", resource.getMetadata().getNamespace());
var namespace = resource.getMetadata().getNamespace();
var secretResource = getCredentialsSecretResource(namespace);
if (Objects.isNull(secretResource.get())) {
- LOG.info("{}: Secret not exists, create one ...", resource.getMetadata().getName());
+ LOG.info("{}: Secret not exists, create one ...", resource.getMetadata().getNamespace());
createCredentialSecret(secretResource, namespace);
- LOG.info("{}: Secret creation successful.", resource.getMetadata().getName());
+ LOG.info("{}: Secret creation successful.", resource.getMetadata().getNamespace());
}
return secretResource.get();
} catch (Exception e) {
- LOG.warn(resource.getMetadata().getName() + ": Secret creation failed: ", e);
+ LOG.warn(resource.getMetadata().getNamespace() + ": Secret creation failed: ", e);
throw e;
}
}
--
GitLab