libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases 1 Packages Activity Actions

Fix race condition while updating Secrets labels in Operator

Browse source
This commit is contained in:
Václav Muzikář 2022-11-04 18:15:07 +01:00 committed by Václav Muzikář
parent 1de9c201c6
commit 01f1db600d
3 changed files with 22 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
operator/src/main/java/org/keycloak/operator/controllers/WatchedSecretsStore.java
View file

@ -111,13 +111,12 @@ public class WatchedSecretsStore extends OperatorManagedResource {
Log.infof("Adding label to Secret \"%s\"", secret.getMetadata().getName()); Log.infof("Adding label to Secret \"%s\"", secret.getMetadata().getName());
secret = new SecretBuilder(secret) client.secrets().inNamespace(secret.getMetadata().getNamespace()).withName(secret.getMetadata().getName())
.editMetadata() .edit(s -> new SecretBuilder(s)
.addToLabels(Constants.KEYCLOAK_COMPONENT_LABEL, WATCHED_SECRETS_LABEL_VALUE) .editMetadata()
.endMetadata() .addToLabels(Constants.KEYCLOAK_COMPONENT_LABEL, WATCHED_SECRETS_LABEL_VALUE)
.build(); .endMetadata()
.build());
client.secrets().inNamespace(secret.getMetadata().getNamespace()).withName(secret.getMetadata().getName()).patch(secret);
} }
} }
} }
@ -194,8 +193,13 @@ public class WatchedSecretsStore extends OperatorManagedResource {
} }
private static void cleanObsoleteLabelFromSecret(KubernetesClient client, Secret secret) { private static void cleanObsoleteLabelFromSecret(KubernetesClient client, Secret secret) {
secret.getMetadata().getLabels().remove(Constants.KEYCLOAK_COMPONENT_LABEL); client.secrets().inNamespace(secret.getMetadata().getNamespace()).withName(secret.getMetadata().getName())
client.secrets().inNamespace(secret.getMetadata().getNamespace()).withName(secret.getMetadata().getName()).patch(secret); .edit(s -> new SecretBuilder(s)
.editMetadata()
.removeFromLabels(Constants.KEYCLOAK_COMPONENT_LABEL)
.endMetadata()
.build()
);
} }
public static EventSource getWatchedSecretsEventSource(KubernetesClient client, String namespace) { public static EventSource getWatchedSecretsEventSource(KubernetesClient client, String namespace) {

8
operator/src/test/java/org/keycloak/operator/testsuite/integration/BaseOperatorTest.java
View file

@ -35,6 +35,7 @@ import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.TestInfo;
import org.keycloak.operator.Constants; import org.keycloak.operator.Constants;
import org.keycloak.operator.crds.v2alpha1.deployment.Keycloak; import org.keycloak.operator.crds.v2alpha1.deployment.Keycloak;
@ -103,8 +104,11 @@ public abstract class BaseOperatorTest {
} }
@BeforeEach @BeforeEach
public void beforeEach() { public void beforeEach(TestInfo testInfo) {
Log.info(((operatorDeployment == OperatorDeployment.remote) ? "Remote " : "Local ") + "Run Test :" + namespace); String testClassName = testInfo.getTestClass().map(c -> c.getSimpleName() + ".").orElse("");
Log.info("\n------- STARTING: " + testClassName + testInfo.getDisplayName() + "\n"
+ "------- Namespace: " + namespace + "\n"
+ "------- Mode: " + ((operatorDeployment == OperatorDeployment.remote) ? "remote" : "local"));
} }
private static void createK8sClient() { private static void createK8sClient() {

5
operator/src/test/java/org/keycloak/operator/testsuite/integration/RealmImportTest.java
View file

@ -24,6 +24,7 @@ import io.quarkus.test.junit.QuarkusTest;
import org.awaitility.Awaitility; import org.awaitility.Awaitility;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInfo;
import org.junit.jupiter.api.condition.EnabledIfSystemProperty; import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
import org.keycloak.operator.testsuite.utils.CRAssert; import org.keycloak.operator.testsuite.utils.CRAssert;
import org.keycloak.operator.controllers.KeycloakService; import org.keycloak.operator.controllers.KeycloakService;
@ -49,8 +50,8 @@ public class RealmImportTest extends BaseOperatorTest {
@Override @Override
@BeforeEach @BeforeEach
public void beforeEach() { public void beforeEach(TestInfo testInfo) {
super.beforeEach(); super.beforeEach(testInfo);
// Recreating the database and the realm import CR to keep this test isolated // Recreating the database and the realm import CR to keep this test isolated
k8sclient.load(getClass().getResourceAsStream("/example-realm.yaml")).inNamespace(namespace).delete(); k8sclient.load(getClass().getResourceAsStream("/example-realm.yaml")).inNamespace(namespace).delete();
k8sclient.load(getClass().getResourceAsStream("/incorrect-realm.yaml")).inNamespace(namespace).delete(); k8sclient.load(getClass().getResourceAsStream("/incorrect-realm.yaml")).inNamespace(namespace).delete();