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

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

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.getCRDName() + ": Could not cleanup elasticsearch resource.", e);
+			LOG.warn(resource.getMetadata().getNamespace() + ": Could not cleanup elasticsearch resource.", e);
 			return DeleteControl.defaultDelete();
 		}
 	}

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.getCRDName());
+			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.getCRDName());
+				LOG.info("{}: Secret not exists, create one ...", resource.getMetadata().getNamespace());
 				createCredentialSecret(secretResource, namespace);
-				LOG.info("{}: Secret creation successful.", resource.getCRDName());
+				LOG.info("{}: Secret creation successful.", resource.getMetadata().getNamespace());
 			}
 			return secretResource.get();
 		} catch (Exception e) {
-			LOG.warn(resource.getCRDName() + ": Secret creation failed: ", e);
+			LOG.warn(resource.getMetadata().getNamespace() + ": Secret creation failed: ", e);
 			throw e;
 		}
 	}

ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/common/elasticsearch/ElasticsearchRemoteService.java

@@ -25,7 +25,7 @@ public class ElasticsearchRemoteService {
 		try {
 			LOG.debug("{}: Test if elasticsearch index exits.", index);
 			var exists = client.indices().exists(builder -> builder.index(index)).value();
-			LOG.debug("{}: Elasticsearch index exists: {}", exists);
+			LOG.debug("{}: Elasticsearch index exists: {}", index, exists);
 			return exists;
 		} catch (ElasticsearchException | IOException e) {
 			throw new RuntimeException("Error checking index '" + index, e);

ozgcloud-elasticsearch-operator/src/main/resources/log4j2-local.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+	<Appenders>
+		<Console name="CONSOLE" target="SYSTEM_OUT">
+			<PatternLayout pattern="[%-5level] %c{1.} %msg%n"/>
+		</Console>
+	</Appenders>
+
+	<Loggers>
+		<Root level="WARN">
+			<appender-ref ref="CONSOLE" />
+		</Root>
+	</Loggers>
+</configuration>
\ No newline at end of file