Skip to content

Commit

Permalink
chore(openshift): use fabric8-client 5.4.1
Browse files Browse the repository at this point in the history
  • Loading branch information
andrewazores committed Aug 5, 2021
1 parent dc5b7e7 commit 3873b2b
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
2 changes: 1 addition & 1 deletion pom.xml
Expand Up @@ -67,7 +67,7 @@
<org.apache.commons.validator.version>1.7</org.apache.commons.validator.version>
<org.apache.commons.io.version>2.8.0</org.apache.commons.io.version>
<org.apache.httpcomponents.version>4.5.13</org.apache.httpcomponents.version>
<io.fabric8.client.version>5.6.0</io.fabric8.client.version>
<io.fabric8.client.version>5.4.1</io.fabric8.client.version>
<io.vertx.web.version>3.9.7</io.vertx.web.version>
<org.slf4j.version>1.7.30</org.slf4j.version>
<com.google.code.gson.version>2.8.6</com.google.code.gson.version>
Expand Down
8 changes: 8 additions & 0 deletions src/test/java/io/cryostat/net/OpenShiftAuthManagerTest.java
Expand Up @@ -59,6 +59,7 @@
import com.google.gson.Gson;
import io.fabric8.kubernetes.api.model.authorization.v1.SelfSubjectAccessReview;
import io.fabric8.kubernetes.api.model.authorization.v1.SelfSubjectAccessReviewBuilder;
import io.fabric8.kubernetes.client.Config;
import io.fabric8.openshift.client.OpenShiftClient;
import io.fabric8.openshift.client.server.mock.EnableOpenShiftMockClient;
import io.fabric8.openshift.client.server.mock.OpenShiftMockServer;
Expand All @@ -68,6 +69,7 @@
import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
Expand Down Expand Up @@ -96,6 +98,12 @@ class OpenShiftAuthManagerTest {
TokenProvider tokenProvider;
Gson gson = MainModule.provideGson(logger);

@BeforeAll
static void disableKubeConfig() {
// FIXME Disable reading ~/.kube/config. Remove once updated to 5.5.0 or newer.
System.setProperty(Config.KUBERNETES_AUTH_TRYKUBECONFIG_SYSTEM_PROPERTY, "false");
}

@BeforeEach
void setup() {
client = Mockito.spy(client);
Expand Down

0 comments on commit 3873b2b

Please sign in to comment.