libre.sh/keycloak-scim
2
0
Fork 0
Code Issues 14 Pull requests Releases Packages Activity Actions 6

fix: making the truststore name field optional (#28013)

Browse source 
closes: #28012

Signed-off-by: Steve Hawkins <shawkins@redhat.com>
This commit is contained in:
Steven Hawkins 2024-03-19 14:02:29 -04:00 committed by GitHub
parent 83a3500ccf
commit 05056330dc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/spec/Truststore.java
View file

@ -21,12 +21,13 @@ import io.fabric8.generator.annotation.Required;
import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.Buildable;
import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonPropertyDescription;
@JsonInclude(JsonInclude.Include.NON_NULL) @JsonInclude(JsonInclude.Include.NON_NULL)
@Buildable(editableEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder") @Buildable(editableEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder")
public class Truststore { public class Truststore {
@Required @JsonPropertyDescription("Not used. To be removed in later versions.")
private String name; private String name;
@Required @Required
private TruststoreSource secret; private TruststoreSource secret;

4
operator/src/test/java/org/keycloak/operator/testsuite/integration/KeycloakTruststoresTests.java
View file

@ -39,7 +39,7 @@ public class KeycloakTruststoresTests extends BaseOperatorTest {
public void testTruststoreMissing() { public void testTruststoreMissing() {
var kc = getTestKeycloakDeployment(true); var kc = getTestKeycloakDeployment(true);
var deploymentName = kc.getMetadata().getName(); var deploymentName = kc.getMetadata().getName();
kc.getSpec().getTruststores().put("xyz", new TruststoreBuilder().withName("xyz").withNewSecret().withName("xyz").endSecret().build()); kc.getSpec().getTruststores().put("xyz", new TruststoreBuilder().withNewSecret().withName("xyz").endSecret().build());
deployKeycloak(k8sclient, kc, false); deployKeycloak(k8sclient, kc, false);
Resource<StatefulSet> stsResource = k8sclient.resources(StatefulSet.class).withName(deploymentName); Resource<StatefulSet> stsResource = k8sclient.resources(StatefulSet.class).withName(deploymentName);
@ -58,7 +58,7 @@ public class KeycloakTruststoresTests extends BaseOperatorTest {
var deploymentName = kc.getMetadata().getName(); var deploymentName = kc.getMetadata().getName();
K8sUtils.set(k8sclient, getResourceFromFile("example-truststore-secret.yaml", Secret.class)); K8sUtils.set(k8sclient, getResourceFromFile("example-truststore-secret.yaml", Secret.class));
kc.getSpec().getTruststores().put("example", new TruststoreBuilder().withName("example").withNewSecret().withName("example-truststore-secret").endSecret().build()); kc.getSpec().getTruststores().put("example", new TruststoreBuilder().withNewSecret().withName("example-truststore-secret").endSecret().build());
deployKeycloak(k8sclient, kc, true); deployKeycloak(k8sclient, kc, true);
Resource<StatefulSet> stsResource = k8sclient.resources(StatefulSet.class).withName(deploymentName); Resource<StatefulSet> stsResource = k8sclient.resources(StatefulSet.class).withName(deploymentName);

4
operator/src/test/resources/test-serialization-keycloak-cr.yml
View file

@ -65,6 +65,10 @@ spec:
memory: "1500M" memory: "1500M"
proxy: proxy:
headers: forwarded headers: forwarded
truststores:
x:
secret:
name: my-secret
unsupported: unsupported:
podTemplate: podTemplate:
metadata: metadata: