From f3d08cc444b8267b1b5c975fc261877a4861df96 Mon Sep 17 00:00:00 2001 From: Chris Cooper Date: Thu, 6 Aug 2020 09:35:41 -0400 Subject: [PATCH] #2389: Use https value with crud mode in KubernetesServer When using the KubernetesServer JUnit rule in crud mode the KubernetesMockServer is using a hardcoded value of true for https instead of using the value of https provided to the JUnit rule. --- CHANGELOG.md | 1 + .../fabric8/kubernetes/client/server/mock/KubernetesServer.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bbd9422fa5..4a17e7d0e7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ #### Bugs * Fix #2373: Unable to create a Template on OCP3 * Fix #2316: Cannot load resource from stream without apiVersion +* Fix #2389: KubernetesServer does not use value from https in crud mode #### Improvements * Fix #2331: Fixed documentation for namespaced informer for all custom types implementing `Namespaced` interface diff --git a/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/KubernetesServer.java b/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/KubernetesServer.java index a21d2d58d0..59ea5295ed 100644 --- a/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/KubernetesServer.java +++ b/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/KubernetesServer.java @@ -53,7 +53,7 @@ public KubernetesServer(boolean https, boolean crudMode) { public void before() { mock = crudMode - ? new KubernetesMockServer(new Context(), new MockWebServer(), new HashMap>(), new KubernetesCrudDispatcher(), true) + ? new KubernetesMockServer(new Context(), new MockWebServer(), new HashMap>(), new KubernetesCrudDispatcher(), https) : new KubernetesMockServer(https); mock.init(); client = mock.createClient();