diff --git a/operator/src/main/java/org/keycloak/operator/controllers/KeycloakDistConfigurator.java b/operator/src/main/java/org/keycloak/operator/controllers/KeycloakDistConfigurator.java index 84c1cfa5e01d..09f3530c955e 100644 --- a/operator/src/main/java/org/keycloak/operator/controllers/KeycloakDistConfigurator.java +++ b/operator/src/main/java/org/keycloak/operator/controllers/KeycloakDistConfigurator.java @@ -112,9 +112,7 @@ void configureHostname() { optionMapper(keycloakCR -> keycloakCR.getSpec().getHostnameSpec()) .mapOption("hostname", HostnameSpec::getHostname) .mapOption("hostname-admin", HostnameSpec::getAdmin) - .mapOption("hostname-admin-url", HostnameSpec::getAdminUrl) .mapOption("hostname-strict", HostnameSpec::isStrict) - .mapOption("hostname-strict-backchannel", HostnameSpec::isStrictBackchannel) .mapOption("hostname-backchannel-dynamic", HostnameSpec::isBackchannelDynamic); } diff --git a/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/spec/HostnameSpec.java b/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/spec/HostnameSpec.java index 97be1e064b3a..31eb9f150e40 100644 --- a/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/spec/HostnameSpec.java +++ b/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/spec/HostnameSpec.java @@ -27,21 +27,15 @@ @Buildable(editableEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder") public class HostnameSpec implements Serializable { - @JsonPropertyDescription("Hostname for the Keycloak server. Applicable for Hostname v1 and v2.") + @JsonPropertyDescription("Hostname for the Keycloak server. Applicable for Hostname v2.") private String hostname; - @JsonPropertyDescription("The hostname for accessing the administration console. Applicable for Hostname v1 and v2.") + @JsonPropertyDescription("The hostname for accessing the administration console. Applicable for Hostname v2.") private String admin; - @JsonPropertyDescription("DEPRECATED. Sets the base URL for accessing the administration console, including scheme, host, port and path. Applicable for Hostname v1.") - private String adminUrl; - - @JsonPropertyDescription("Disables dynamically resolving the hostname from request headers. Applicable for Hostname v1 and v2.") + @JsonPropertyDescription("Disables dynamically resolving the hostname from request headers. Applicable for Hostname v2.") private Boolean strict; - @JsonPropertyDescription("DEPRECATED. By default backchannel URLs are dynamically resolved from request headers to allow internal and external applications. Applicable for Hostname v1.") - private Boolean strictBackchannel; - @JsonPropertyDescription("Enables dynamic resolving of backchannel URLs, including hostname, scheme, port and context path. Set to true if your application accesses Keycloak via a private network. Applicable for Hostname v2.") private Boolean backchannelDynamic; @@ -61,14 +55,6 @@ public void setAdmin(String admin) { this.admin = admin; } - public String getAdminUrl() { - return adminUrl; - } - - public void setAdminUrl(String adminUrl) { - this.adminUrl = adminUrl; - } - public Boolean isStrict() { return strict; } @@ -77,14 +63,6 @@ public void setStrict(Boolean strict) { this.strict = strict; } - public Boolean isStrictBackchannel() { - return strictBackchannel; - } - - public void setStrictBackchannel(Boolean strictBackchannel) { - this.strictBackchannel = strictBackchannel; - } - public Boolean isBackchannelDynamic() { return backchannelDynamic; } diff --git a/operator/src/test/java/org/keycloak/operator/testsuite/integration/KeycloakIngressTest.java b/operator/src/test/java/org/keycloak/operator/testsuite/integration/KeycloakIngressTest.java index 50908746bf07..44d7d6f723bf 100644 --- a/operator/src/test/java/org/keycloak/operator/testsuite/integration/KeycloakIngressTest.java +++ b/operator/src/test/java/org/keycloak/operator/testsuite/integration/KeycloakIngressTest.java @@ -52,8 +52,7 @@ public void testIngressOnHTTP() { kc.getSpec().getHttpSpec().setTlsSecret(null); kc.getSpec().getHttpSpec().setHttpEnabled(true); var hostnameSpecBuilder = new HostnameSpecBuilder() - .withStrict(false) - .withStrictBackchannel(false); + .withStrict(false); if (isOpenShift) { kc.getSpec().setIngressSpec(new IngressSpecBuilder().withIngressClassName(KeycloakController.OPENSHIFT_DEFAULT).build()); } @@ -78,8 +77,7 @@ public void testIngressOnHTTP() { public void testIngressOnHTTPSAndProxySettings() { var kc = getTestKeycloakDeployment(false); var hostnameSpecBuilder = new HostnameSpecBuilder() - .withStrict(false) - .withStrictBackchannel(false); + .withStrict(false); if (isOpenShift) { kc.getSpec().setIngressSpec(new IngressSpecBuilder().withIngressClassName(KeycloakController.OPENSHIFT_DEFAULT).build()); } diff --git a/operator/src/test/java/org/keycloak/operator/testsuite/unit/CRSerializationTest.java b/operator/src/test/java/org/keycloak/operator/testsuite/unit/CRSerializationTest.java index ae9980e4175b..19dfdcc2981f 100644 --- a/operator/src/test/java/org/keycloak/operator/testsuite/unit/CRSerializationTest.java +++ b/operator/src/test/java/org/keycloak/operator/testsuite/unit/CRSerializationTest.java @@ -123,9 +123,7 @@ public void hostnameSpecification() { assertThat(hostnameSpec.getHostname(), is("my-hostname")); assertThat(hostnameSpec.getAdmin(), is("my-admin-hostname")); - assertThat(hostnameSpec.getAdminUrl(), is("https://www.my-admin-hostname.org:8448/something")); assertThat(hostnameSpec.isStrict(), is(true)); - assertThat(hostnameSpec.isStrictBackchannel(), is(true)); keycloak = Serialization.unmarshal(this.getClass().getResourceAsStream("/empty-podtemplate-keycloak.yml"), Keycloak.class); @@ -133,9 +131,7 @@ public void hostnameSpecification() { assertThat(hostnameSpec, notNullValue()); assertThat(hostnameSpec.getHostname(), is("example.com")); assertThat(hostnameSpec.getAdmin(), nullValue()); - assertThat(hostnameSpec.getAdminUrl(), nullValue()); assertThat(hostnameSpec.isStrict(), nullValue()); - assertThat(hostnameSpec.isStrictBackchannel(), nullValue()); } @Test diff --git a/operator/src/test/java/org/keycloak/operator/testsuite/unit/KeycloakDistConfiguratorTest.java b/operator/src/test/java/org/keycloak/operator/testsuite/unit/KeycloakDistConfiguratorTest.java index 891c816afdd6..8bb95e221629 100644 --- a/operator/src/test/java/org/keycloak/operator/testsuite/unit/KeycloakDistConfiguratorTest.java +++ b/operator/src/test/java/org/keycloak/operator/testsuite/unit/KeycloakDistConfiguratorTest.java @@ -113,9 +113,7 @@ public void db() { public void hostname() { final Map expectedValues = Map.of( "hostname", "my-hostname", - "hostname-admin-url", "https://www.my-admin-hostname.org:8448/something", "hostname-strict", "true", - "hostname-strict-backchannel", "true", "hostname-backchannel-dynamic", "true", "hostname-admin", "my-admin-hostname" ); diff --git a/operator/src/test/resources/test-serialization-keycloak-cr.yml b/operator/src/test/resources/test-serialization-keycloak-cr.yml index 07bd370a4197..17dc42674e9e 100644 --- a/operator/src/test/resources/test-serialization-keycloak-cr.yml +++ b/operator/src/test/resources/test-serialization-keycloak-cr.yml @@ -40,9 +40,7 @@ spec: hostname: hostname: my-hostname admin: my-admin-hostname - adminUrl: https://www.my-admin-hostname.org:8448/something strict: true - strictBackchannel: true backchannelDynamic: true cache: configMapFile: