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

OZG-3961 OZG-4082 try with user#userPassword; use created namespace

parent dd73f9e2
Branches
Tags
No related merge requests found
...@@ -120,22 +120,21 @@ class KeycloakUserRemoteService { ...@@ -120,22 +120,21 @@ class KeycloakUserRemoteService {
log.log(Level.INFO, "Create secret for user: " + userSpec.getKeycloakUser().getUsername()); log.log(Level.INFO, "Create secret for user: " + userSpec.getKeycloakUser().getUsername());
var secretName = userSpec.getKeycloakUser().getUsername().toLowerCase() + "-credentials"; var secretName = userSpec.getKeycloakUser().getUsername().toLowerCase() + "-credentials";
var namespace = "keycloak"; var namespace = createdNamespace;
var secret = getSecret(secretName, namespace); var secret = getSecret(secretName, namespace);
if (Objects.isNull(secret.get())) { if (Objects.isNull(secret.get())) {
log.log(Level.INFO, "...secret does not exist, create one..."); log.log(Level.INFO, "...secret does not exist, create one...");
kubernetesClient.secrets().inNamespace(namespace).create(buildSecret(secretName)); var credentialsSecret = buildSecret(secretName, userSpec.getKeycloakUser().getPassword());
kubernetesClient.secrets().inNamespace(namespace).create(credentialsSecret);
log.log(Level.INFO, "...secret created '" + secretName + "' in " + namespace + " for user " + userSpec.getKeycloakUser().getUsername()); log.log(Level.INFO, "...secret created '" + secretName + "' in " + namespace + " for user " + userSpec.getKeycloakUser().getUsername());
log.log(Level.INFO, "...load created secret..."); var newPassword = getPassword(getSecret(secretName, namespace));
var createdSecret = getSecret(secretName, namespace);
var newPassword = getPassword(createdSecret);
log.log(Level.INFO, "return password from created secret:" + newPassword); log.log(Level.INFO, "return password from created secret:" + newPassword);
return newPassword; return newPassword;
} }
var password = getPassword(secret); var password = getPassword(secret);
log.log(Level.INFO, "secret exists, return password:" + password); log.log(Level.INFO, "secret exists, return with password:" + password);
return password; return password;
} }
...@@ -143,7 +142,7 @@ class KeycloakUserRemoteService { ...@@ -143,7 +142,7 @@ class KeycloakUserRemoteService {
return kubernetesClient.secrets().inNamespace(namespace).withName(secretName); return kubernetesClient.secrets().inNamespace(namespace).withName(secretName);
} }
Secret buildSecret(String name) { Secret buildSecret(String name, String password) {
var metadata = new ObjectMeta(); var metadata = new ObjectMeta();
metadata.setName(name); metadata.setName(name);
metadata.setGenerateName(name); metadata.setGenerateName(name);
...@@ -152,7 +151,7 @@ class KeycloakUserRemoteService { ...@@ -152,7 +151,7 @@ class KeycloakUserRemoteService {
return new SecretBuilder() return new SecretBuilder()
.withType("Opaque") .withType("Opaque")
.withMetadata(metadata) .withMetadata(metadata)
.addToStringData(SECRET_PASSWORD_FIELD, "123Test") .addToStringData(SECRET_PASSWORD_FIELD, password)
.addToStringData(SECRET_NAME_FIELD, name) .addToStringData(SECRET_NAME_FIELD, name)
.build(); .build();
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment