From 87c7c345d2a9789a5492e8826c7394bc1adfcaf6 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Thu, 18 Apr 2024 22:04:04 +0200
Subject: [PATCH] OZG-4906 use correct namespace
---
.../de/ozgcloud/operator/OzgCloudElasticsearchService.java | 4 ++--
.../ozgcloud/operator/OzgCloudElasticsearchServiceTest.java | 3 ---
2 files changed, 2 insertions(+), 5 deletions(-)
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 490fa6d..cdefbaf 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
@@ -32,10 +32,10 @@ public class OzgCloudElasticsearchService {
public void copyElasticCertificate(String namespace) {
try {
- LOG.debug("Copy elasticseaerch ssl certificate from namespace: {}" , properties.getServer().getCertificateNamespace());
+ LOG.debug("Copy elasticseaerch ssl certificate from namespace: {}" , properties.getServer().getNamespace());
LOG.debug("Copy elasticseaerch ssl certificate secret: {}" , properties.getServer().getCertificateSecretName());
- var secretResource = kubernetesService.getSecretResource(properties.getServer().getCertificateNamespace(), properties.getServer().getCertificateSecretName());
+ var secretResource = kubernetesService.getSecretResource(properties.getServer().getNamespace(), properties.getServer().getCertificateSecretName());
LOG.info("{}: Create certificate secret", namespace);
createCredentialSecret(secretResource,namespace);
} catch (ElasticsearchException e) {
diff --git a/ozgcloud-elasticsearch-operator/src/test/java/de/ozgcloud/operator/OzgCloudElasticsearchServiceTest.java b/ozgcloud-elasticsearch-operator/src/test/java/de/ozgcloud/operator/OzgCloudElasticsearchServiceTest.java
index bdca41b..325c7c4 100644
--- a/ozgcloud-elasticsearch-operator/src/test/java/de/ozgcloud/operator/OzgCloudElasticsearchServiceTest.java
+++ b/ozgcloud-elasticsearch-operator/src/test/java/de/ozgcloud/operator/OzgCloudElasticsearchServiceTest.java
@@ -122,7 +122,6 @@ class OzgCloudElasticsearchServiceTest {
@Test
void shouldCheckIfIndexExists() {
when(kubernetesService.getSecretResource(any(), any())).thenReturn(secretResource);
- when(serverProperties.getCertificateNamespace()).thenReturn(NAMESPACE);
when(properties.getServer()).thenReturn(serverProperties);
service.createIndexIfMissing(NAMESPACE);
@@ -134,8 +133,6 @@ class OzgCloudElasticsearchServiceTest {
@Test
void shouldCreateIndexIfMissing() {
when(kubernetesService.getSecretResource(any(), any())).thenReturn(secretResource);
- when(serverProperties.getCertificateNamespace()).thenReturn(NAMESPACE);
- when(remoteService.existsIndex(any())).thenReturn(false);
when(properties.getServer()).thenReturn(serverProperties);
service.createIndexIfMissing(NAMESPACE);
--
GitLab