From ac70142da6078dc4f4b17c5bfb5961c04e05e0bc Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Fri, 19 Apr 2024 11:12:46 +0200
Subject: [PATCH] OZG-4906 copy es crt in service call
---
.../OzgCloudElasticsearchService.java | 26 +++++++++----------
1 file changed, 13 insertions(+), 13 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 b24467d..2fb7726 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
@@ -30,19 +30,6 @@ public class OzgCloudElasticsearchService {
private final KubernetesRemoteService kubernetesService;
- public void copyElasticCertificate(String namespace) {
- try {
- 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().getNamespace(), properties.getServer().getCertificateSecretName());
- LOG.info("Create certificate secret in namespace {} after copying", namespace);
-
- createAdapter(secretResource).create(secretHelper.buildCertificateSecret(namespace, getSecretData(secretResource.get())));
- } catch (ElasticsearchException e) {
- throw new RuntimeException("can not copy/create elasticsearch ssl certificate");
- }
- }
public Secret getOrCreateCredentialSecret(OzgCloudElasticsearchCustomResource resource, Context<OzgCloudElasticsearchCustomResource> context) {
try {
@@ -119,6 +106,19 @@ public class OzgCloudElasticsearchService {
}
}
+ public void copyElasticCertificate(String namespace) {
+ try {
+ var secretResource = kubernetesService.getSecretResource(namespace, properties.getCertificateSecretName());
+ LOG.info(" properties.getCertificateSecretName:", properties.getCertificateSecretName());
+ LOG.info(" Create certificate secret in namespace {}", namespace);
+ createCredentialSecret(namespace, secretResource);
+
+ } catch (Exception e) {
+ throw new RuntimeException("Certificate secret creation failed " + namespace, e);
+ }
+
+ }
+
public void createCertificateIfMissing(String namespace) {
try {
LOG.debug("{}: Create certificate secret if missing...", namespace);
--
GitLab