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

Change base image and bump dependencies

Browse source
This commit is contained in:
andreaTP 2022-03-28 11:59:17 +01:00 committed by Bruno Oliveira da Silva
parent 034775f311
commit 298ce1888b
5 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
operator/pom.xml
View file

@ -32,11 +32,10 @@
<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>3.0.4</quarkus.operator.sdk.version> <quarkus.operator.sdk.version>3.0.6</quarkus.operator.sdk.version>
<quarkus.version>2.7.3.Final</quarkus.version> <quarkus.version>2.7.5.Final</quarkus.version>
<quarkus.container-image.group>keycloak</quarkus.container-image.group> <quarkus.container-image.group>keycloak</quarkus.container-image.group>
<quarkus.jib.base-jvm-image>eclipse-temurin:11</quarkus.jib.base-jvm-image> <quarkus.jib.base-jvm-image>registry.access.redhat.com/ubi8/openjdk-11-runtime</quarkus.jib.base-jvm-image>
<quarkus.kubernetes.image-pull-policy>Never</quarkus.kubernetes.image-pull-policy>
<maven-failsafe-plugin.version>2.22.0</maven-failsafe-plugin.version> <maven-failsafe-plugin.version>2.22.0</maven-failsafe-plugin.version>
</properties> </properties>

3
operator/src/main/java/org/keycloak/operator/v2alpha1/KeycloakController.java
View file

@ -48,8 +48,7 @@ import java.util.concurrent.TimeUnit;
import static io.javaoperatorsdk.operator.api.reconciler.Constants.NO_FINALIZER; import static io.javaoperatorsdk.operator.api.reconciler.Constants.NO_FINALIZER;
import static io.javaoperatorsdk.operator.api.reconciler.Constants.WATCH_CURRENT_NAMESPACE; import static io.javaoperatorsdk.operator.api.reconciler.Constants.WATCH_CURRENT_NAMESPACE;
// TODO: remove "generationAwareEventProcessing = false" when the race condition is fixed @ControllerConfiguration(namespaces = WATCH_CURRENT_NAMESPACE, finalizerName = NO_FINALIZER)
@ControllerConfiguration(namespaces = WATCH_CURRENT_NAMESPACE, finalizerName = NO_FINALIZER, generationAwareEventProcessing = false)
public class KeycloakController implements Reconciler<Keycloak>, EventSourceInitializer<Keycloak>, ErrorStatusHandler<Keycloak> { public class KeycloakController implements Reconciler<Keycloak>, EventSourceInitializer<Keycloak>, ErrorStatusHandler<Keycloak> {
@Inject @Inject

3
operator/src/main/java/org/keycloak/operator/v2alpha1/KeycloakRealmImportController.java
View file

@ -48,8 +48,7 @@ import java.util.concurrent.TimeUnit;
import static io.javaoperatorsdk.operator.api.reconciler.Constants.NO_FINALIZER; import static io.javaoperatorsdk.operator.api.reconciler.Constants.NO_FINALIZER;
import static io.javaoperatorsdk.operator.api.reconciler.Constants.WATCH_CURRENT_NAMESPACE; import static io.javaoperatorsdk.operator.api.reconciler.Constants.WATCH_CURRENT_NAMESPACE;
// TODO: remove "generationAwareEventProcessing = false" when the race condition is fixed @ControllerConfiguration(namespaces = WATCH_CURRENT_NAMESPACE, finalizerName = NO_FINALIZER)
@ControllerConfiguration(namespaces = WATCH_CURRENT_NAMESPACE, finalizerName = NO_FINALIZER, generationAwareEventProcessing = false)
public class KeycloakRealmImportController implements Reconciler<KeycloakRealmImport>, EventSourceInitializer<KeycloakRealmImport>, ErrorStatusHandler<KeycloakRealmImport> { public class KeycloakRealmImportController implements Reconciler<KeycloakRealmImport>, EventSourceInitializer<KeycloakRealmImport>, ErrorStatusHandler<KeycloakRealmImport> {
@Inject @Inject

4
operator/src/main/java/org/keycloak/operator/v2alpha1/WatchedSecretsStore.java
View file

@ -118,7 +118,7 @@ public class WatchedSecretsStore extends OperatorManagedResource {
.endMetadata() .endMetadata()
.build(); .build();
client.secrets().patch(secret); client.secrets().inNamespace(secret.getMetadata().getNamespace()).withName(secret.getMetadata().getName()).patch(secret);
} }
} }
} }
@ -200,7 +200,7 @@ 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); secret.getMetadata().getLabels().remove(Constants.KEYCLOAK_COMPONENT_LABEL);
client.secrets().patch(secret); client.secrets().inNamespace(secret.getMetadata().getNamespace()).withName(secret.getMetadata().getName()).patch(secret);
} }
public static EventSource getWatchedSecretsEventSource(KubernetesClient client, String namespace) { public static EventSource getWatchedSecretsEventSource(KubernetesClient client, String namespace) {

3
operator/src/main/java/org/keycloak/operator/v2alpha1/crds/KeycloakSpec.java
View file

@ -16,6 +16,7 @@
*/ */
package org.keycloak.operator.v2alpha1.crds; package org.keycloak.operator.v2alpha1.crds;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonPropertyDescription; import com.fasterxml.jackson.annotation.JsonPropertyDescription;
import org.keycloak.operator.Constants; import org.keycloak.operator.Constants;
@ -53,6 +54,7 @@ public class KeycloakSpec {
this.hostname = hostname; this.hostname = hostname;
} }
@JsonIgnore
public boolean isHostnameDisabled() { public boolean isHostnameDisabled() {
return this.hostname.equals(Constants.INSECURE_DISABLE); return this.hostname.equals(Constants.INSECURE_DISABLE);
} }
@ -73,6 +75,7 @@ public class KeycloakSpec {
this.tlsSecret = tlsSecret; this.tlsSecret = tlsSecret;
} }
@JsonIgnore
public boolean isHttp() { public boolean isHttp() {
return this.tlsSecret.equals(Constants.INSECURE_DISABLE); return this.tlsSecret.equals(Constants.INSECURE_DISABLE);
} }