parent
2cd82b9861
commit
e44464d3b8
3 changed files with 20 additions and 74 deletions
|
@ -21,8 +21,12 @@
|
||||||
See https://github.com/quarkusio/quarkus/blob/<versionTag>/bom/application/pom.xml
|
See https://github.com/quarkusio/quarkus/blob/<versionTag>/bom/application/pom.xml
|
||||||
for reference
|
for reference
|
||||||
-->
|
-->
|
||||||
<kubernetes-client.version>6.5.1</kubernetes-client.version>
|
|
||||||
<wildfly.common.version>1.5.4.Final-format-001</wildfly.common.version>
|
<wildfly.common.version>1.5.4.Final-format-001</wildfly.common.version>
|
||||||
|
<!--
|
||||||
|
FIXME: This is currently NOT aligned with Quarkus and QOSDK. We need to use a newer Fabric8 version to resolve issues in Vert.x HTTP Client.
|
||||||
|
Tracked by: https://github.com/keycloak/keycloak/issues/20130
|
||||||
|
-->
|
||||||
|
<kubernetes-client.version>6.6.0</kubernetes-client.version>
|
||||||
|
|
||||||
<compiler-plugin.version>3.8.1</compiler-plugin.version>
|
<compiler-plugin.version>3.8.1</compiler-plugin.version>
|
||||||
<maven.compiler.parameters>true</maven.compiler.parameters>
|
<maven.compiler.parameters>true</maven.compiler.parameters>
|
||||||
|
@ -37,14 +41,22 @@
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<dependencyManagement>
|
<dependencyManagement>
|
||||||
|
<!-- FIXME: Fabric8 dependency override needs to be removed as part of https://github.com/keycloak/keycloak/issues/20130 -->
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>io.quarkiverse.operatorsdk</groupId>
|
<groupId>io.fabric8</groupId>
|
||||||
<artifactId>quarkus-operator-sdk-bom</artifactId>
|
<artifactId>kubernetes-client-bom</artifactId>
|
||||||
<version>${quarkus.operator.sdk.version}</version>
|
<version>${kubernetes-client.version}</version>
|
||||||
<type>pom</type>
|
<type>pom</type>
|
||||||
<scope>import</scope>
|
<scope>import</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>io.quarkiverse.operatorsdk</groupId>
|
||||||
|
<artifactId>quarkus-operator-sdk-bom</artifactId>
|
||||||
|
<version>${quarkus.operator.sdk.version}</version>
|
||||||
|
<type>pom</type>
|
||||||
|
<scope>import</scope>
|
||||||
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
</dependencyManagement>
|
</dependencyManagement>
|
||||||
|
|
||||||
|
@ -95,12 +107,6 @@
|
||||||
<groupId>io.quarkus</groupId>
|
<groupId>io.quarkus</groupId>
|
||||||
<artifactId>quarkus-container-image-docker</artifactId>
|
<artifactId>quarkus-container-image-docker</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
<!-- FIXME: We should not need OKHttp Client, see HttpClientFactory class -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>io.fabric8</groupId>
|
|
||||||
<artifactId>kubernetes-httpclient-okhttp</artifactId>
|
|
||||||
<version>${kubernetes-client.version}</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- Keycloak -->
|
<!-- Keycloak -->
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|
|
@ -1,42 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright 2023 Red Hat, Inc. and/or its affiliates
|
|
||||||
* and other contributors as indicated by the @author tags.
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package org.keycloak.kubernetes.client;
|
|
||||||
|
|
||||||
import io.fabric8.kubernetes.client.okhttp.OkHttpClientFactory;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* FIXME: This Factory is meant to force Fabric8 to use OKHttp Client. We should not normally do that as it is not aligned with Quarkus.
|
|
||||||
* Remove once the following are resolved:
|
|
||||||
* https://github.com/fabric8io/kubernetes-client/issues/5036
|
|
||||||
* https://github.com/fabric8io/kubernetes-client/issues/5033 (only needed by tests)
|
|
||||||
*
|
|
||||||
* Tracked by: https://github.com/keycloak/keycloak/issues/19573
|
|
||||||
*
|
|
||||||
* @author Vaclav Muzikar <vmuzikar@redhat.com>
|
|
||||||
*/
|
|
||||||
public class HttpClientFactory extends OkHttpClientFactory {
|
|
||||||
@Override
|
|
||||||
public boolean isDefault() {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int priority() {
|
|
||||||
return 10000;
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,18 +0,0 @@
|
||||||
#
|
|
||||||
# Copyright 2023 Red Hat, Inc. and/or its affiliates
|
|
||||||
# and other contributors as indicated by the @author tags.
|
|
||||||
#
|
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
# you may not use this file except in compliance with the License.
|
|
||||||
# You may obtain a copy of the License at
|
|
||||||
#
|
|
||||||
# http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
#
|
|
||||||
# Unless required by applicable law or agreed to in writing, software
|
|
||||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
# See the License for the specific language governing permissions and
|
|
||||||
# limitations under the License.
|
|
||||||
#
|
|
||||||
|
|
||||||
org.keycloak.kubernetes.client.HttpClientFactory
|
|
Loading…
Reference in a new issue