Skip to content
Snippets Groups Projects
Commit 12d6c0a0 authored by OZGCloud's avatar OZGCloud
Browse files

OZG-4453 enhance logging

parent 264e9c54
No related branches found
No related tags found
No related merge requests found
......@@ -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();
}
}
......
......@@ -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;
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment