Skip to content
Snippets Groups Projects
Commit 11b997df authored by OZGCloud's avatar OZGCloud
Browse files

OZG-4453 enhance logging

parent 4fdc6ca9
Branches
Tags
No related merge requests found
...@@ -28,17 +28,17 @@ public class ElasticsearchReconciler implements Reconciler<OzgCloudElasticsearch ...@@ -28,17 +28,17 @@ public class ElasticsearchReconciler implements Reconciler<OzgCloudElasticsearch
public UpdateControl<OzgCloudElasticsearchCustomResource> reconcile(OzgCloudElasticsearchCustomResource resource, public UpdateControl<OzgCloudElasticsearchCustomResource> reconcile(OzgCloudElasticsearchCustomResource resource,
Context<OzgCloudElasticsearchCustomResource> context) { Context<OzgCloudElasticsearchCustomResource> context) {
try { try {
log.info("Reconcile user " + resource.getCRDName() + "..."); log.log(Level.INFO, "Reconcile user {0} ", resource.getCRDName());
var namespace = resource.getMetadata().getNamespace(); var namespace = resource.getMetadata().getNamespace();
var secret = service.getOrCreateCredentialSecret(resource, context); var secret = service.getOrCreateCredentialSecret(resource, context);
service.createIndexIfMissing(namespace); service.createIndexIfMissing(namespace);
service.createSecurityRoleIfMissing(namespace); service.createSecurityRoleIfMissing(namespace);
service.createSecurityUserIfMissing(namespace, getPassword(secret)); service.createSecurityUserIfMissing(namespace, getPassword(secret));
service.createCertificateIfMissing(namespace); service.createCertificateIfMissing(namespace);
log.info("Reconcile user successful."); log.log(Level.INFO, "Reconcile user {0} successful.", resource.getCRDName());
return OzgCloudElasticsearchUpdateControlBuilder.fromResource(resource).withStatus(CustomResourceStatus.OK).build(); return OzgCloudElasticsearchUpdateControlBuilder.fromResource(resource).withStatus(CustomResourceStatus.OK).build();
} catch (Exception exception) { } catch (Exception exception) {
log.info("Reconcile user failed: " + exception); log.log(Level.WARNING, "Reconcile user " + resource.getCRDName() + " failed.", exception);
return buildExceptionUpdateControl(resource, exception); return buildExceptionUpdateControl(resource, exception);
} }
} }
......
...@@ -30,12 +30,12 @@ public class OzgCloudElasticsearchService { ...@@ -30,12 +30,12 @@ public class OzgCloudElasticsearchService {
public Secret getOrCreateCredentialSecret(OzgCloudElasticsearchCustomResource resource, Context<OzgCloudElasticsearchCustomResource> context) { public Secret getOrCreateCredentialSecret(OzgCloudElasticsearchCustomResource resource, Context<OzgCloudElasticsearchCustomResource> context) {
try { try {
log.info("Get or create secret..."); log.log(Level.INFO, "{0}: Get or create secret.", resource.getCRDName());
var namespace = resource.getMetadata().getNamespace(); var namespace = resource.getMetadata().getNamespace();
var secretResource = getCredentialsSecretResource(namespace); var secretResource = getCredentialsSecretResource(namespace);
if (Objects.isNull(secretResource.get())) { if (Objects.isNull(secretResource.get())) {
log.info("Secret not exists, create one..."); log.log(Level.INFO, "{0}: Secret not exists, create one ...", resource.getCRDName());
createCredentialSecret(secretResource, namespace); createCredentialSecret(secretResource, namespace);
log.info("Secret creation successful."); log.info("Secret creation successful.");
} }
...@@ -132,7 +132,8 @@ public class OzgCloudElasticsearchService { ...@@ -132,7 +132,8 @@ public class OzgCloudElasticsearchService {
} }
void createCredentialSecret(String namespace, Resource<Secret> secretResource) { void createCredentialSecret(String namespace, Resource<Secret> secretResource) {
var serverSecretResource = kubernetesService.getSecretResource(properties.getServer().getCertificateNamespace(), properties.getServer().getCertificateSecretName()); var serverSecretResource = kubernetesService.getSecretResource(properties.getServer().getCertificateNamespace(),
properties.getServer().getCertificateSecretName());
createAdapter(secretResource).create(secretHelper.buildCertificateSecret(namespace, getSecretData(serverSecretResource.get()))); createAdapter(secretResource).create(secretHelper.buildCertificateSecret(namespace, getSecretData(serverSecretResource.get())));
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment