diff --git a/src/main/java/de/ozgcloud/operator/elstertransfer/user/OzgCloudElsterTransferUserReconciler.java b/src/main/java/de/ozgcloud/operator/elstertransfer/user/OzgCloudElsterTransferUserReconciler.java index 0ad5218d9a380285979195b1db11df8bc45011e7..d08cf64bf47e03e719c8dab2a17b6c8f6b6a7bbb 100644 --- a/src/main/java/de/ozgcloud/operator/elstertransfer/user/OzgCloudElsterTransferUserReconciler.java +++ b/src/main/java/de/ozgcloud/operator/elstertransfer/user/OzgCloudElsterTransferUserReconciler.java @@ -40,7 +40,7 @@ public class OzgCloudElsterTransferUserReconciler implements Reconciler<OzgCloud // Restart the deployment elsterTransferUserService.restartDeployment(ETR_NAMESPACE, DEPLOYMENT_NAME); // create or update secret - elsterTransferUserService.createOrUpdateSecret(namespace, psw); + elsterTransferUserService.createSecret(namespace, psw); } @@ -73,7 +73,7 @@ public class OzgCloudElsterTransferUserReconciler implements Reconciler<OzgCloud DeleteControl deleteUser(String userLogin) { LOG.info("{} do cleanup...", userLogin); try { - elsterTransferUserService.deleteUserAndSecret(userLogin, CONFIG_MAP_NAME); + elsterTransferUserService.deleteUser(userLogin, CONFIG_MAP_NAME); elsterTransferUserService.restartDeployment(ETR_NAMESPACE, DEPLOYMENT_NAME); return DeleteControl.defaultDelete(); } catch (Exception e) { diff --git a/src/main/java/de/ozgcloud/operator/elstertransfer/user/OzgCloudElsterTransferUserRemoteService.java b/src/main/java/de/ozgcloud/operator/elstertransfer/user/OzgCloudElsterTransferUserRemoteService.java index 34e5a238d8ea7f567031c45e4d9d31fd7a0d923c..ca51ddfde829a6f08e3532c6b454a9d4cd8675cc 100644 --- a/src/main/java/de/ozgcloud/operator/elstertransfer/user/OzgCloudElsterTransferUserRemoteService.java +++ b/src/main/java/de/ozgcloud/operator/elstertransfer/user/OzgCloudElsterTransferUserRemoteService.java @@ -49,11 +49,8 @@ public class OzgCloudElsterTransferUserRemoteService { } } - public void deleteUserSecret(String namespace) { - client.secrets().inNamespace(namespace).withName(SECRET_NAME).delete(); - } - public void createOrUpdateSecret(String namespace, String psw) { + public void createSecret(String namespace, String psw) { Secret secret = new SecretBuilder() .withNewMetadata() .withName(SECRET_NAME) diff --git a/src/main/java/de/ozgcloud/operator/elstertransfer/user/OzgCloudElsterTransferUserService.java b/src/main/java/de/ozgcloud/operator/elstertransfer/user/OzgCloudElsterTransferUserService.java index ccef0e9c5d5617af44542c7b6730018b1e535a78..a7469d8db67f588f04cb7071283e6b75f2ed7a44 100644 --- a/src/main/java/de/ozgcloud/operator/elstertransfer/user/OzgCloudElsterTransferUserService.java +++ b/src/main/java/de/ozgcloud/operator/elstertransfer/user/OzgCloudElsterTransferUserService.java @@ -91,7 +91,7 @@ public class OzgCloudElsterTransferUserService { return false; } - public void deleteUserAndSecret(String userLogin, String configMapName) { + public void deleteUser(String userLogin, String configMapName) { try { ConfigMap configMap = remoteService.getConfigMap(ETR_NAMESPACE, configMapName); @@ -115,17 +115,14 @@ public class OzgCloudElsterTransferUserService { remoteService.updateConfigMapData(configMap, USERS_KEY, updatedUsersYaml); LOG.info("User with login '{}' removed from configmap successfully", userLogin); - remoteService.deleteUserSecret(userLogin); - LOG.info("User secret for in namespace '{}' deleted successfully", userLogin); - } catch (Exception e) { LOG.error("Error while deleting user", e); } } - public void createOrUpdateSecret(String namespace, String psw) { - remoteService.createOrUpdateSecret(namespace, psw); - LOG.info("Secret for user in namespace '{}' created/updated successfully", namespace); + public void createSecret(String namespace, String psw) { + remoteService.createSecret(namespace, psw); + LOG.info("Secret for user in namespace '{}' created successfully", namespace); } Map<String, Object> getUsersMapFromConfigMap(ConfigMap configMap) {