UNIX.dog
/
keycloak
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove the BC dependency from keycloak-operator (#13928) 

Closes #13115
This commit is contained in:
David Anderson 2022-08-23 03:21:00 -05:00 committed by GitHub
parent 6d99686220
commit 2070420673
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
operator/pom.xml
View File

@ -114,16 +114,6 @@
<artifactId>keycloak-common</artifactId>
</dependency>
<!-- FIXME: Adding BC since removed from common, this will need to be removed -->
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
</dependency>
<!-- Test -->
<dependency>
<groupId>io.quarkus</groupId>

7
operator/src/test/java/org/keycloak/operator/testsuite/integration/WatchedSecretsTest.java
View File

@ -21,7 +21,6 @@ import io.fabric8.kubernetes.api.model.Secret;
import io.quarkus.logging.Log;
import io.quarkus.test.junit.QuarkusTest;
import org.awaitility.Awaitility;
import org.bouncycastle.util.encoders.Base64;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
import org.keycloak.operator.Constants;
@ -30,7 +29,7 @@ import org.keycloak.operator.crds.v2alpha1.deployment.Keycloak;
import org.keycloak.operator.crds.v2alpha1.deployment.KeycloakStatusCondition;
import org.keycloak.operator.crds.v2alpha1.deployment.ValueOrSecret;
import java.util.Base64;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@ -94,7 +93,9 @@ public class WatchedSecretsTest extends BaseOperatorTest {
var prevPodNames = getPodNamesForCrs(Set.of(kc));
var dbSecret = getDbSecret();
dbSecret.getData().put("username", Base64.toBase64String(username.getBytes()));
dbSecret.getData().put("username",
Base64.getEncoder().encodeToString(username.getBytes()));
k8sclient.secrets().createOrReplace(dbSecret);
Awaitility.await()