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

Upgrade to Quarkus 3.2.0.Final and QOSDK 6.2.0

Browse source 
Closes #21272
This commit is contained in:
Václav Muzikář 2023-06-30 14:05:02 +02:00 committed by Pedro Igor
parent 383d5f20d0
commit ad988ca914
5 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
operator/pom.xml
View file

@ -31,8 +31,8 @@
<maven.compiler.target>11</maven.compiler.target> <maven.compiler.target>11</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<quarkus.operator.sdk.version>6.1.1</quarkus.operator.sdk.version> <quarkus.operator.sdk.version>6.2.0</quarkus.operator.sdk.version>
<quarkus.operator.build.version>3.1.1.Final</quarkus.operator.build.version> <quarkus.operator.build.version>3.2.0.Final</quarkus.operator.build.version>
<quarkus.container-image.group>keycloak</quarkus.container-image.group> <quarkus.container-image.group>keycloak</quarkus.container-image.group>
</properties> </properties>

2
operator/src/main/java/org/keycloak/operator/controllers/KeycloakController.java
View file

@ -57,7 +57,7 @@ public class KeycloakController implements Reconciler<Keycloak>, EventSourceInit
@Override @Override
public Map<String, EventSource> prepareEventSources(EventSourceContext<Keycloak> context) { public Map<String, EventSource> prepareEventSources(EventSourceContext<Keycloak> context) {
String namespace = context.getControllerConfiguration().getConfigurationService().getClientConfiguration().getNamespace(); String namespace = context.getControllerConfiguration().getConfigurationService().getKubernetesClient().getNamespace();
InformerConfiguration<StatefulSet> statefulSetIC = InformerConfiguration InformerConfiguration<StatefulSet> statefulSetIC = InformerConfiguration
.from(StatefulSet.class) .from(StatefulSet.class)

2
operator/src/main/java/org/keycloak/operator/controllers/KeycloakRealmImportController.java
View file

@ -58,7 +58,7 @@ public class KeycloakRealmImportController implements Reconciler<KeycloakRealmIm
InformerConfiguration<Job> jobIC = InformerConfiguration InformerConfiguration<Job> jobIC = InformerConfiguration
.from(Job.class) .from(Job.class)
.withLabelSelector(Constants.DEFAULT_LABELS_AS_STRING) .withLabelSelector(Constants.DEFAULT_LABELS_AS_STRING)
.withNamespaces(context.getControllerConfiguration().getConfigurationService().getClientConfiguration().getNamespace()) .withNamespaces(context.getControllerConfiguration().getConfigurationService().getKubernetesClient().getNamespace())
.withSecondaryToPrimaryMapper(Mappers.fromOwnerReference()) .withSecondaryToPrimaryMapper(Mappers.fromOwnerReference())
.withOnUpdateFilter(new MetadataAwareOnUpdateFilter<>()) .withOnUpdateFilter(new MetadataAwareOnUpdateFilter<>())
.build(); .build();

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

@ -26,7 +26,6 @@ import io.fabric8.kubernetes.client.KubernetesClient;
import io.fabric8.kubernetes.client.KubernetesClientBuilder; import io.fabric8.kubernetes.client.KubernetesClientBuilder;
import io.fabric8.kubernetes.client.NamespacedKubernetesClient; import io.fabric8.kubernetes.client.NamespacedKubernetesClient;
import io.javaoperatorsdk.operator.Operator; import io.javaoperatorsdk.operator.Operator;
import io.javaoperatorsdk.operator.api.config.ConfigurationServiceProvider;
import io.javaoperatorsdk.operator.api.reconciler.Reconciler; import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
import io.quarkiverse.operatorsdk.runtime.QuarkusConfigurationService; import io.quarkiverse.operatorsdk.runtime.QuarkusConfigurationService;
import io.quarkus.logging.Log; import io.quarkus.logging.Log;
@ -154,9 +153,7 @@ public abstract class BaseOperatorTest {
} }
private static void createOperator() { private static void createOperator() {
configuration.getClientConfiguration().setNamespace(namespace); operator = new Operator(overrider -> overrider.withKubernetesClient(k8sclient));
ConfigurationServiceProvider.reset();
operator = new Operator(k8sclient, configuration);
} }
private static void createNamespace() { private static void createNamespace() {

4
pom.xml
View file

@ -43,8 +43,8 @@
<jboss.snapshots.repo.id>jboss-snapshots-repository</jboss.snapshots.repo.id> <jboss.snapshots.repo.id>jboss-snapshots-repository</jboss.snapshots.repo.id>
<jboss.snapshots.repo.url>https://s01.oss.sonatype.org/content/repositories/snapshots/</jboss.snapshots.repo.url> <jboss.snapshots.repo.url>https://s01.oss.sonatype.org/content/repositories/snapshots/</jboss.snapshots.repo.url>
<quarkus.version>3.1.2.Final</quarkus.version> <quarkus.version>3.2.0.Final</quarkus.version>
<quarkus.build.version>3.1.2.Final</quarkus.build.version> <quarkus.build.version>3.2.0.Final</quarkus.build.version>
<project.build-time>${timestamp}</project.build-time> <project.build-time>${timestamp}</project.build-time>