Skip to content
Snippets Groups Projects
Commit c45f5adc authored by OZGCloud's avatar OZGCloud
Browse files

OZG-6177 remove delete secret function

parent fb5aea30
No related branches found
No related tags found
No related merge requests found
...@@ -40,7 +40,7 @@ public class OzgCloudElsterTransferUserReconciler implements Reconciler<OzgCloud ...@@ -40,7 +40,7 @@ public class OzgCloudElsterTransferUserReconciler implements Reconciler<OzgCloud
// Restart the deployment // Restart the deployment
elsterTransferUserService.restartDeployment(ETR_NAMESPACE, DEPLOYMENT_NAME); elsterTransferUserService.restartDeployment(ETR_NAMESPACE, DEPLOYMENT_NAME);
// create or update secret // create or update secret
elsterTransferUserService.createOrUpdateSecret(namespace, psw); elsterTransferUserService.createSecret(namespace, psw);
} }
...@@ -73,7 +73,7 @@ public class OzgCloudElsterTransferUserReconciler implements Reconciler<OzgCloud ...@@ -73,7 +73,7 @@ public class OzgCloudElsterTransferUserReconciler implements Reconciler<OzgCloud
DeleteControl deleteUser(String userLogin) { DeleteControl deleteUser(String userLogin) {
LOG.info("{} do cleanup...", userLogin); LOG.info("{} do cleanup...", userLogin);
try { try {
elsterTransferUserService.deleteUserAndSecret(userLogin, CONFIG_MAP_NAME); elsterTransferUserService.deleteUser(userLogin, CONFIG_MAP_NAME);
elsterTransferUserService.restartDeployment(ETR_NAMESPACE, DEPLOYMENT_NAME); elsterTransferUserService.restartDeployment(ETR_NAMESPACE, DEPLOYMENT_NAME);
return DeleteControl.defaultDelete(); return DeleteControl.defaultDelete();
} catch (Exception e) { } catch (Exception e) {
......
...@@ -49,11 +49,8 @@ public class OzgCloudElsterTransferUserRemoteService { ...@@ -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() Secret secret = new SecretBuilder()
.withNewMetadata() .withNewMetadata()
.withName(SECRET_NAME) .withName(SECRET_NAME)
......
...@@ -91,7 +91,7 @@ public class OzgCloudElsterTransferUserService { ...@@ -91,7 +91,7 @@ public class OzgCloudElsterTransferUserService {
return false; return false;
} }
public void deleteUserAndSecret(String userLogin, String configMapName) { public void deleteUser(String userLogin, String configMapName) {
try { try {
ConfigMap configMap = remoteService.getConfigMap(ETR_NAMESPACE, configMapName); ConfigMap configMap = remoteService.getConfigMap(ETR_NAMESPACE, configMapName);
...@@ -115,17 +115,14 @@ public class OzgCloudElsterTransferUserService { ...@@ -115,17 +115,14 @@ public class OzgCloudElsterTransferUserService {
remoteService.updateConfigMapData(configMap, USERS_KEY, updatedUsersYaml); remoteService.updateConfigMapData(configMap, USERS_KEY, updatedUsersYaml);
LOG.info("User with login '{}' removed from configmap successfully", userLogin); 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) { } catch (Exception e) {
LOG.error("Error while deleting user", e); LOG.error("Error while deleting user", e);
} }
} }
public void createOrUpdateSecret(String namespace, String psw) { public void createSecret(String namespace, String psw) {
remoteService.createOrUpdateSecret(namespace, psw); remoteService.createSecret(namespace, psw);
LOG.info("Secret for user in namespace '{}' created/updated successfully", namespace); LOG.info("Secret for user in namespace '{}' created successfully", namespace);
} }
Map<String, Object> getUsersMapFromConfigMap(ConfigMap configMap) { Map<String, Object> getUsersMapFromConfigMap(ConfigMap configMap) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment