Merge branch 'OZG-4453-SearchIndexOperator' of...

Merge branch 'OZG-4453-SearchIndexOperator' of git.ozg-sh.de:ozgcloud-devops/operator into OZG-4453-SearchIndexOperator

lombok.config

+
+lombok.log.fieldName=LOG
+lombok.log.slf4j.flagUsage = ERROR
+lombok.log.log4j.flagUsage = ERROR
+lombok.data.flagUsage = ERROR
+lombok.nonNull.exceptionType = IllegalArgumentException
+lombok.addLombokGeneratedAnnotation = true
\ No newline at end of file

ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/ElasticsearchReconciler.java

@@ -28,17 +28,17 @@ public class ElasticsearchReconciler implements Reconciler<OzgCloudElasticsearch
 	public UpdateControl<OzgCloudElasticsearchCustomResource> reconcile(OzgCloudElasticsearchCustomResource resource,
 			Context<OzgCloudElasticsearchCustomResource> context) {
 		try {
-			log.info("Reconcile user " + resource.getCRDName() + "...");
+			log.log(Level.INFO, "Reconcile user {0} ", resource.getCRDName());
 			var namespace = resource.getMetadata().getNamespace();
 			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.");
+			log.log(Level.INFO, "Reconcile user {0} successful.", resource.getCRDName());
 			return OzgCloudElasticsearchUpdateControlBuilder.fromResource(resource).withStatus(CustomResourceStatus.OK).build();
 		} catch (Exception exception) {
-			log.info("Reconcile user failed: " + exception);
+			log.log(Level.WARNING, "Reconcile user " + resource.getCRDName() + " failed.", exception);
 			return buildExceptionUpdateControl(resource, exception);
 		}
 	}

ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/OzgCloudElasticsearchService.java

@@ -30,12 +30,12 @@ public class OzgCloudElasticsearchService {
 
 	public Secret getOrCreateCredentialSecret(OzgCloudElasticsearchCustomResource resource, Context<OzgCloudElasticsearchCustomResource> context) {
 		try {
-			log.info("Get or create secret...");
+			log.log(Level.INFO, "{0}: Get or create secret.", resource.getCRDName());
 			var namespace = resource.getMetadata().getNamespace();
 			var secretResource = getCredentialsSecretResource(namespace);
 
 			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);
 				log.info("Secret creation successful.");
 			}
@@ -132,7 +132,8 @@ public class OzgCloudElasticsearchService {
 	}
 
 	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())));
 	}