From fc23d156ffad3b664e59a994ca723626b92dd775 Mon Sep 17 00:00:00 2001 From: Ladislav Thon Date: Fri, 21 Aug 2020 09:35:47 +0200 Subject: [PATCH] update Fabric8 Kubernetes Client to 4.10.2 This is to support latest Kubernetes and OpenShift releases, where the old Fabric8 Kubernetes Client doesn't work correctly. This commit also updates the Snowdrop Istio Java API to a version that also uses Fabric8 Kubernetes Client 4.10.2. There's currently no Snowdrop Istio Java API release that uses Fabric8 Kubernetes Client 4.10.3, which is why this commit only updates to 4.10.2. --- .../fabric8/impl/Fabric8Extension.java | 2 +- .../impl/label/Fabric8LabelProvider.java | 2 +- .../SecretsAndServiceAccountVisitor.java | 16 +-- .../src/test/java/HelloWorldIT.java | 2 +- .../kubernetes/HelloWorldResourcesIT.java | 8 +- .../src/test/java/HelloWorldIT.java | 2 +- .../cube/istio/impl/IstioClientCreator.java | 2 +- .../istio/impl/IstioResourcesApplier.java | 2 +- .../istio/impl/IstioResourcesApplierTest.java | 2 +- .../cube/kubernetes/api/Configuration.java | 4 +- .../cube/kubernetes/api/FeedbackProvider.java | 2 +- .../cube/kubernetes/api/NamespaceService.java | 2 +- .../kubernetes/api/ResourceInstaller.java | 2 +- .../kubernetes/impl/ClientConfigBuilder.java | 4 +- .../cube/kubernetes/impl/ClientCreator.java | 6 +- .../kubernetes/impl/DefaultConfiguration.java | 6 +- .../kubernetes/impl/KubernetesAssistant.java | 28 +++--- .../impl/KubernetesAssistantCreator.java | 2 +- .../kubernetes/impl/KubernetesExtension.java | 2 +- .../cube/kubernetes/impl/SessionManager.java | 26 ++--- .../impl/SessionManagerLifecycle.java | 2 +- .../cube/kubernetes/impl/WatchListener.java | 16 +-- .../AbstractKubernetesResourceProvider.java | 4 +- .../KuberntesServiceUrlResourceProvider.java | 18 ++-- .../external/ClientResourceProvider.java | 8 +- .../DeploymentListResourceProvider.java | 2 +- .../external/DeploymentResourceProvider.java | 2 +- .../external/PodListResourceProvider.java | 2 +- .../external/PodResourceProvider.java | 4 +- .../ReplicaSetListResourceProvider.java | 4 +- .../external/ReplicaSetResourceProvider.java | 4 +- ...icationControllerListResourceProvider.java | 2 +- ...ReplicationControllerResourceProvider.java | 4 +- .../external/ServiceListResourceProvider.java | 2 +- .../external/ServiceResourceProvider.java | 4 +- .../internal/ClientResourceProvider.java | 2 +- .../DeploymentListResourceProvider.java | 2 +- .../internal/DeploymentResourceProvider.java | 4 +- .../internal/PodListResourceProvider.java | 2 +- .../internal/PodResourceProvider.java | 6 +- .../ReplicaSetListResourceProvider.java | 2 +- .../internal/ReplicaSetResourceProvider.java | 4 +- ...icationControllerListResourceProvider.java | 2 +- ...ReplicationControllerResourceProvider.java | 6 +- .../internal/ServiceListResourceProvider.java | 2 +- .../internal/ServiceResourceProvider.java | 6 +- .../feedback/DefaultFeedbackProvider.java | 34 +++---- .../install/DefaultResourceInstaller.java | 8 +- .../impl/label/DefaultLabelProvider.java | 2 +- .../namespace/DefaultNamespaceService.java | 6 +- .../impl/portforward/PortForwarder.java | 4 +- .../requirement/KubernetesRequirement.java | 6 +- .../resources/KubernetesResourceHandle.java | 4 +- .../resources/KubernetesResourcesApplier.java | 4 +- .../impl/visitor/CompositeVisitor.java | 4 +- .../impl/visitor/DockerRegistryVisitor.java | 4 +- .../impl/visitor/LoggingVisitor.java | 4 +- .../impl/visitor/NamespaceVisitor.java | 12 +-- .../impl/visitor/ServiceAccountVisitor.java | 6 +- .../cube/kubernetes/impl/MockTest.java | 34 +++---- .../TakeKubernetesResourcesInformation.java | 2 +- ...akeKubernetesResourcesInformationTest.java | 22 ++--- ...penShiftAssistantOperationalMethodsIT.java | 8 +- .../HelloWorldOpenShiftAssistantIT.java | 4 +- .../openshift/standalone/HelloWorldIT.java | 2 +- .../impl/adapter/OpenShiftAdapterFactory.java | 2 +- .../adapter/OpenShiftAdapterProvider.java | 2 +- .../client/CubeOpenShiftConfiguration.java | 6 +- .../impl/client/CubeOpenShiftRegistrar.java | 6 +- .../cube/openshift/impl/client/GitServer.java | 16 +-- .../impl/client/OpenShiftAssistant.java | 10 +- .../client/OpenShiftAssistantTemplate.java | 12 +-- .../impl/client/OpenShiftClient.java | 36 +++---- .../impl/client/OpenShiftClientCreator.java | 10 +- .../impl/client/OpenShiftRouteLocator.java | 2 +- .../openshift/impl/client/ResourceUtil.java | 26 ++--- .../client/metadata/CopyFromContainer.java | 2 +- .../impl/dns/ArqCubeNameService.java | 2 +- .../AbstractOpenshiftResourceProvider.java | 2 +- .../impl/enricher/RouteURLEnricher.java | 2 +- .../DeploymentConfigListResourceProvider.java | 4 +- .../DeploymentConfigResourceProvider.java | 2 +- .../OpenshiftClientResourceProvider.java | 8 +- .../DeploymentConfigListResourceProvider.java | 2 +- .../DeploymentConfigResourceProvider.java | 4 +- .../OpenshiftClientResourceProvider.java | 4 +- .../impl/fabric8/F8OpenShiftAdapter.java | 98 +++++++++---------- .../fabric8/F8OpenShiftAdapterProvider.java | 2 +- .../cube/openshift/impl/fabric8/F8Proxy.java | 14 +-- .../fabric8/model/F8DeploymentConfig.java | 4 +- .../feedback/OpenshiftFeedbackProvider.java | 22 ++--- .../install/OpenshiftResourceInstaller.java | 12 +-- .../OpenshiftKubernetesResourceLocator.java | 4 +- .../impl/model/BuildablePodCube.java | 6 +- .../openshift/impl/model/ServiceCube.java | 4 +- .../cube/openshift/impl/model/Template.java | 6 +- .../namespace/OpenshiftNamespaceService.java | 12 +-- .../requirement/OpenshiftRequirement.java | 8 +- .../cube/openshift/impl/DnsServiceTest.java | 6 +- .../impl/model/BuildablePodCubeTest.java | 12 +-- pom.xml | 4 +- 101 files changed, 391 insertions(+), 391 deletions(-) diff --git a/kubernetes/fabric8/src/main/java/org/arquillian/cube/kubernetes/fabric8/impl/Fabric8Extension.java b/kubernetes/fabric8/src/main/java/org/arquillian/cube/kubernetes/fabric8/impl/Fabric8Extension.java index 2a43aab27..7cd5716e8 100644 --- a/kubernetes/fabric8/src/main/java/org/arquillian/cube/kubernetes/fabric8/impl/Fabric8Extension.java +++ b/kubernetes/fabric8/src/main/java/org/arquillian/cube/kubernetes/fabric8/impl/Fabric8Extension.java @@ -1,6 +1,6 @@ package org.arquillian.cube.kubernetes.fabric8.impl; -import io.fabric8.kubernetes.api.builder.v4_0.Visitor; +import io.fabric8.kubernetes.api.builder.v4_10.Visitor; import org.arquillian.cube.kubernetes.api.AnnotationProvider; import org.arquillian.cube.kubernetes.api.LabelProvider; import org.arquillian.cube.kubernetes.api.NamespaceService; diff --git a/kubernetes/fabric8/src/main/java/org/arquillian/cube/kubernetes/fabric8/impl/label/Fabric8LabelProvider.java b/kubernetes/fabric8/src/main/java/org/arquillian/cube/kubernetes/fabric8/impl/label/Fabric8LabelProvider.java index 48337d50b..278e809fc 100644 --- a/kubernetes/fabric8/src/main/java/org/arquillian/cube/kubernetes/fabric8/impl/label/Fabric8LabelProvider.java +++ b/kubernetes/fabric8/src/main/java/org/arquillian/cube/kubernetes/fabric8/impl/label/Fabric8LabelProvider.java @@ -1,6 +1,6 @@ package org.arquillian.cube.kubernetes.fabric8.impl.label; -import io.fabric8.kubernetes.clnt.v4_0.KubernetesClient; +import io.fabric8.kubernetes.clnt.v4_10.KubernetesClient; import org.arquillian.cube.kubernetes.api.LabelProvider; import org.jboss.arquillian.core.api.Instance; diff --git a/kubernetes/fabric8/src/main/java/org/arquillian/cube/kubernetes/fabric8/impl/visitor/SecretsAndServiceAccountVisitor.java b/kubernetes/fabric8/src/main/java/org/arquillian/cube/kubernetes/fabric8/impl/visitor/SecretsAndServiceAccountVisitor.java index 2fa36ed9f..8a9e8db8a 100644 --- a/kubernetes/fabric8/src/main/java/org/arquillian/cube/kubernetes/fabric8/impl/visitor/SecretsAndServiceAccountVisitor.java +++ b/kubernetes/fabric8/src/main/java/org/arquillian/cube/kubernetes/fabric8/impl/visitor/SecretsAndServiceAccountVisitor.java @@ -1,13 +1,13 @@ package org.arquillian.cube.kubernetes.fabric8.impl.visitor; -import io.fabric8.kubernetes.api.builder.v4_0.Visitor; -import io.fabric8.kubernetes.api.model.v4_0.ObjectMeta; -import io.fabric8.kubernetes.api.model.v4_0.ObjectReference; -import io.fabric8.kubernetes.api.model.v4_0.ObjectReferenceBuilder; -import io.fabric8.kubernetes.api.model.v4_0.PodBuilder; -import io.fabric8.kubernetes.api.model.v4_0.PodTemplateSpecBuilder; -import io.fabric8.kubernetes.api.model.v4_0.Secret; -import io.fabric8.kubernetes.clnt.v4_0.KubernetesClient; +import io.fabric8.kubernetes.api.builder.v4_10.Visitor; +import io.fabric8.kubernetes.api.model.v4_10.ObjectMeta; +import io.fabric8.kubernetes.api.model.v4_10.ObjectReference; +import io.fabric8.kubernetes.api.model.v4_10.ObjectReferenceBuilder; +import io.fabric8.kubernetes.api.model.v4_10.PodBuilder; +import io.fabric8.kubernetes.api.model.v4_10.PodTemplateSpecBuilder; +import io.fabric8.kubernetes.api.model.v4_10.Secret; +import io.fabric8.kubernetes.clnt.v4_10.KubernetesClient; import org.arquillian.cube.kubernetes.api.Configuration; import org.arquillian.cube.kubernetes.fabric8.impl.SecretKeys; import org.arquillian.cube.kubernetes.fabric8.impl.utils.Secrets; diff --git a/kubernetes/ftest-kubernetes-reporter/src/test/java/HelloWorldIT.java b/kubernetes/ftest-kubernetes-reporter/src/test/java/HelloWorldIT.java index fc431a478..6826835e0 100644 --- a/kubernetes/ftest-kubernetes-reporter/src/test/java/HelloWorldIT.java +++ b/kubernetes/ftest-kubernetes-reporter/src/test/java/HelloWorldIT.java @@ -1,4 +1,4 @@ -import io.fabric8.kubernetes.api.model.v4_0.Service; +import io.fabric8.kubernetes.api.model.v4_10.Service; import java.io.IOException; import org.arquillian.cube.kubernetes.annotations.Named; import org.arquillian.cube.kubernetes.impl.requirement.RequiresKubernetes; diff --git a/kubernetes/ftest-kubernetes-resources/src/test/java/org/arquillian/cube/kubernetes/HelloWorldResourcesIT.java b/kubernetes/ftest-kubernetes-resources/src/test/java/org/arquillian/cube/kubernetes/HelloWorldResourcesIT.java index 245b14902..4b2485f78 100644 --- a/kubernetes/ftest-kubernetes-resources/src/test/java/org/arquillian/cube/kubernetes/HelloWorldResourcesIT.java +++ b/kubernetes/ftest-kubernetes-resources/src/test/java/org/arquillian/cube/kubernetes/HelloWorldResourcesIT.java @@ -1,9 +1,9 @@ package org.arquillian.cube.kubernetes; -import io.fabric8.kubernetes.api.model.v4_0.ObjectMeta; -import io.fabric8.kubernetes.api.model.v4_0.Service; -import io.fabric8.kubernetes.api.model.v4_0.ServiceList; -import io.fabric8.kubernetes.clnt.v4_0.KubernetesClient; +import io.fabric8.kubernetes.api.model.v4_10.ObjectMeta; +import io.fabric8.kubernetes.api.model.v4_10.Service; +import io.fabric8.kubernetes.api.model.v4_10.ServiceList; +import io.fabric8.kubernetes.clnt.v4_10.KubernetesClient; import org.arquillian.cube.kubernetes.annotations.KubernetesResource; import org.arquillian.cube.kubernetes.impl.requirement.RequiresKubernetes; import org.arquillian.cube.requirement.ArquillianConditionalRunner; diff --git a/kubernetes/ftest-kubernetes/src/test/java/HelloWorldIT.java b/kubernetes/ftest-kubernetes/src/test/java/HelloWorldIT.java index af42dd9ba..37dbb00d8 100644 --- a/kubernetes/ftest-kubernetes/src/test/java/HelloWorldIT.java +++ b/kubernetes/ftest-kubernetes/src/test/java/HelloWorldIT.java @@ -1,4 +1,4 @@ -import io.fabric8.kubernetes.api.model.v4_0.Service; +import io.fabric8.kubernetes.api.model.v4_10.Service; import java.io.IOException; import java.net.URL; import okhttp3.OkHttpClient; diff --git a/kubernetes/istio/istio/src/main/java/org/arquillian/cube/istio/impl/IstioClientCreator.java b/kubernetes/istio/istio/src/main/java/org/arquillian/cube/istio/impl/IstioClientCreator.java index 6189b59db..24bd5c59f 100644 --- a/kubernetes/istio/istio/src/main/java/org/arquillian/cube/istio/impl/IstioClientCreator.java +++ b/kubernetes/istio/istio/src/main/java/org/arquillian/cube/istio/impl/IstioClientCreator.java @@ -1,6 +1,6 @@ package org.arquillian.cube.istio.impl; -import io.fabric8.kubernetes.clnt.v4_0.KubernetesClient; +import io.fabric8.kubernetes.clnt.v4_10.KubernetesClient; import me.snowdrop.istio.client.IstioClient; import org.jboss.arquillian.core.api.InstanceProducer; import org.jboss.arquillian.core.api.annotation.ApplicationScoped; diff --git a/kubernetes/istio/istio/src/main/java/org/arquillian/cube/istio/impl/IstioResourcesApplier.java b/kubernetes/istio/istio/src/main/java/org/arquillian/cube/istio/impl/IstioResourcesApplier.java index 999593ff4..467f0c446 100644 --- a/kubernetes/istio/istio/src/main/java/org/arquillian/cube/istio/impl/IstioResourcesApplier.java +++ b/kubernetes/istio/istio/src/main/java/org/arquillian/cube/istio/impl/IstioResourcesApplier.java @@ -1,6 +1,6 @@ package org.arquillian.cube.istio.impl; -import io.fabric8.kubernetes.api.model.v4_0.ObjectMeta; +import io.fabric8.kubernetes.api.model.v4_10.ObjectMeta; import java.io.BufferedInputStream; import java.io.IOException; import java.lang.reflect.Method; diff --git a/kubernetes/istio/istio/src/test/java/org/arquillian/cube/istio/impl/IstioResourcesApplierTest.java b/kubernetes/istio/istio/src/test/java/org/arquillian/cube/istio/impl/IstioResourcesApplierTest.java index 2a2db1314..205e2629b 100644 --- a/kubernetes/istio/istio/src/test/java/org/arquillian/cube/istio/impl/IstioResourcesApplierTest.java +++ b/kubernetes/istio/istio/src/test/java/org/arquillian/cube/istio/impl/IstioResourcesApplierTest.java @@ -1,6 +1,6 @@ package org.arquillian.cube.istio.impl; -import io.fabric8.kubernetes.api.model.v4_0.ObjectMeta; +import io.fabric8.kubernetes.api.model.v4_10.ObjectMeta; import java.io.InputStream; import java.util.Arrays; import me.snowdrop.istio.api.IstioResource; diff --git a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/api/Configuration.java b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/api/Configuration.java index b6e3641ba..503c2d17d 100644 --- a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/api/Configuration.java +++ b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/api/Configuration.java @@ -1,7 +1,7 @@ package org.arquillian.cube.kubernetes.api; -import io.fabric8.kubernetes.clnt.v4_0.Config; -import io.fabric8.kubernetes.clnt.v4_0.ConfigBuilder; +import io.fabric8.kubernetes.clnt.v4_10.Config; +import io.fabric8.kubernetes.clnt.v4_10.ConfigBuilder; import java.net.URL; import java.util.List; import java.util.Map; diff --git a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/api/FeedbackProvider.java b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/api/FeedbackProvider.java index 4715c7508..299ecef04 100644 --- a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/api/FeedbackProvider.java +++ b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/api/FeedbackProvider.java @@ -1,6 +1,6 @@ package org.arquillian.cube.kubernetes.api; -import io.fabric8.kubernetes.api.model.v4_0.HasMetadata; +import io.fabric8.kubernetes.api.model.v4_10.HasMetadata; public interface FeedbackProvider extends WithToImmutable { diff --git a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/api/NamespaceService.java b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/api/NamespaceService.java index e8fa38db6..e94be3da9 100644 --- a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/api/NamespaceService.java +++ b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/api/NamespaceService.java @@ -1,6 +1,6 @@ package org.arquillian.cube.kubernetes.api; -import io.fabric8.kubernetes.api.model.v4_0.Namespace; +import io.fabric8.kubernetes.api.model.v4_10.Namespace; import java.util.Map; public interface NamespaceService extends WithToImmutable { diff --git a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/api/ResourceInstaller.java b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/api/ResourceInstaller.java index bb889d7f5..dde6f7911 100644 --- a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/api/ResourceInstaller.java +++ b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/api/ResourceInstaller.java @@ -1,6 +1,6 @@ package org.arquillian.cube.kubernetes.api; -import io.fabric8.kubernetes.api.model.v4_0.HasMetadata; +import io.fabric8.kubernetes.api.model.v4_10.HasMetadata; import java.net.URL; import java.util.List; import java.util.Map; diff --git a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/ClientConfigBuilder.java b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/ClientConfigBuilder.java index 014cd3ebc..54a1c9385 100644 --- a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/ClientConfigBuilder.java +++ b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/ClientConfigBuilder.java @@ -1,7 +1,7 @@ package org.arquillian.cube.kubernetes.impl; -import io.fabric8.kubernetes.api.builder.v4_0.TypedVisitor; -import io.fabric8.kubernetes.clnt.v4_0.ConfigBuilder; +import io.fabric8.kubernetes.api.builder.v4_10.TypedVisitor; +import io.fabric8.kubernetes.clnt.v4_10.ConfigBuilder; import org.arquillian.cube.impl.util.Strings; import org.arquillian.cube.kubernetes.api.Configuration; diff --git a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/ClientCreator.java b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/ClientCreator.java index bf15a953c..0bcba1c8d 100644 --- a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/ClientCreator.java +++ b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/ClientCreator.java @@ -15,9 +15,9 @@ */ package org.arquillian.cube.kubernetes.impl; -import io.fabric8.kubernetes.clnt.v4_0.Config; -import io.fabric8.kubernetes.clnt.v4_0.DefaultKubernetesClient; -import io.fabric8.kubernetes.clnt.v4_0.KubernetesClient; +import io.fabric8.kubernetes.clnt.v4_10.Config; +import io.fabric8.kubernetes.clnt.v4_10.DefaultKubernetesClient; +import io.fabric8.kubernetes.clnt.v4_10.KubernetesClient; import org.arquillian.cube.kubernetes.api.Configuration; import org.jboss.arquillian.core.api.InstanceProducer; import org.jboss.arquillian.core.api.annotation.ApplicationScoped; diff --git a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/DefaultConfiguration.java b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/DefaultConfiguration.java index 6210c288e..cc0efd731 100644 --- a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/DefaultConfiguration.java +++ b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/DefaultConfiguration.java @@ -1,7 +1,7 @@ package org.arquillian.cube.kubernetes.impl; -import io.fabric8.kubernetes.clnt.v4_0.ConfigBuilder; -import io.fabric8.kubernetes.clnt.v4_0.utils.Utils; +import io.fabric8.kubernetes.clnt.v4_10.ConfigBuilder; +import io.fabric8.kubernetes.clnt.v4_10.utils.Utils; import io.sundr.builder.annotations.Buildable; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -26,7 +26,7 @@ import static org.arquillian.cube.impl.util.ConfigUtil.getLongProperty; import static org.arquillian.cube.impl.util.ConfigUtil.getStringProperty; -@Buildable(builderPackage = "io.fabric8.kubernetes.api.builder.v4_0", generateBuilderPackage = false, editableEnabled = false) +@Buildable(builderPackage = "io.fabric8.kubernetes.api.builder.v4_10", generateBuilderPackage = false, editableEnabled = false) public class DefaultConfiguration implements Configuration { private static final String ENV_VAR_REGEX = "env.([a-zA-Z0-9_]+)"; diff --git a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/KubernetesAssistant.java b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/KubernetesAssistant.java index 88d9ad495..dcee7d128 100644 --- a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/KubernetesAssistant.java +++ b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/KubernetesAssistant.java @@ -1,18 +1,18 @@ package org.arquillian.cube.kubernetes.impl; -import io.fabric8.kubernetes.api.model.v4_0.EndpointSubset; -import io.fabric8.kubernetes.api.model.v4_0.Endpoints; -import io.fabric8.kubernetes.api.model.v4_0.HasMetadata; -import io.fabric8.kubernetes.api.model.v4_0.Pod; -import io.fabric8.kubernetes.api.model.v4_0.ReplicationController; -import io.fabric8.kubernetes.api.model.v4_0.Service; -import io.fabric8.kubernetes.api.model.v4_0.ServicePort; -import io.fabric8.kubernetes.api.model.v4_0.apps.Deployment; -import io.fabric8.kubernetes.clnt.v4_0.ConfigBuilder; -import io.fabric8.kubernetes.clnt.v4_0.KubernetesClient; -import io.fabric8.kubernetes.clnt.v4_0.KubernetesClientException; -import io.fabric8.kubernetes.clnt.v4_0.dsl.NamespaceListVisitFromServerGetDeleteRecreateWaitApplicable; -import io.fabric8.kubernetes.clnt.v4_0.internal.readiness.Readiness; +import io.fabric8.kubernetes.api.model.v4_10.EndpointSubset; +import io.fabric8.kubernetes.api.model.v4_10.Endpoints; +import io.fabric8.kubernetes.api.model.v4_10.HasMetadata; +import io.fabric8.kubernetes.api.model.v4_10.Pod; +import io.fabric8.kubernetes.api.model.v4_10.ReplicationController; +import io.fabric8.kubernetes.api.model.v4_10.Service; +import io.fabric8.kubernetes.api.model.v4_10.ServicePort; +import io.fabric8.kubernetes.api.model.v4_10.apps.Deployment; +import io.fabric8.kubernetes.clnt.v4_10.ConfigBuilder; +import io.fabric8.kubernetes.clnt.v4_10.KubernetesClient; +import io.fabric8.kubernetes.clnt.v4_10.KubernetesClientException; +import io.fabric8.kubernetes.clnt.v4_10.dsl.NamespaceListVisitFromServerGetDeleteRecreateWaitApplicable; +import io.fabric8.kubernetes.clnt.v4_10.internal.readiness.Readiness; import io.github.lukehutch.fastclasspathscanner.FastClasspathScanner; import io.github.lukehutch.fastclasspathscanner.matchprocessor.FileMatchProcessor; import org.arquillian.cube.kubernetes.impl.portforward.PortForwarder; @@ -315,7 +315,7 @@ private int portForward(String podName, int targetPort, String namespace) { private int portForward(String podName, int sourcePort, int targetPort, String namespace) { try { - final io.fabric8.kubernetes.clnt.v4_0.Config build = new ConfigBuilder(client.getConfiguration()).withNamespace(namespace).build(); + final io.fabric8.kubernetes.clnt.v4_10.Config build = new ConfigBuilder(client.getConfiguration()).withNamespace(namespace).build(); final PortForwarder portForwarder = new PortForwarder(build, podName); portForwarder.forwardPort(sourcePort, targetPort); return sourcePort; diff --git a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/KubernetesAssistantCreator.java b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/KubernetesAssistantCreator.java index 21c554432..e1de1ac66 100644 --- a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/KubernetesAssistantCreator.java +++ b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/KubernetesAssistantCreator.java @@ -1,6 +1,6 @@ package org.arquillian.cube.kubernetes.impl; -import io.fabric8.kubernetes.clnt.v4_0.KubernetesClient; +import io.fabric8.kubernetes.clnt.v4_10.KubernetesClient; import org.jboss.arquillian.core.api.InstanceProducer; import org.jboss.arquillian.core.api.annotation.ApplicationScoped; import org.jboss.arquillian.core.api.annotation.Inject; diff --git a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/KubernetesExtension.java b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/KubernetesExtension.java index 0e204dab1..6344c45f9 100644 --- a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/KubernetesExtension.java +++ b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/KubernetesExtension.java @@ -15,7 +15,7 @@ */ package org.arquillian.cube.kubernetes.impl; -import io.fabric8.kubernetes.api.builder.v4_0.Visitor; +import io.fabric8.kubernetes.api.builder.v4_10.Visitor; import org.arquillian.cube.impl.client.enricher.StandaloneCubeUrlResourceProvider; import org.arquillian.cube.impl.util.Strings; import org.arquillian.cube.kubernetes.api.AnnotationProvider; diff --git a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/SessionManager.java b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/SessionManager.java index 07b397173..e669f89b4 100644 --- a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/SessionManager.java +++ b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/SessionManager.java @@ -1,18 +1,18 @@ package org.arquillian.cube.kubernetes.impl; -import io.fabric8.kubernetes.api.model.v4_0.Endpoints; -import io.fabric8.kubernetes.api.model.v4_0.HasMetadata; -import io.fabric8.kubernetes.api.model.v4_0.Pod; -import io.fabric8.kubernetes.api.model.v4_0.PodList; -import io.fabric8.kubernetes.api.model.v4_0.ReplicationController; -import io.fabric8.kubernetes.api.model.v4_0.ReplicationControllerList; -import io.fabric8.kubernetes.api.model.v4_0.Service; -import io.fabric8.kubernetes.api.model.v4_0.ServiceList; -import io.fabric8.kubernetes.api.model.v4_0.ServicePort; -import io.fabric8.kubernetes.api.model.v4_0.apps.ReplicaSet; -import io.fabric8.kubernetes.api.model.v4_0.apps.ReplicaSetList; -import io.fabric8.kubernetes.clnt.v4_0.KubernetesClient; -import io.fabric8.kubernetes.clnt.v4_0.KubernetesClientTimeoutException; +import io.fabric8.kubernetes.api.model.v4_10.Endpoints; +import io.fabric8.kubernetes.api.model.v4_10.HasMetadata; +import io.fabric8.kubernetes.api.model.v4_10.Pod; +import io.fabric8.kubernetes.api.model.v4_10.PodList; +import io.fabric8.kubernetes.api.model.v4_10.ReplicationController; +import io.fabric8.kubernetes.api.model.v4_10.ReplicationControllerList; +import io.fabric8.kubernetes.api.model.v4_10.Service; +import io.fabric8.kubernetes.api.model.v4_10.ServiceList; +import io.fabric8.kubernetes.api.model.v4_10.ServicePort; +import io.fabric8.kubernetes.api.model.v4_10.apps.ReplicaSet; +import io.fabric8.kubernetes.api.model.v4_10.apps.ReplicaSetList; +import io.fabric8.kubernetes.clnt.v4_10.KubernetesClient; +import io.fabric8.kubernetes.clnt.v4_10.KubernetesClientTimeoutException; import java.io.IOException; import java.io.InputStream; import java.net.URL; diff --git a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/SessionManagerLifecycle.java b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/SessionManagerLifecycle.java index 9d096bb16..1929c8e04 100644 --- a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/SessionManagerLifecycle.java +++ b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/SessionManagerLifecycle.java @@ -1,6 +1,6 @@ package org.arquillian.cube.kubernetes.impl; -import io.fabric8.kubernetes.clnt.v4_0.KubernetesClient; +import io.fabric8.kubernetes.clnt.v4_10.KubernetesClient; import java.util.concurrent.atomic.AtomicReference; import org.arquillian.cube.kubernetes.api.AnnotationProvider; import org.arquillian.cube.kubernetes.api.Configuration; diff --git a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/WatchListener.java b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/WatchListener.java index 4438d8bd5..a68c01591 100644 --- a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/WatchListener.java +++ b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/WatchListener.java @@ -1,13 +1,13 @@ package org.arquillian.cube.kubernetes.impl; -import io.fabric8.kubernetes.api.model.v4_0.Container; -import io.fabric8.kubernetes.api.model.v4_0.Event; -import io.fabric8.kubernetes.api.model.v4_0.Pod; -import io.fabric8.kubernetes.clnt.v4_0.KubernetesClient; -import io.fabric8.kubernetes.clnt.v4_0.KubernetesClientException; -import io.fabric8.kubernetes.clnt.v4_0.Watch; -import io.fabric8.kubernetes.clnt.v4_0.Watcher; -import io.fabric8.kubernetes.clnt.v4_0.dsl.LogWatch; +import io.fabric8.kubernetes.api.model.v4_10.Container; +import io.fabric8.kubernetes.api.model.v4_10.Event; +import io.fabric8.kubernetes.api.model.v4_10.Pod; +import io.fabric8.kubernetes.clnt.v4_10.KubernetesClient; +import io.fabric8.kubernetes.clnt.v4_10.KubernetesClientException; +import io.fabric8.kubernetes.clnt.v4_10.Watch; +import io.fabric8.kubernetes.clnt.v4_10.Watcher; +import io.fabric8.kubernetes.clnt.v4_10.dsl.LogWatch; import java.io.Closeable; import java.io.File; import java.io.FileNotFoundException; diff --git a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/AbstractKubernetesResourceProvider.java b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/AbstractKubernetesResourceProvider.java index 5518e597c..e39d6c775 100644 --- a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/AbstractKubernetesResourceProvider.java +++ b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/AbstractKubernetesResourceProvider.java @@ -2,8 +2,8 @@ import com.fasterxml.jackson.databind.DeserializationFeature; -import io.fabric8.kubernetes.clnt.v4_0.KubernetesClient; -import io.fabric8.kubernetes.clnt.v4_0.utils.Serialization; +import io.fabric8.kubernetes.clnt.v4_10.KubernetesClient; +import io.fabric8.kubernetes.clnt.v4_10.utils.Serialization; import java.io.IOException; import java.lang.annotation.Annotation; diff --git a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/KuberntesServiceUrlResourceProvider.java b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/KuberntesServiceUrlResourceProvider.java index 6ee8cd5f9..e36a0f819 100644 --- a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/KuberntesServiceUrlResourceProvider.java +++ b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/KuberntesServiceUrlResourceProvider.java @@ -1,13 +1,13 @@ package org.arquillian.cube.kubernetes.impl.enricher; -import io.fabric8.kubernetes.api.model.v4_0.EndpointAddress; -import io.fabric8.kubernetes.api.model.v4_0.EndpointSubset; -import io.fabric8.kubernetes.api.model.v4_0.Endpoints; -import io.fabric8.kubernetes.api.model.v4_0.Pod; -import io.fabric8.kubernetes.api.model.v4_0.Service; -import io.fabric8.kubernetes.api.model.v4_0.ServicePort; -import io.fabric8.kubernetes.clnt.v4_0.ConfigBuilder; -import io.fabric8.kubernetes.clnt.v4_0.KubernetesClient; +import io.fabric8.kubernetes.api.model.v4_10.EndpointAddress; +import io.fabric8.kubernetes.api.model.v4_10.EndpointSubset; +import io.fabric8.kubernetes.api.model.v4_10.Endpoints; +import io.fabric8.kubernetes.api.model.v4_10.Pod; +import io.fabric8.kubernetes.api.model.v4_10.Service; +import io.fabric8.kubernetes.api.model.v4_10.ServicePort; +import io.fabric8.kubernetes.clnt.v4_10.ConfigBuilder; +import io.fabric8.kubernetes.clnt.v4_10.KubernetesClient; import java.io.IOException; import java.lang.annotation.Annotation; import java.net.MalformedURLException; @@ -32,7 +32,7 @@ import org.jboss.arquillian.test.spi.enricher.resource.ResourceProvider; /** - * A {@link ResourceProvider} for {@link io.fabric8.kubernetes.api.model.v4_0.ServiceList}. + * A {@link ResourceProvider} for {@link io.fabric8.kubernetes.api.model.v4_10.ServiceList}. * It refers to services that have been created during the current session. */ public class KuberntesServiceUrlResourceProvider extends AbstractKubernetesResourceProvider { diff --git a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/external/ClientResourceProvider.java b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/external/ClientResourceProvider.java index a951c49a5..70efa3e4f 100644 --- a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/external/ClientResourceProvider.java +++ b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/external/ClientResourceProvider.java @@ -3,16 +3,16 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Constructor; -import io.fabric8.kubernetes.clnt.v4_0.Config; -import io.fabric8.kubernetes.clnt.v4_0.DefaultKubernetesClient; -import io.fabric8.kubernetes.clnt.v4_0.KubernetesClient; +import io.fabric8.kubernetes.clnt.v4_10.Config; +import io.fabric8.kubernetes.clnt.v4_10.DefaultKubernetesClient; +import io.fabric8.kubernetes.clnt.v4_10.KubernetesClient; import org.arquillian.cube.kubernetes.impl.enricher.AbstractKubernetesResourceProvider; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.arquillian.test.spi.enricher.resource.ResourceProvider; /** - * A {@link ResourceProvider} for {@link io.fabric8.kubernetes.clnt.v4_0.KubernetesClient}. + * A {@link ResourceProvider} for {@link io.fabric8.kubernetes.clnt.v4_10.KubernetesClient}. */ public class ClientResourceProvider extends AbstractKubernetesResourceProvider { diff --git a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/external/DeploymentListResourceProvider.java b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/external/DeploymentListResourceProvider.java index 9356f731f..d7bfd8553 100644 --- a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/external/DeploymentListResourceProvider.java +++ b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/external/DeploymentListResourceProvider.java @@ -2,7 +2,7 @@ import java.lang.annotation.Annotation; -import io.fabric8.kubernetes.api.model.v4_0.apps.DeploymentList; +import io.fabric8.kubernetes.api.model.v4_10.apps.DeploymentList; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.arquillian.test.spi.enricher.resource.ResourceProvider; diff --git a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/external/DeploymentResourceProvider.java b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/external/DeploymentResourceProvider.java index 667137c02..2d44b2146 100644 --- a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/external/DeploymentResourceProvider.java +++ b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/external/DeploymentResourceProvider.java @@ -2,7 +2,7 @@ import java.lang.annotation.Annotation; -import io.fabric8.kubernetes.api.model.v4_0.apps.Deployment; +import io.fabric8.kubernetes.api.model.v4_10.apps.Deployment; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.arquillian.test.spi.enricher.resource.ResourceProvider; diff --git a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/external/PodListResourceProvider.java b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/external/PodListResourceProvider.java index a4ad7102e..3bd85d25f 100644 --- a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/external/PodListResourceProvider.java +++ b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/external/PodListResourceProvider.java @@ -2,7 +2,7 @@ import java.lang.annotation.Annotation; -import io.fabric8.kubernetes.api.model.v4_0.PodList; +import io.fabric8.kubernetes.api.model.v4_10.PodList; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.arquillian.test.spi.enricher.resource.ResourceProvider; diff --git a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/external/PodResourceProvider.java b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/external/PodResourceProvider.java index ca6223643..3c79e13bd 100644 --- a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/external/PodResourceProvider.java +++ b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/external/PodResourceProvider.java @@ -2,13 +2,13 @@ import java.lang.annotation.Annotation; -import io.fabric8.kubernetes.api.model.v4_0.Pod; +import io.fabric8.kubernetes.api.model.v4_10.Pod; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.arquillian.test.spi.enricher.resource.ResourceProvider; /** - * A {@link ResourceProvider} for {@link io.fabric8.kubernetes.api.model.v4_0.PodList}. + * A {@link ResourceProvider} for {@link io.fabric8.kubernetes.api.model.v4_10.PodList}. * It refers to pods that have been created during the current session. */ public class PodResourceProvider extends org.arquillian.cube.kubernetes.impl.enricher.internal.PodResourceProvider { diff --git a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/external/ReplicaSetListResourceProvider.java b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/external/ReplicaSetListResourceProvider.java index 8ddfa0271..409d68473 100644 --- a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/external/ReplicaSetListResourceProvider.java +++ b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/external/ReplicaSetListResourceProvider.java @@ -2,13 +2,13 @@ import java.lang.annotation.Annotation; -import io.fabric8.kubernetes.api.model.v4_0.apps.ReplicaSetList; +import io.fabric8.kubernetes.api.model.v4_10.apps.ReplicaSetList; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.arquillian.test.spi.enricher.resource.ResourceProvider; /** - * A {@link ResourceProvider} for {@link io.fabric8.kubernetes.api.model.v4_0.extensions.ReplicaSetList}. + * A {@link ResourceProvider} for {@link io.fabric8.kubernetes.api.model.v4_10.extensions.ReplicaSetList}. * It refers to replica sets that have been created during the current session. */ public class ReplicaSetListResourceProvider extends org.arquillian.cube.kubernetes.impl.enricher.internal.ReplicaSetListResourceProvider { diff --git a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/external/ReplicaSetResourceProvider.java b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/external/ReplicaSetResourceProvider.java index 6de72444d..c6c6e3da7 100644 --- a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/external/ReplicaSetResourceProvider.java +++ b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/external/ReplicaSetResourceProvider.java @@ -2,13 +2,13 @@ import java.lang.annotation.Annotation; -import io.fabric8.kubernetes.api.model.v4_0.apps.ReplicaSet; +import io.fabric8.kubernetes.api.model.v4_10.apps.ReplicaSet; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.arquillian.test.spi.enricher.resource.ResourceProvider; /** - * A {@link ResourceProvider} for {@link io.fabric8.kubernetes.api.model.v4_0.extensions.ReplicaSet}. + * A {@link ResourceProvider} for {@link io.fabric8.kubernetes.api.model.v4_10.extensions.ReplicaSet}. * It refers to replica sets that have been created during the current session. */ public class ReplicaSetResourceProvider extends org.arquillian.cube.kubernetes.impl.enricher.internal.ReplicaSetResourceProvider { diff --git a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/external/ReplicationControllerListResourceProvider.java b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/external/ReplicationControllerListResourceProvider.java index 58b439d06..b449fa88c 100644 --- a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/external/ReplicationControllerListResourceProvider.java +++ b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/external/ReplicationControllerListResourceProvider.java @@ -2,7 +2,7 @@ import java.lang.annotation.Annotation; -import io.fabric8.kubernetes.api.model.v4_0.ReplicationControllerList; +import io.fabric8.kubernetes.api.model.v4_10.ReplicationControllerList; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.arquillian.test.spi.enricher.resource.ResourceProvider; diff --git a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/external/ReplicationControllerResourceProvider.java b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/external/ReplicationControllerResourceProvider.java index bb459fe4a..092fdb362 100644 --- a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/external/ReplicationControllerResourceProvider.java +++ b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/external/ReplicationControllerResourceProvider.java @@ -2,13 +2,13 @@ import java.lang.annotation.Annotation; -import io.fabric8.kubernetes.api.model.v4_0.ReplicationController; +import io.fabric8.kubernetes.api.model.v4_10.ReplicationController; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.arquillian.test.spi.enricher.resource.ResourceProvider; /** - * A {@link ResourceProvider} for {@link io.fabric8.kubernetes.api.model.v4_0.ReplicationControllerList}. + * A {@link ResourceProvider} for {@link io.fabric8.kubernetes.api.model.v4_10.ReplicationControllerList}. * It refers to replication controllers that have been created during the current session. */ public class ReplicationControllerResourceProvider extends org.arquillian.cube.kubernetes.impl.enricher.internal.ReplicationControllerResourceProvider { diff --git a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/external/ServiceListResourceProvider.java b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/external/ServiceListResourceProvider.java index 3330a8ad2..786398822 100644 --- a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/external/ServiceListResourceProvider.java +++ b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/external/ServiceListResourceProvider.java @@ -2,7 +2,7 @@ import java.lang.annotation.Annotation; -import io.fabric8.kubernetes.api.model.v4_0.ServiceList; +import io.fabric8.kubernetes.api.model.v4_10.ServiceList; import org.arquillian.cube.kubernetes.impl.enricher.AbstractKubernetesResourceProvider; import org.jboss.arquillian.test.api.ArquillianResource; diff --git a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/external/ServiceResourceProvider.java b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/external/ServiceResourceProvider.java index 900741914..15d5d1e30 100644 --- a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/external/ServiceResourceProvider.java +++ b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/external/ServiceResourceProvider.java @@ -2,13 +2,13 @@ import java.lang.annotation.Annotation; -import io.fabric8.kubernetes.api.model.v4_0.Service; +import io.fabric8.kubernetes.api.model.v4_10.Service; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.arquillian.test.spi.enricher.resource.ResourceProvider; /** - * A {@link ResourceProvider} for {@link io.fabric8.kubernetes.api.model.v4_0.ServiceList}. + * A {@link ResourceProvider} for {@link io.fabric8.kubernetes.api.model.v4_10.ServiceList}. * It refers to services that have been created during the current session. */ public class ServiceResourceProvider extends org.arquillian.cube.kubernetes.impl.enricher.internal.ServiceResourceProvider { diff --git a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/internal/ClientResourceProvider.java b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/internal/ClientResourceProvider.java index cb1375abd..f0fbbce21 100644 --- a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/internal/ClientResourceProvider.java +++ b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/internal/ClientResourceProvider.java @@ -6,7 +6,7 @@ import java.lang.annotation.Annotation; -import io.fabric8.kubernetes.clnt.v4_0.KubernetesClient; +import io.fabric8.kubernetes.clnt.v4_10.KubernetesClient; /** * A {@link ResourceProvider} for {@link KubernetesClient}. diff --git a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/internal/DeploymentListResourceProvider.java b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/internal/DeploymentListResourceProvider.java index c4434c0fd..783da3213 100644 --- a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/internal/DeploymentListResourceProvider.java +++ b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/internal/DeploymentListResourceProvider.java @@ -3,7 +3,7 @@ import java.lang.annotation.Annotation; import java.util.Map; -import io.fabric8.kubernetes.api.model.v4_0.apps.DeploymentList; +import io.fabric8.kubernetes.api.model.v4_10.apps.DeploymentList; import org.arquillian.cube.kubernetes.impl.enricher.AbstractKubernetesResourceProvider; import org.jboss.arquillian.test.api.ArquillianResource; diff --git a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/internal/DeploymentResourceProvider.java b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/internal/DeploymentResourceProvider.java index 240ba1da6..f14daf9a5 100644 --- a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/internal/DeploymentResourceProvider.java +++ b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/internal/DeploymentResourceProvider.java @@ -8,8 +8,8 @@ import java.util.List; import java.util.Map; -import io.fabric8.kubernetes.api.model.v4_0.apps.Deployment; -import io.fabric8.kubernetes.api.model.v4_0.apps.DeploymentList; +import io.fabric8.kubernetes.api.model.v4_10.apps.Deployment; +import io.fabric8.kubernetes.api.model.v4_10.apps.DeploymentList; /** * A {@link ResourceProvider} for {@link Deployment}. diff --git a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/internal/PodListResourceProvider.java b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/internal/PodListResourceProvider.java index 24fbc09ca..e187bce64 100644 --- a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/internal/PodListResourceProvider.java +++ b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/internal/PodListResourceProvider.java @@ -3,7 +3,7 @@ import java.lang.annotation.Annotation; import java.util.Map; -import io.fabric8.kubernetes.api.model.v4_0.PodList; +import io.fabric8.kubernetes.api.model.v4_10.PodList; import org.arquillian.cube.kubernetes.impl.enricher.AbstractKubernetesResourceProvider; import org.jboss.arquillian.test.api.ArquillianResource; diff --git a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/internal/PodResourceProvider.java b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/internal/PodResourceProvider.java index 193ded076..0e9533a58 100644 --- a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/internal/PodResourceProvider.java +++ b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/internal/PodResourceProvider.java @@ -4,15 +4,15 @@ import java.util.List; import java.util.Map; -import io.fabric8.kubernetes.api.model.v4_0.Pod; -import io.fabric8.kubernetes.api.model.v4_0.PodList; +import io.fabric8.kubernetes.api.model.v4_10.Pod; +import io.fabric8.kubernetes.api.model.v4_10.PodList; import org.arquillian.cube.kubernetes.impl.enricher.AbstractKubernetesResourceProvider; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.arquillian.test.spi.enricher.resource.ResourceProvider; /** - * A {@link ResourceProvider} for {@link io.fabric8.kubernetes.api.model.v4_0.PodList}. + * A {@link ResourceProvider} for {@link io.fabric8.kubernetes.api.model.v4_10.PodList}. * It refers to pods that have been created during the current session. */ public class PodResourceProvider extends AbstractKubernetesResourceProvider { diff --git a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/internal/ReplicaSetListResourceProvider.java b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/internal/ReplicaSetListResourceProvider.java index 72792a352..3bc9892e1 100644 --- a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/internal/ReplicaSetListResourceProvider.java +++ b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/internal/ReplicaSetListResourceProvider.java @@ -7,7 +7,7 @@ import java.lang.annotation.Annotation; import java.util.Map; -import io.fabric8.kubernetes.api.model.v4_0.apps.ReplicaSetList; +import io.fabric8.kubernetes.api.model.v4_10.apps.ReplicaSetList; /** * A {@link ResourceProvider} for {@link ReplicaSetList}. diff --git a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/internal/ReplicaSetResourceProvider.java b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/internal/ReplicaSetResourceProvider.java index cecb76d6e..ab57d6fe9 100644 --- a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/internal/ReplicaSetResourceProvider.java +++ b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/internal/ReplicaSetResourceProvider.java @@ -8,8 +8,8 @@ import java.util.List; import java.util.Map; -import io.fabric8.kubernetes.api.model.v4_0.apps.ReplicaSet; -import io.fabric8.kubernetes.api.model.v4_0.apps.ReplicaSetList; +import io.fabric8.kubernetes.api.model.v4_10.apps.ReplicaSet; +import io.fabric8.kubernetes.api.model.v4_10.apps.ReplicaSetList; /** * A {@link ResourceProvider} for {@link ReplicaSet}. diff --git a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/internal/ReplicationControllerListResourceProvider.java b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/internal/ReplicationControllerListResourceProvider.java index 6625f3245..fd8fdd417 100644 --- a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/internal/ReplicationControllerListResourceProvider.java +++ b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/internal/ReplicationControllerListResourceProvider.java @@ -3,7 +3,7 @@ import java.lang.annotation.Annotation; import java.util.Map; -import io.fabric8.kubernetes.api.model.v4_0.ReplicationControllerList; +import io.fabric8.kubernetes.api.model.v4_10.ReplicationControllerList; import org.arquillian.cube.kubernetes.impl.enricher.AbstractKubernetesResourceProvider; import org.jboss.arquillian.test.api.ArquillianResource; diff --git a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/internal/ReplicationControllerResourceProvider.java b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/internal/ReplicationControllerResourceProvider.java index 5ba8ff174..5e51d977f 100644 --- a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/internal/ReplicationControllerResourceProvider.java +++ b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/internal/ReplicationControllerResourceProvider.java @@ -4,15 +4,15 @@ import java.util.List; import java.util.Map; -import io.fabric8.kubernetes.api.model.v4_0.ReplicationController; -import io.fabric8.kubernetes.api.model.v4_0.ReplicationControllerList; +import io.fabric8.kubernetes.api.model.v4_10.ReplicationController; +import io.fabric8.kubernetes.api.model.v4_10.ReplicationControllerList; import org.arquillian.cube.kubernetes.impl.enricher.AbstractKubernetesResourceProvider; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.arquillian.test.spi.enricher.resource.ResourceProvider; /** - * A {@link ResourceProvider} for {@link io.fabric8.kubernetes.api.model.v4_0.ReplicationControllerList}. + * A {@link ResourceProvider} for {@link io.fabric8.kubernetes.api.model.v4_10.ReplicationControllerList}. * It refers to replication controllers that have been created during the current session. */ public class ReplicationControllerResourceProvider extends AbstractKubernetesResourceProvider { diff --git a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/internal/ServiceListResourceProvider.java b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/internal/ServiceListResourceProvider.java index dc9453db8..2311e9a12 100644 --- a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/internal/ServiceListResourceProvider.java +++ b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/internal/ServiceListResourceProvider.java @@ -3,7 +3,7 @@ import java.lang.annotation.Annotation; import java.util.Map; -import io.fabric8.kubernetes.api.model.v4_0.ServiceList; +import io.fabric8.kubernetes.api.model.v4_10.ServiceList; import org.arquillian.cube.kubernetes.impl.enricher.AbstractKubernetesResourceProvider; import org.jboss.arquillian.test.api.ArquillianResource; diff --git a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/internal/ServiceResourceProvider.java b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/internal/ServiceResourceProvider.java index d55a74746..bdcd46062 100644 --- a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/internal/ServiceResourceProvider.java +++ b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/enricher/internal/ServiceResourceProvider.java @@ -4,15 +4,15 @@ import java.util.List; import java.util.Map; -import io.fabric8.kubernetes.api.model.v4_0.Service; -import io.fabric8.kubernetes.api.model.v4_0.ServiceList; +import io.fabric8.kubernetes.api.model.v4_10.Service; +import io.fabric8.kubernetes.api.model.v4_10.ServiceList; import org.arquillian.cube.kubernetes.impl.enricher.AbstractKubernetesResourceProvider; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.arquillian.test.spi.enricher.resource.ResourceProvider; /** - * A {@link ResourceProvider} for {@link io.fabric8.kubernetes.api.model.v4_0.ServiceList}. + * A {@link ResourceProvider} for {@link io.fabric8.kubernetes.api.model.v4_10.ServiceList}. * It refers to services that have been created during the current session. */ public class ServiceResourceProvider extends AbstractKubernetesResourceProvider { diff --git a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/feedback/DefaultFeedbackProvider.java b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/feedback/DefaultFeedbackProvider.java index 00400c4a8..0593b4815 100644 --- a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/feedback/DefaultFeedbackProvider.java +++ b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/feedback/DefaultFeedbackProvider.java @@ -1,22 +1,22 @@ package org.arquillian.cube.kubernetes.impl.feedback; -import io.fabric8.kubernetes.api.model.v4_0.Container; -import io.fabric8.kubernetes.api.model.v4_0.Endpoints; -import io.fabric8.kubernetes.api.model.v4_0.Event; -import io.fabric8.kubernetes.api.model.v4_0.EventList; -import io.fabric8.kubernetes.api.model.v4_0.HasMetadata; -import io.fabric8.kubernetes.api.model.v4_0.LabelSelectorRequirement; -import io.fabric8.kubernetes.api.model.v4_0.Pod; -import io.fabric8.kubernetes.api.model.v4_0.PodList; -import io.fabric8.kubernetes.api.model.v4_0.PodListBuilder; -import io.fabric8.kubernetes.api.model.v4_0.ReplicationController; -import io.fabric8.kubernetes.api.model.v4_0.Service; -import io.fabric8.kubernetes.api.model.v4_0.apps.Deployment; -import io.fabric8.kubernetes.api.model.v4_0.apps.ReplicaSet; -import io.fabric8.kubernetes.clnt.v4_0.KubernetesClient; -import io.fabric8.kubernetes.clnt.v4_0.Watch; -import io.fabric8.kubernetes.clnt.v4_0.Watcher; -import io.fabric8.kubernetes.clnt.v4_0.dsl.FilterWatchListDeletable; +import io.fabric8.kubernetes.api.model.v4_10.Container; +import io.fabric8.kubernetes.api.model.v4_10.Endpoints; +import io.fabric8.kubernetes.api.model.v4_10.Event; +import io.fabric8.kubernetes.api.model.v4_10.EventList; +import io.fabric8.kubernetes.api.model.v4_10.HasMetadata; +import io.fabric8.kubernetes.api.model.v4_10.LabelSelectorRequirement; +import io.fabric8.kubernetes.api.model.v4_10.Pod; +import io.fabric8.kubernetes.api.model.v4_10.PodList; +import io.fabric8.kubernetes.api.model.v4_10.PodListBuilder; +import io.fabric8.kubernetes.api.model.v4_10.ReplicationController; +import io.fabric8.kubernetes.api.model.v4_10.Service; +import io.fabric8.kubernetes.api.model.v4_10.apps.Deployment; +import io.fabric8.kubernetes.api.model.v4_10.apps.ReplicaSet; +import io.fabric8.kubernetes.clnt.v4_10.KubernetesClient; +import io.fabric8.kubernetes.clnt.v4_10.Watch; +import io.fabric8.kubernetes.clnt.v4_10.Watcher; +import io.fabric8.kubernetes.clnt.v4_10.dsl.FilterWatchListDeletable; import java.util.HashMap; import java.util.Map; import org.arquillian.cube.kubernetes.api.FeedbackProvider; diff --git a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/install/DefaultResourceInstaller.java b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/install/DefaultResourceInstaller.java index a2dd98973..5bc767905 100644 --- a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/install/DefaultResourceInstaller.java +++ b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/install/DefaultResourceInstaller.java @@ -1,9 +1,9 @@ package org.arquillian.cube.kubernetes.impl.install; -import io.fabric8.kubernetes.api.builder.v4_0.Visitor; -import io.fabric8.kubernetes.api.model.v4_0.HasMetadata; -import io.fabric8.kubernetes.clnt.v4_0.KubernetesClient; -import io.fabric8.kubernetes.clnt.v4_0.KubernetesClientException; +import io.fabric8.kubernetes.api.builder.v4_10.Visitor; +import io.fabric8.kubernetes.api.model.v4_10.HasMetadata; +import io.fabric8.kubernetes.clnt.v4_10.KubernetesClient; +import io.fabric8.kubernetes.clnt.v4_10.KubernetesClientException; import java.io.InputStream; import java.net.URL; import java.util.ArrayList; diff --git a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/label/DefaultLabelProvider.java b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/label/DefaultLabelProvider.java index 2611d5f93..d69e46675 100644 --- a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/label/DefaultLabelProvider.java +++ b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/label/DefaultLabelProvider.java @@ -1,6 +1,6 @@ package org.arquillian.cube.kubernetes.impl.label; -import io.fabric8.kubernetes.clnt.v4_0.KubernetesClient; +import io.fabric8.kubernetes.clnt.v4_10.KubernetesClient; import java.util.HashMap; import java.util.Map; import org.arquillian.cube.kubernetes.api.LabelProvider; diff --git a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/namespace/DefaultNamespaceService.java b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/namespace/DefaultNamespaceService.java index ac8c4d23f..e3b2ab34c 100644 --- a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/namespace/DefaultNamespaceService.java +++ b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/namespace/DefaultNamespaceService.java @@ -1,8 +1,8 @@ package org.arquillian.cube.kubernetes.impl.namespace; -import io.fabric8.kubernetes.api.model.v4_0.Namespace; -import io.fabric8.kubernetes.clnt.v4_0.KubernetesClient; -import io.fabric8.openshift.clnt.v4_0.OpenShiftClient; +import io.fabric8.kubernetes.api.model.v4_10.Namespace; +import io.fabric8.kubernetes.clnt.v4_10.KubernetesClient; +import io.fabric8.openshift.clnt.v4_10.OpenShiftClient; import java.util.Collections; import java.util.Map; import java.util.Scanner; diff --git a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/portforward/PortForwarder.java b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/portforward/PortForwarder.java index 975fe9628..291a93f1a 100644 --- a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/portforward/PortForwarder.java +++ b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/portforward/PortForwarder.java @@ -1,7 +1,7 @@ package org.arquillian.cube.kubernetes.impl.portforward; -import io.fabric8.kubernetes.clnt.v4_0.Config; -import io.fabric8.kubernetes.clnt.v4_0.internal.SSLUtils; +import io.fabric8.kubernetes.clnt.v4_10.Config; +import io.fabric8.kubernetes.clnt.v4_10.internal.SSLUtils; import io.undertow.UndertowOptions; import io.undertow.client.ClientCallback; import io.undertow.client.ClientConnection; diff --git a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/requirement/KubernetesRequirement.java b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/requirement/KubernetesRequirement.java index c27695ddb..b3a130dc9 100644 --- a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/requirement/KubernetesRequirement.java +++ b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/requirement/KubernetesRequirement.java @@ -1,8 +1,8 @@ package org.arquillian.cube.kubernetes.impl.requirement; -import io.fabric8.kubernetes.clnt.v4_0.DefaultKubernetesClient; -import io.fabric8.kubernetes.clnt.v4_0.KubernetesClient; -import io.fabric8.kubernetes.clnt.v4_0.utils.URLUtils; +import io.fabric8.kubernetes.clnt.v4_10.DefaultKubernetesClient; +import io.fabric8.kubernetes.clnt.v4_10.KubernetesClient; +import io.fabric8.kubernetes.clnt.v4_10.utils.URLUtils; import java.io.IOException; import java.util.Collections; import java.util.List; diff --git a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/resources/KubernetesResourceHandle.java b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/resources/KubernetesResourceHandle.java index a1a744766..7e8df2600 100644 --- a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/resources/KubernetesResourceHandle.java +++ b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/resources/KubernetesResourceHandle.java @@ -1,7 +1,7 @@ package org.arquillian.cube.kubernetes.impl.resources; -import io.fabric8.kubernetes.api.model.v4_0.HasMetadata; -import io.fabric8.kubernetes.clnt.v4_0.KubernetesClient; +import io.fabric8.kubernetes.api.model.v4_10.HasMetadata; +import io.fabric8.kubernetes.clnt.v4_10.KubernetesClient; import java.io.InputStream; import java.util.List; diff --git a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/resources/KubernetesResourcesApplier.java b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/resources/KubernetesResourcesApplier.java index e0777866c..579de38bc 100644 --- a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/resources/KubernetesResourcesApplier.java +++ b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/resources/KubernetesResourcesApplier.java @@ -1,7 +1,7 @@ package org.arquillian.cube.kubernetes.impl.resources; -import io.fabric8.kubernetes.api.model.v4_0.HasMetadata; -import io.fabric8.kubernetes.clnt.v4_0.KubernetesClient; +import io.fabric8.kubernetes.api.model.v4_10.HasMetadata; +import io.fabric8.kubernetes.clnt.v4_10.KubernetesClient; import org.arquillian.cube.kubernetes.annotations.KubernetesResource; import org.arquillian.cube.kubernetes.impl.resolver.ResourceResolver; import org.arquillian.cube.kubernetes.impl.utils.RunnerExpressionParser; diff --git a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/visitor/CompositeVisitor.java b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/visitor/CompositeVisitor.java index 6723bfe3f..858291f5c 100644 --- a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/visitor/CompositeVisitor.java +++ b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/visitor/CompositeVisitor.java @@ -1,7 +1,7 @@ package org.arquillian.cube.kubernetes.impl.visitor; -import io.fabric8.kubernetes.api.builder.v4_0.TypedVisitor; -import io.fabric8.kubernetes.api.builder.v4_0.Visitor; +import io.fabric8.kubernetes.api.builder.v4_10.TypedVisitor; +import io.fabric8.kubernetes.api.builder.v4_10.Visitor; import java.lang.reflect.Method; import java.util.List; diff --git a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/visitor/DockerRegistryVisitor.java b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/visitor/DockerRegistryVisitor.java index f6861d9ad..fcdf79167 100644 --- a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/visitor/DockerRegistryVisitor.java +++ b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/visitor/DockerRegistryVisitor.java @@ -1,7 +1,7 @@ package org.arquillian.cube.kubernetes.impl.visitor; -import io.fabric8.kubernetes.api.builder.v4_0.TypedVisitor; -import io.fabric8.kubernetes.api.model.v4_0.ContainerBuilder; +import io.fabric8.kubernetes.api.builder.v4_10.TypedVisitor; +import io.fabric8.kubernetes.api.model.v4_10.ContainerBuilder; import java.util.regex.Matcher; import java.util.regex.Pattern; import org.arquillian.cube.impl.util.Strings; diff --git a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/visitor/LoggingVisitor.java b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/visitor/LoggingVisitor.java index a8678c43a..4f17f5490 100644 --- a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/visitor/LoggingVisitor.java +++ b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/visitor/LoggingVisitor.java @@ -1,7 +1,7 @@ package org.arquillian.cube.kubernetes.impl.visitor; -import io.fabric8.kubernetes.api.builder.v4_0.TypedVisitor; -import io.fabric8.kubernetes.api.model.v4_0.HasMetadata; +import io.fabric8.kubernetes.api.builder.v4_10.TypedVisitor; +import io.fabric8.kubernetes.api.model.v4_10.HasMetadata; import org.arquillian.cube.kubernetes.api.Logger; import org.jboss.arquillian.core.api.Instance; import org.jboss.arquillian.core.api.annotation.Inject; diff --git a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/visitor/NamespaceVisitor.java b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/visitor/NamespaceVisitor.java index 0c473f078..64235799f 100644 --- a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/visitor/NamespaceVisitor.java +++ b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/visitor/NamespaceVisitor.java @@ -1,11 +1,11 @@ package org.arquillian.cube.kubernetes.impl.visitor; -import io.fabric8.kubernetes.api.builder.v4_0.TypedVisitor; -import io.fabric8.kubernetes.api.builder.v4_0.VisitableBuilder; -import io.fabric8.kubernetes.api.builder.v4_0.Visitor; -import io.fabric8.kubernetes.api.model.v4_0.HasMetadata; -import io.fabric8.kubernetes.api.model.v4_0.ObjectMetaBuilder; -import io.fabric8.kubernetes.clnt.v4_0.HasMetadataVisitiableBuilder; +import io.fabric8.kubernetes.api.builder.v4_10.TypedVisitor; +import io.fabric8.kubernetes.api.builder.v4_10.VisitableBuilder; +import io.fabric8.kubernetes.api.builder.v4_10.Visitor; +import io.fabric8.kubernetes.api.model.v4_10.HasMetadata; +import io.fabric8.kubernetes.api.model.v4_10.ObjectMetaBuilder; +import io.fabric8.kubernetes.clnt.v4_10.HasMetadataVisitiableBuilder; import org.arquillian.cube.kubernetes.api.Configuration; import org.jboss.arquillian.core.api.Instance; import org.jboss.arquillian.core.api.annotation.Inject; diff --git a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/visitor/ServiceAccountVisitor.java b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/visitor/ServiceAccountVisitor.java index 5533ecb84..d1e1d2e96 100644 --- a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/visitor/ServiceAccountVisitor.java +++ b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/visitor/ServiceAccountVisitor.java @@ -1,8 +1,8 @@ package org.arquillian.cube.kubernetes.impl.visitor; -import io.fabric8.kubernetes.api.builder.v4_0.Visitor; -import io.fabric8.kubernetes.api.model.v4_0.PodSpecBuilder; -import io.fabric8.kubernetes.clnt.v4_0.KubernetesClient; +import io.fabric8.kubernetes.api.builder.v4_10.Visitor; +import io.fabric8.kubernetes.api.model.v4_10.PodSpecBuilder; +import io.fabric8.kubernetes.clnt.v4_10.KubernetesClient; import org.arquillian.cube.impl.util.Strings; import org.arquillian.cube.kubernetes.api.Configuration; import org.arquillian.cube.kubernetes.api.Logger; diff --git a/kubernetes/kubernetes/src/test/java/org/arquillian/cube/kubernetes/impl/MockTest.java b/kubernetes/kubernetes/src/test/java/org/arquillian/cube/kubernetes/impl/MockTest.java index 8f684a34d..7840f3720 100644 --- a/kubernetes/kubernetes/src/test/java/org/arquillian/cube/kubernetes/impl/MockTest.java +++ b/kubernetes/kubernetes/src/test/java/org/arquillian/cube/kubernetes/impl/MockTest.java @@ -1,22 +1,22 @@ package org.arquillian.cube.kubernetes.impl; -import io.fabric8.kubernetes.api.model.v4_0.Endpoints; -import io.fabric8.kubernetes.api.model.v4_0.EndpointsBuilder; -import io.fabric8.kubernetes.api.model.v4_0.EndpointsListBuilder; -import io.fabric8.kubernetes.api.model.v4_0.NamespaceBuilder; -import io.fabric8.kubernetes.api.model.v4_0.Pod; -import io.fabric8.kubernetes.api.model.v4_0.PodBuilder; -import io.fabric8.kubernetes.api.model.v4_0.PodListBuilder; -import io.fabric8.kubernetes.api.model.v4_0.ReplicationController; -import io.fabric8.kubernetes.api.model.v4_0.ReplicationControllerBuilder; -import io.fabric8.kubernetes.api.model.v4_0.ReplicationControllerListBuilder; -import io.fabric8.kubernetes.api.model.v4_0.Service; -import io.fabric8.kubernetes.api.model.v4_0.ServiceBuilder; -import io.fabric8.kubernetes.api.model.v4_0.ServiceListBuilder; -import io.fabric8.kubernetes.api.model.v4_0.WatchEvent; -import io.fabric8.kubernetes.api.model.v4_0.apps.ReplicaSetBuilder; -import io.fabric8.kubernetes.clnt.v4_0.Config; -import io.fabric8.kubernetes.clnt.v4_0.server.mock.KubernetesMockServer; +import io.fabric8.kubernetes.api.model.v4_10.Endpoints; +import io.fabric8.kubernetes.api.model.v4_10.EndpointsBuilder; +import io.fabric8.kubernetes.api.model.v4_10.EndpointsListBuilder; +import io.fabric8.kubernetes.api.model.v4_10.NamespaceBuilder; +import io.fabric8.kubernetes.api.model.v4_10.Pod; +import io.fabric8.kubernetes.api.model.v4_10.PodBuilder; +import io.fabric8.kubernetes.api.model.v4_10.PodListBuilder; +import io.fabric8.kubernetes.api.model.v4_10.ReplicationController; +import io.fabric8.kubernetes.api.model.v4_10.ReplicationControllerBuilder; +import io.fabric8.kubernetes.api.model.v4_10.ReplicationControllerListBuilder; +import io.fabric8.kubernetes.api.model.v4_10.Service; +import io.fabric8.kubernetes.api.model.v4_10.ServiceBuilder; +import io.fabric8.kubernetes.api.model.v4_10.ServiceListBuilder; +import io.fabric8.kubernetes.api.model.v4_10.WatchEvent; +import io.fabric8.kubernetes.api.model.v4_10.apps.ReplicaSetBuilder; +import io.fabric8.kubernetes.clnt.v4_10.Config; +import io.fabric8.kubernetes.clnt.v4_10.server.mock.KubernetesMockServer; import java.io.IOException; import org.arquillian.cube.kubernetes.api.Configuration; diff --git a/kubernetes/reporter/src/main/java/org/arquillian/cube/kubernetes/reporter/TakeKubernetesResourcesInformation.java b/kubernetes/reporter/src/main/java/org/arquillian/cube/kubernetes/reporter/TakeKubernetesResourcesInformation.java index f88b9d02d..ed7f2fdc6 100644 --- a/kubernetes/reporter/src/main/java/org/arquillian/cube/kubernetes/reporter/TakeKubernetesResourcesInformation.java +++ b/kubernetes/reporter/src/main/java/org/arquillian/cube/kubernetes/reporter/TakeKubernetesResourcesInformation.java @@ -1,6 +1,6 @@ package org.arquillian.cube.kubernetes.reporter; -import io.fabric8.kubernetes.clnt.v4_0.KubernetesClient; +import io.fabric8.kubernetes.clnt.v4_10.KubernetesClient; import java.io.File; import java.io.IOException; import java.net.URL; diff --git a/kubernetes/reporter/src/test/java/org/arquillian/cube/kubernetes/reporter/TakeKubernetesResourcesInformationTest.java b/kubernetes/reporter/src/test/java/org/arquillian/cube/kubernetes/reporter/TakeKubernetesResourcesInformationTest.java index 7378bd3f3..cf800231b 100644 --- a/kubernetes/reporter/src/test/java/org/arquillian/cube/kubernetes/reporter/TakeKubernetesResourcesInformationTest.java +++ b/kubernetes/reporter/src/test/java/org/arquillian/cube/kubernetes/reporter/TakeKubernetesResourcesInformationTest.java @@ -1,16 +1,16 @@ package org.arquillian.cube.kubernetes.reporter; -import io.fabric8.kubernetes.api.model.v4_0.NamespaceBuilder; -import io.fabric8.kubernetes.api.model.v4_0.Pod; -import io.fabric8.kubernetes.api.model.v4_0.PodBuilder; -import io.fabric8.kubernetes.api.model.v4_0.PodListBuilder; -import io.fabric8.kubernetes.api.model.v4_0.ReplicationController; -import io.fabric8.kubernetes.api.model.v4_0.ReplicationControllerBuilder; -import io.fabric8.kubernetes.api.model.v4_0.ReplicationControllerListBuilder; -import io.fabric8.kubernetes.api.model.v4_0.Service; -import io.fabric8.kubernetes.api.model.v4_0.ServiceBuilder; -import io.fabric8.kubernetes.api.model.v4_0.ServiceListBuilder; -import io.fabric8.kubernetes.clnt.v4_0.server.mock.KubernetesMockServer; +import io.fabric8.kubernetes.api.model.v4_10.NamespaceBuilder; +import io.fabric8.kubernetes.api.model.v4_10.Pod; +import io.fabric8.kubernetes.api.model.v4_10.PodBuilder; +import io.fabric8.kubernetes.api.model.v4_10.PodListBuilder; +import io.fabric8.kubernetes.api.model.v4_10.ReplicationController; +import io.fabric8.kubernetes.api.model.v4_10.ReplicationControllerBuilder; +import io.fabric8.kubernetes.api.model.v4_10.ReplicationControllerListBuilder; +import io.fabric8.kubernetes.api.model.v4_10.Service; +import io.fabric8.kubernetes.api.model.v4_10.ServiceBuilder; +import io.fabric8.kubernetes.api.model.v4_10.ServiceListBuilder; +import io.fabric8.kubernetes.clnt.v4_10.server.mock.KubernetesMockServer; import java.io.IOException; import java.net.URL; import java.util.Collection; diff --git a/openshift/ftest-openshift-assistant-operational-methods/src/test/java/org/arquillian/cube/openshift/operational/methods/OpenShiftAssistantOperationalMethodsIT.java b/openshift/ftest-openshift-assistant-operational-methods/src/test/java/org/arquillian/cube/openshift/operational/methods/OpenShiftAssistantOperationalMethodsIT.java index 4be527bc9..950c2472f 100644 --- a/openshift/ftest-openshift-assistant-operational-methods/src/test/java/org/arquillian/cube/openshift/operational/methods/OpenShiftAssistantOperationalMethodsIT.java +++ b/openshift/ftest-openshift-assistant-operational-methods/src/test/java/org/arquillian/cube/openshift/operational/methods/OpenShiftAssistantOperationalMethodsIT.java @@ -1,9 +1,9 @@ package org.arquillian.cube.openshift.operational.methods; -import io.fabric8.kubernetes.api.model.v4_0.ObjectMeta; -import io.fabric8.kubernetes.api.model.v4_0.Pod; -import io.fabric8.kubernetes.clnt.v4_0.internal.readiness.Readiness; -import io.fabric8.openshift.api.model.v4_0.Project; +import io.fabric8.kubernetes.api.model.v4_10.ObjectMeta; +import io.fabric8.kubernetes.api.model.v4_10.Pod; +import io.fabric8.kubernetes.clnt.v4_10.internal.readiness.Readiness; +import io.fabric8.openshift.api.model.v4_10.Project; import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.Response; diff --git a/openshift/ftest-openshift-assistant/src/test/java/org/arquillian/cube/openshift/standalone/HelloWorldOpenShiftAssistantIT.java b/openshift/ftest-openshift-assistant/src/test/java/org/arquillian/cube/openshift/standalone/HelloWorldOpenShiftAssistantIT.java index 8fe0fd1f7..aa1f59241 100644 --- a/openshift/ftest-openshift-assistant/src/test/java/org/arquillian/cube/openshift/standalone/HelloWorldOpenShiftAssistantIT.java +++ b/openshift/ftest-openshift-assistant/src/test/java/org/arquillian/cube/openshift/standalone/HelloWorldOpenShiftAssistantIT.java @@ -15,8 +15,8 @@ import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; -import io.fabric8.kubernetes.api.model.v4_0.Pod; -import io.fabric8.kubernetes.clnt.v4_0.internal.readiness.Readiness; +import io.fabric8.kubernetes.api.model.v4_10.Pod; +import io.fabric8.kubernetes.clnt.v4_10.internal.readiness.Readiness; import static org.assertj.core.api.Assertions.assertThat; diff --git a/openshift/ftest-standalone/src/test/java/org/arquillian/cube/openshift/standalone/HelloWorldIT.java b/openshift/ftest-standalone/src/test/java/org/arquillian/cube/openshift/standalone/HelloWorldIT.java index 00e3de409..ea185ed50 100644 --- a/openshift/ftest-standalone/src/test/java/org/arquillian/cube/openshift/standalone/HelloWorldIT.java +++ b/openshift/ftest-standalone/src/test/java/org/arquillian/cube/openshift/standalone/HelloWorldIT.java @@ -1,6 +1,6 @@ package org.arquillian.cube.openshift.standalone; -import io.fabric8.kubernetes.api.model.v4_0.Service; +import io.fabric8.kubernetes.api.model.v4_10.Service; import io.fabric8.openshift.client.OpenShiftClient; import java.io.IOException; import java.net.URL; diff --git a/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/adapter/OpenShiftAdapterFactory.java b/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/adapter/OpenShiftAdapterFactory.java index 68b17b64d..0d77afe73 100644 --- a/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/adapter/OpenShiftAdapterFactory.java +++ b/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/adapter/OpenShiftAdapterFactory.java @@ -23,7 +23,7 @@ package org.arquillian.cube.openshift.impl.adapter; -import io.fabric8.openshift.clnt.v4_0.NamespacedOpenShiftClient; +import io.fabric8.openshift.clnt.v4_10.NamespacedOpenShiftClient; import java.util.ServiceLoader; import java.util.logging.Logger; import org.arquillian.cube.openshift.impl.client.CubeOpenShiftConfiguration; diff --git a/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/adapter/OpenShiftAdapterProvider.java b/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/adapter/OpenShiftAdapterProvider.java index 47840fce5..0145f02d9 100644 --- a/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/adapter/OpenShiftAdapterProvider.java +++ b/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/adapter/OpenShiftAdapterProvider.java @@ -23,7 +23,7 @@ package org.arquillian.cube.openshift.impl.adapter; -import io.fabric8.openshift.clnt.v4_0.NamespacedOpenShiftClient; +import io.fabric8.openshift.clnt.v4_10.NamespacedOpenShiftClient; import org.arquillian.cube.openshift.impl.client.CubeOpenShiftConfiguration; /** diff --git a/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/client/CubeOpenShiftConfiguration.java b/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/client/CubeOpenShiftConfiguration.java index f2250d6b5..b3a579647 100644 --- a/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/client/CubeOpenShiftConfiguration.java +++ b/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/client/CubeOpenShiftConfiguration.java @@ -1,7 +1,7 @@ package org.arquillian.cube.openshift.impl.client; -import io.fabric8.kubernetes.clnt.v4_0.Config; -import io.fabric8.kubernetes.clnt.v4_0.ConfigBuilder; +import io.fabric8.kubernetes.clnt.v4_10.Config; +import io.fabric8.kubernetes.clnt.v4_10.ConfigBuilder; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; import java.io.Serializable; @@ -23,7 +23,7 @@ import static org.arquillian.cube.impl.util.ConfigUtil.getLongProperty; import static org.arquillian.cube.impl.util.ConfigUtil.getStringProperty; -@Buildable(builderPackage = "io.fabric8.kubernetes.api.builder.v4_0", generateBuilderPackage = false, editableEnabled = false, refs = { +@Buildable(builderPackage = "io.fabric8.kubernetes.api.builder.v4_10", generateBuilderPackage = false, editableEnabled = false, refs = { @BuildableReference(DefaultConfiguration.class) }) public class CubeOpenShiftConfiguration extends DefaultConfiguration implements diff --git a/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/client/CubeOpenShiftRegistrar.java b/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/client/CubeOpenShiftRegistrar.java index 83cf09ee6..2d198974e 100644 --- a/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/client/CubeOpenShiftRegistrar.java +++ b/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/client/CubeOpenShiftRegistrar.java @@ -1,8 +1,8 @@ package org.arquillian.cube.openshift.impl.client; -import io.fabric8.kubernetes.api.model.v4_0.HasMetadata; -import io.fabric8.kubernetes.api.model.v4_0.Pod; -import io.fabric8.kubernetes.api.model.v4_0.Service; +import io.fabric8.kubernetes.api.model.v4_10.HasMetadata; +import io.fabric8.kubernetes.api.model.v4_10.Pod; +import io.fabric8.kubernetes.api.model.v4_10.Service; import java.io.ByteArrayInputStream; import java.io.File; import java.io.FileInputStream; diff --git a/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/client/GitServer.java b/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/client/GitServer.java index b47ec300b..6852136f7 100644 --- a/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/client/GitServer.java +++ b/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/client/GitServer.java @@ -1,11 +1,11 @@ package org.arquillian.cube.openshift.impl.client; -import io.fabric8.kubernetes.api.model.v4_0.Pod; -import io.fabric8.kubernetes.api.model.v4_0.PodBuilder; -import io.fabric8.kubernetes.api.model.v4_0.Service; -import io.fabric8.kubernetes.api.model.v4_0.ServiceBuilder; -import io.fabric8.kubernetes.clnt.v4_0.Config; -import io.fabric8.openshift.clnt.v4_0.NamespacedOpenShiftClient; +import io.fabric8.kubernetes.api.model.v4_10.Pod; +import io.fabric8.kubernetes.api.model.v4_10.PodBuilder; +import io.fabric8.kubernetes.api.model.v4_10.Service; +import io.fabric8.kubernetes.api.model.v4_10.ServiceBuilder; +import io.fabric8.kubernetes.clnt.v4_10.Config; +import io.fabric8.openshift.clnt.v4_10.NamespacedOpenShiftClient; import java.io.File; import java.net.URI; import java.util.HashMap; @@ -19,14 +19,14 @@ public class GitServer { private static final String GIT_SERVICE = "git"; private static final String GIT_LOCALPORT = "10001"; private static final String GIT_REMOTEPORT = "8080"; - private io.fabric8.openshift.clnt.v4_0.OpenShiftClient client; + private io.fabric8.openshift.clnt.v4_10.OpenShiftClient client; private String namespace; private Pod server; private PortForwarder forwarder; private Config config; private Service service; - public GitServer(io.fabric8.openshift.clnt.v4_0.OpenShiftClient client, Config config, String namespace) { + public GitServer(io.fabric8.openshift.clnt.v4_10.OpenShiftClient client, Config config, String namespace) { this.client = client; this.config = config; this.namespace = namespace; diff --git a/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/client/OpenShiftAssistant.java b/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/client/OpenShiftAssistant.java index bcd7b8bec..d639d1cc7 100644 --- a/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/client/OpenShiftAssistant.java +++ b/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/client/OpenShiftAssistant.java @@ -16,11 +16,11 @@ import org.arquillian.cube.kubernetes.impl.KubernetesAssistant; -import io.fabric8.kubernetes.api.model.v4_0.HasMetadata; -import io.fabric8.openshift.api.model.v4_0.DeploymentConfig; -import io.fabric8.openshift.api.model.v4_0.Project; -import io.fabric8.openshift.api.model.v4_0.Route; -import io.fabric8.openshift.clnt.v4_0.OpenShiftClient; +import io.fabric8.kubernetes.api.model.v4_10.HasMetadata; +import io.fabric8.openshift.api.model.v4_10.DeploymentConfig; +import io.fabric8.openshift.api.model.v4_10.Project; +import io.fabric8.openshift.api.model.v4_10.Route; +import io.fabric8.openshift.clnt.v4_10.OpenShiftClient; /** * Class that allows you to deploy undeploy and wait for resources programmatically in a test. diff --git a/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/client/OpenShiftAssistantTemplate.java b/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/client/OpenShiftAssistantTemplate.java index 6ee7b5d20..7b20734cd 100644 --- a/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/client/OpenShiftAssistantTemplate.java +++ b/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/client/OpenShiftAssistantTemplate.java @@ -1,11 +1,11 @@ package org.arquillian.cube.openshift.impl.client; -import io.fabric8.kubernetes.api.model.v4_0.KubernetesList; -import io.fabric8.openshift.api.model.v4_0.DoneableTemplate; -import io.fabric8.openshift.api.model.v4_0.Template; -import io.fabric8.openshift.clnt.v4_0.OpenShiftClient; -import io.fabric8.openshift.clnt.v4_0.ParameterValue; -import io.fabric8.openshift.clnt.v4_0.dsl.TemplateResource; +import io.fabric8.kubernetes.api.model.v4_10.KubernetesList; +import io.fabric8.openshift.api.model.v4_10.DoneableTemplate; +import io.fabric8.openshift.api.model.v4_10.Template; +import io.fabric8.openshift.clnt.v4_10.OpenShiftClient; +import io.fabric8.openshift.clnt.v4_10.ParameterValue; +import io.fabric8.openshift.clnt.v4_10.dsl.TemplateResource; import java.io.IOException; import java.io.InputStream; diff --git a/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/client/OpenShiftClient.java b/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/client/OpenShiftClient.java index c871f35f2..688457863 100644 --- a/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/client/OpenShiftClient.java +++ b/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/client/OpenShiftClient.java @@ -1,21 +1,21 @@ package org.arquillian.cube.openshift.impl.client; -import io.fabric8.kubernetes.api.model.v4_0.HasMetadata; -import io.fabric8.kubernetes.api.model.v4_0.KubernetesListBuilder; -import io.fabric8.kubernetes.api.model.v4_0.KubernetesResource; -import io.fabric8.kubernetes.api.model.v4_0.Pod; -import io.fabric8.kubernetes.api.model.v4_0.PodBuilder; -import io.fabric8.kubernetes.api.model.v4_0.Service; -import io.fabric8.kubernetes.clnt.v4_0.Config; -import io.fabric8.openshift.api.model.v4_0.Build; -import io.fabric8.openshift.api.model.v4_0.BuildConfig; -import io.fabric8.openshift.api.model.v4_0.BuildConfigBuilder; -import io.fabric8.openshift.api.model.v4_0.BuildRequest; -import io.fabric8.openshift.api.model.v4_0.BuildRequestBuilder; -import io.fabric8.openshift.api.model.v4_0.ImageStream; -import io.fabric8.openshift.api.model.v4_0.ImageStreamBuilder; -import io.fabric8.openshift.clnt.v4_0.DefaultOpenShiftClient; -import io.fabric8.openshift.clnt.v4_0.NamespacedOpenShiftClient; +import io.fabric8.kubernetes.api.model.v4_10.HasMetadata; +import io.fabric8.kubernetes.api.model.v4_10.KubernetesListBuilder; +import io.fabric8.kubernetes.api.model.v4_10.KubernetesResource; +import io.fabric8.kubernetes.api.model.v4_10.Pod; +import io.fabric8.kubernetes.api.model.v4_10.PodBuilder; +import io.fabric8.kubernetes.api.model.v4_10.Service; +import io.fabric8.kubernetes.clnt.v4_10.Config; +import io.fabric8.openshift.api.model.v4_10.Build; +import io.fabric8.openshift.api.model.v4_10.BuildConfig; +import io.fabric8.openshift.api.model.v4_10.BuildConfigBuilder; +import io.fabric8.openshift.api.model.v4_10.BuildRequest; +import io.fabric8.openshift.api.model.v4_10.BuildRequestBuilder; +import io.fabric8.openshift.api.model.v4_10.ImageStream; +import io.fabric8.openshift.api.model.v4_10.ImageStreamBuilder; +import io.fabric8.openshift.clnt.v4_10.DefaultOpenShiftClient; +import io.fabric8.openshift.clnt.v4_10.NamespacedOpenShiftClient; import java.io.File; import java.net.URI; import java.util.ArrayList; @@ -37,7 +37,7 @@ public class OpenShiftClient { private GitServer gitserver; private boolean keepAliveGitServer; - public OpenShiftClient(io.fabric8.openshift.clnt.v4_0.OpenShiftClient client, Config config, String namespace, boolean keepAliveGitServer) { + public OpenShiftClient(io.fabric8.openshift.clnt.v4_10.OpenShiftClient client, Config config, String namespace, boolean keepAliveGitServer) { this.kubernetes = (NamespacedOpenShiftClient) client; this.namespace = namespace; this.keepAliveGitServer = keepAliveGitServer; @@ -195,7 +195,7 @@ public NamespacedOpenShiftClient getClient() { return kubernetes; } - public io.fabric8.openshift.clnt.v4_0.OpenShiftClient getClientExt() { + public io.fabric8.openshift.clnt.v4_10.OpenShiftClient getClientExt() { return kubernetes; } diff --git a/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/client/OpenShiftClientCreator.java b/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/client/OpenShiftClientCreator.java index f9790373e..d0048f6c0 100644 --- a/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/client/OpenShiftClientCreator.java +++ b/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/client/OpenShiftClientCreator.java @@ -1,7 +1,7 @@ package org.arquillian.cube.openshift.impl.client; -import io.fabric8.kubernetes.clnt.v4_0.Config; -import io.fabric8.kubernetes.clnt.v4_0.KubernetesClient; +import io.fabric8.kubernetes.clnt.v4_10.Config; +import io.fabric8.kubernetes.clnt.v4_10.KubernetesClient; import org.arquillian.cube.kubernetes.api.Configuration; import org.arquillian.cube.kubernetes.impl.event.AfterStart; import org.jboss.arquillian.core.api.Instance; @@ -29,8 +29,8 @@ public void createClient(@Observes AfterStart afterStart, Configuration conf) { final CubeOpenShiftConfiguration configuration = (CubeOpenShiftConfiguration) conf; final KubernetesClient kubernetesClient = kubernetesClientInstance.get(); - if (kubernetesClient != null && kubernetesClient.isAdaptable(io.fabric8.openshift.clnt.v4_0.OpenShiftClient.class)) { - io.fabric8.openshift.clnt.v4_0.OpenShiftClient client = kubernetesClient.adapt(io.fabric8.openshift.clnt.v4_0.OpenShiftClient.class); + if (kubernetesClient != null && kubernetesClient.isAdaptable(io.fabric8.openshift.clnt.v4_10.OpenShiftClient.class)) { + io.fabric8.openshift.clnt.v4_10.OpenShiftClient client = kubernetesClient.adapt(io.fabric8.openshift.clnt.v4_10.OpenShiftClient.class); openShiftClientProducer.set( createClient(client, client.getConfiguration(), client.getNamespace(), configuration.shouldKeepAliveGitServer())); @@ -41,7 +41,7 @@ public void clean(@Observes AfterSuite event, OpenShiftClient client) throws Exc client.shutdown(); } - public OpenShiftClient createClient(io.fabric8.openshift.clnt.v4_0.OpenShiftClient client, Config openShiftConfig, String namespace, boolean keepAliveGitServer) { + public OpenShiftClient createClient(io.fabric8.openshift.clnt.v4_10.OpenShiftClient client, Config openShiftConfig, String namespace, boolean keepAliveGitServer) { return new OpenShiftClient(client, openShiftConfig, namespace, keepAliveGitServer); } } diff --git a/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/client/OpenShiftRouteLocator.java b/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/client/OpenShiftRouteLocator.java index 09feaa177..70bd8bce1 100644 --- a/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/client/OpenShiftRouteLocator.java +++ b/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/client/OpenShiftRouteLocator.java @@ -1,6 +1,6 @@ package org.arquillian.cube.openshift.impl.client; -import io.fabric8.openshift.api.model.v4_0.Route; +import io.fabric8.openshift.api.model.v4_10.Route; import org.arquillian.cube.kubernetes.api.Configuration; import org.jboss.arquillian.core.api.Instance; diff --git a/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/client/ResourceUtil.java b/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/client/ResourceUtil.java index dc9dff6bc..110a0c923 100644 --- a/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/client/ResourceUtil.java +++ b/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/client/ResourceUtil.java @@ -1,17 +1,17 @@ package org.arquillian.cube.openshift.impl.client; -import io.fabric8.kubernetes.api.model.v4_0.Container; -import io.fabric8.kubernetes.api.model.v4_0.ContainerPort; -import io.fabric8.kubernetes.api.model.v4_0.Pod; -import io.fabric8.kubernetes.api.model.v4_0.PodCondition; -import io.fabric8.kubernetes.api.model.v4_0.PodStatus; -import io.fabric8.kubernetes.api.model.v4_0.Service; -import io.fabric8.kubernetes.api.model.v4_0.ServicePort; -import io.fabric8.kubernetes.clnt.v4_0.KubernetesClient; -import io.fabric8.kubernetes.clnt.v4_0.KubernetesClientException; -import io.fabric8.kubernetes.clnt.v4_0.Watch; -import io.fabric8.kubernetes.clnt.v4_0.Watcher; -import io.fabric8.openshift.api.model.v4_0.Build; +import io.fabric8.kubernetes.api.model.v4_10.Container; +import io.fabric8.kubernetes.api.model.v4_10.ContainerPort; +import io.fabric8.kubernetes.api.model.v4_10.Pod; +import io.fabric8.kubernetes.api.model.v4_10.PodCondition; +import io.fabric8.kubernetes.api.model.v4_10.PodStatus; +import io.fabric8.kubernetes.api.model.v4_10.Service; +import io.fabric8.kubernetes.api.model.v4_10.ServicePort; +import io.fabric8.kubernetes.clnt.v4_10.KubernetesClient; +import io.fabric8.kubernetes.clnt.v4_10.KubernetesClientException; +import io.fabric8.kubernetes.clnt.v4_10.Watch; +import io.fabric8.kubernetes.clnt.v4_10.Watcher; +import io.fabric8.openshift.api.model.v4_10.Build; import org.arquillian.cube.spi.Binding; import java.net.HttpURLConnection; @@ -74,7 +74,7 @@ private static boolean isReady(PodStatus status) { return true; } - public static Build waitForComplete(io.fabric8.openshift.clnt.v4_0.OpenShiftClient kubernetes, Build resource) + public static Build waitForComplete(io.fabric8.openshift.clnt.v4_10.OpenShiftClient kubernetes, Build resource) throws Exception { final AtomicReference holder = new AtomicReference(); final CountDownLatch latch = new CountDownLatch(1); diff --git a/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/client/metadata/CopyFromContainer.java b/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/client/metadata/CopyFromContainer.java index b0fa59d76..b7dad0379 100644 --- a/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/client/metadata/CopyFromContainer.java +++ b/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/client/metadata/CopyFromContainer.java @@ -1,6 +1,6 @@ package org.arquillian.cube.openshift.impl.client.metadata; -import io.fabric8.kubernetes.clnt.v4_0.dsl.ExecWatch; +import io.fabric8.kubernetes.clnt.v4_10.dsl.ExecWatch; import java.io.File; import java.io.IOException; diff --git a/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/dns/ArqCubeNameService.java b/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/dns/ArqCubeNameService.java index efbadec49..d7440a182 100644 --- a/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/dns/ArqCubeNameService.java +++ b/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/dns/ArqCubeNameService.java @@ -1,6 +1,6 @@ package org.arquillian.cube.openshift.impl.dns; -import io.fabric8.openshift.api.model.v4_0.RouteList; +import io.fabric8.openshift.api.model.v4_10.RouteList; import sun.net.spi.nameservice.NameService; import java.net.InetAddress; diff --git a/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/enricher/AbstractOpenshiftResourceProvider.java b/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/enricher/AbstractOpenshiftResourceProvider.java index 690637891..841604f41 100644 --- a/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/enricher/AbstractOpenshiftResourceProvider.java +++ b/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/enricher/AbstractOpenshiftResourceProvider.java @@ -1,6 +1,6 @@ package org.arquillian.cube.openshift.impl.enricher; -import io.fabric8.openshift.clnt.v4_0.OpenShiftClient; +import io.fabric8.openshift.clnt.v4_10.OpenShiftClient; import org.arquillian.cube.kubernetes.impl.enricher.AbstractKubernetesResourceProvider; public abstract class AbstractOpenshiftResourceProvider extends AbstractKubernetesResourceProvider { diff --git a/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/enricher/RouteURLEnricher.java b/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/enricher/RouteURLEnricher.java index 47fed8037..a62568efa 100644 --- a/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/enricher/RouteURLEnricher.java +++ b/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/enricher/RouteURLEnricher.java @@ -1,6 +1,6 @@ package org.arquillian.cube.openshift.impl.enricher; -import io.fabric8.openshift.api.model.v4_0.Route; +import io.fabric8.openshift.api.model.v4_10.Route; import org.arquillian.cube.impl.ConfigurationParameters; import org.arquillian.cube.impl.EnricherExpressionResolver; import org.arquillian.cube.impl.util.ReflectionUtil; diff --git a/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/enricher/external/DeploymentConfigListResourceProvider.java b/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/enricher/external/DeploymentConfigListResourceProvider.java index a45fb20e8..4616c71dc 100644 --- a/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/enricher/external/DeploymentConfigListResourceProvider.java +++ b/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/enricher/external/DeploymentConfigListResourceProvider.java @@ -2,8 +2,8 @@ import java.lang.annotation.Annotation; -import io.fabric8.kubernetes.api.model.v4_0.apps.DeploymentList; -import io.fabric8.openshift.api.model.v4_0.DeploymentConfigList; +import io.fabric8.kubernetes.api.model.v4_10.apps.DeploymentList; +import io.fabric8.openshift.api.model.v4_10.DeploymentConfigList; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.arquillian.test.spi.enricher.resource.ResourceProvider; diff --git a/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/enricher/external/DeploymentConfigResourceProvider.java b/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/enricher/external/DeploymentConfigResourceProvider.java index 600edc429..e5ee7e73b 100644 --- a/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/enricher/external/DeploymentConfigResourceProvider.java +++ b/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/enricher/external/DeploymentConfigResourceProvider.java @@ -2,7 +2,7 @@ import java.lang.annotation.Annotation; -import io.fabric8.openshift.api.model.v4_0.DeploymentConfig; +import io.fabric8.openshift.api.model.v4_10.DeploymentConfig; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.arquillian.test.spi.enricher.resource.ResourceProvider; diff --git a/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/enricher/external/OpenshiftClientResourceProvider.java b/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/enricher/external/OpenshiftClientResourceProvider.java index 89ff10bb1..b5b5c0abd 100644 --- a/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/enricher/external/OpenshiftClientResourceProvider.java +++ b/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/enricher/external/OpenshiftClientResourceProvider.java @@ -1,6 +1,6 @@ package org.arquillian.cube.openshift.impl.enricher.external; -import io.fabric8.openshift.clnt.v4_0.DefaultOpenShiftClient; +import io.fabric8.openshift.clnt.v4_10.DefaultOpenShiftClient; import org.arquillian.cube.kubernetes.impl.enricher.AbstractKubernetesResourceProvider; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.arquillian.test.spi.enricher.resource.ResourceProvider; @@ -8,9 +8,9 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Constructor; -import io.fabric8.kubernetes.clnt.v4_0.Config; -import io.fabric8.kubernetes.clnt.v4_0.KubernetesClient; -import io.fabric8.openshift.clnt.v4_0.OpenShiftClient; +import io.fabric8.kubernetes.clnt.v4_10.Config; +import io.fabric8.kubernetes.clnt.v4_10.KubernetesClient; +import io.fabric8.openshift.clnt.v4_10.OpenShiftClient; /** * A {@link ResourceProvider} for {@link OpenShiftClient}. diff --git a/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/enricher/internal/DeploymentConfigListResourceProvider.java b/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/enricher/internal/DeploymentConfigListResourceProvider.java index 55fd15559..f20dab282 100644 --- a/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/enricher/internal/DeploymentConfigListResourceProvider.java +++ b/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/enricher/internal/DeploymentConfigListResourceProvider.java @@ -3,7 +3,7 @@ import java.lang.annotation.Annotation; import java.util.Map; -import io.fabric8.kubernetes.api.model.v4_0.apps.DeploymentList; +import io.fabric8.kubernetes.api.model.v4_10.apps.DeploymentList; import org.arquillian.cube.openshift.impl.enricher.AbstractOpenshiftResourceProvider; import org.jboss.arquillian.test.api.ArquillianResource; diff --git a/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/enricher/internal/DeploymentConfigResourceProvider.java b/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/enricher/internal/DeploymentConfigResourceProvider.java index 08054bd0c..5e6a0e81d 100644 --- a/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/enricher/internal/DeploymentConfigResourceProvider.java +++ b/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/enricher/internal/DeploymentConfigResourceProvider.java @@ -4,8 +4,8 @@ import java.util.List; import java.util.Map; -import io.fabric8.openshift.api.model.v4_0.DeploymentConfig; -import io.fabric8.openshift.api.model.v4_0.DeploymentConfigList; +import io.fabric8.openshift.api.model.v4_10.DeploymentConfig; +import io.fabric8.openshift.api.model.v4_10.DeploymentConfigList; import org.arquillian.cube.openshift.impl.enricher.AbstractOpenshiftResourceProvider; import org.jboss.arquillian.test.api.ArquillianResource; diff --git a/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/enricher/internal/OpenshiftClientResourceProvider.java b/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/enricher/internal/OpenshiftClientResourceProvider.java index a13b9f738..445f0f043 100644 --- a/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/enricher/internal/OpenshiftClientResourceProvider.java +++ b/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/enricher/internal/OpenshiftClientResourceProvider.java @@ -1,7 +1,7 @@ package org.arquillian.cube.openshift.impl.enricher.internal; -import io.fabric8.kubernetes.clnt.v4_0.KubernetesClient; -import io.fabric8.openshift.clnt.v4_0.OpenShiftClient; +import io.fabric8.kubernetes.clnt.v4_10.KubernetesClient; +import io.fabric8.openshift.clnt.v4_10.OpenShiftClient; import java.lang.annotation.Annotation; import org.arquillian.cube.kubernetes.impl.enricher.AbstractKubernetesResourceProvider; import org.jboss.arquillian.test.api.ArquillianResource; diff --git a/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/fabric8/F8OpenShiftAdapter.java b/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/fabric8/F8OpenShiftAdapter.java index ada2a940b..57e88b585 100644 --- a/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/fabric8/F8OpenShiftAdapter.java +++ b/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/fabric8/F8OpenShiftAdapter.java @@ -23,55 +23,55 @@ package org.arquillian.cube.openshift.impl.fabric8; -import io.fabric8.kubernetes.api.model.v4_0.Container; -import io.fabric8.kubernetes.api.model.v4_0.ContainerPort; -import io.fabric8.kubernetes.api.model.v4_0.DoneablePod; -import io.fabric8.kubernetes.api.model.v4_0.EnvVar; -import io.fabric8.kubernetes.api.model.v4_0.ExecAction; -import io.fabric8.kubernetes.api.model.v4_0.HTTPGetAction; -import io.fabric8.kubernetes.api.model.v4_0.Handler; -import io.fabric8.kubernetes.api.model.v4_0.HasMetadata; -import io.fabric8.kubernetes.api.model.v4_0.IntOrString; -import io.fabric8.kubernetes.api.model.v4_0.KubernetesList; -import io.fabric8.kubernetes.api.model.v4_0.Lifecycle; -import io.fabric8.kubernetes.api.model.v4_0.ObjectMeta; -import io.fabric8.kubernetes.api.model.v4_0.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.v4_0.Pod; -import io.fabric8.kubernetes.api.model.v4_0.PodList; -import io.fabric8.kubernetes.api.model.v4_0.PodSpec; -import io.fabric8.kubernetes.api.model.v4_0.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.v4_0.Probe; -import io.fabric8.kubernetes.api.model.v4_0.ReplicationController; -import io.fabric8.kubernetes.api.model.v4_0.ReplicationControllerList; -import io.fabric8.kubernetes.api.model.v4_0.ReplicationControllerSpec; -import io.fabric8.kubernetes.api.model.v4_0.SecretVolumeSource; -import io.fabric8.kubernetes.api.model.v4_0.Service; -import io.fabric8.kubernetes.api.model.v4_0.ServiceAccount; -import io.fabric8.kubernetes.api.model.v4_0.ServicePort; -import io.fabric8.kubernetes.api.model.v4_0.Volume; -import io.fabric8.kubernetes.api.model.v4_0.VolumeMount; -import io.fabric8.kubernetes.clnt.v4_0.dsl.Deletable; -import io.fabric8.kubernetes.clnt.v4_0.dsl.ExecListener; -import io.fabric8.kubernetes.clnt.v4_0.dsl.NonNamespaceOperation; -import io.fabric8.kubernetes.clnt.v4_0.dsl.PodResource; -import io.fabric8.openshift.api.model.v4_0.Build; -import io.fabric8.openshift.api.model.v4_0.BuildList; -import io.fabric8.openshift.api.model.v4_0.DeploymentConfig; -import io.fabric8.openshift.api.model.v4_0.DeploymentConfigList; -import io.fabric8.openshift.api.model.v4_0.DeploymentConfigStatus; -import io.fabric8.openshift.api.model.v4_0.DoneableDeploymentConfig; -import io.fabric8.openshift.api.model.v4_0.DoneableTemplate; -import io.fabric8.openshift.api.model.v4_0.Project; -import io.fabric8.openshift.api.model.v4_0.RoleBinding; -import io.fabric8.openshift.api.model.v4_0.RoleBindingBuilder; -import io.fabric8.openshift.api.model.v4_0.Template; -import io.fabric8.openshift.clnt.v4_0.DefaultOpenShiftClient; -import io.fabric8.openshift.clnt.v4_0.NamespacedOpenShiftClient; -import io.fabric8.openshift.clnt.v4_0.OpenShiftConfig; -import io.fabric8.openshift.clnt.v4_0.OpenShiftConfigBuilder; -import io.fabric8.openshift.clnt.v4_0.ParameterValue; -import io.fabric8.openshift.clnt.v4_0.dsl.DeployableScalableResource; -import io.fabric8.openshift.clnt.v4_0.dsl.TemplateResource; +import io.fabric8.kubernetes.api.model.v4_10.Container; +import io.fabric8.kubernetes.api.model.v4_10.ContainerPort; +import io.fabric8.kubernetes.api.model.v4_10.DoneablePod; +import io.fabric8.kubernetes.api.model.v4_10.EnvVar; +import io.fabric8.kubernetes.api.model.v4_10.ExecAction; +import io.fabric8.kubernetes.api.model.v4_10.HTTPGetAction; +import io.fabric8.kubernetes.api.model.v4_10.Handler; +import io.fabric8.kubernetes.api.model.v4_10.HasMetadata; +import io.fabric8.kubernetes.api.model.v4_10.IntOrString; +import io.fabric8.kubernetes.api.model.v4_10.KubernetesList; +import io.fabric8.kubernetes.api.model.v4_10.Lifecycle; +import io.fabric8.kubernetes.api.model.v4_10.ObjectMeta; +import io.fabric8.kubernetes.api.model.v4_10.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.v4_10.Pod; +import io.fabric8.kubernetes.api.model.v4_10.PodList; +import io.fabric8.kubernetes.api.model.v4_10.PodSpec; +import io.fabric8.kubernetes.api.model.v4_10.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.v4_10.Probe; +import io.fabric8.kubernetes.api.model.v4_10.ReplicationController; +import io.fabric8.kubernetes.api.model.v4_10.ReplicationControllerList; +import io.fabric8.kubernetes.api.model.v4_10.ReplicationControllerSpec; +import io.fabric8.kubernetes.api.model.v4_10.SecretVolumeSource; +import io.fabric8.kubernetes.api.model.v4_10.Service; +import io.fabric8.kubernetes.api.model.v4_10.ServiceAccount; +import io.fabric8.kubernetes.api.model.v4_10.ServicePort; +import io.fabric8.kubernetes.api.model.v4_10.Volume; +import io.fabric8.kubernetes.api.model.v4_10.VolumeMount; +import io.fabric8.kubernetes.clnt.v4_10.dsl.Deletable; +import io.fabric8.kubernetes.clnt.v4_10.dsl.ExecListener; +import io.fabric8.kubernetes.clnt.v4_10.dsl.NonNamespaceOperation; +import io.fabric8.kubernetes.clnt.v4_10.dsl.PodResource; +import io.fabric8.openshift.api.model.v4_10.Build; +import io.fabric8.openshift.api.model.v4_10.BuildList; +import io.fabric8.openshift.api.model.v4_10.DeploymentConfig; +import io.fabric8.openshift.api.model.v4_10.DeploymentConfigList; +import io.fabric8.openshift.api.model.v4_10.DeploymentConfigStatus; +import io.fabric8.openshift.api.model.v4_10.DoneableDeploymentConfig; +import io.fabric8.openshift.api.model.v4_10.DoneableTemplate; +import io.fabric8.openshift.api.model.v4_10.Project; +import io.fabric8.openshift.api.model.v4_10.RoleBinding; +import io.fabric8.openshift.api.model.v4_10.RoleBindingBuilder; +import io.fabric8.openshift.api.model.v4_10.Template; +import io.fabric8.openshift.clnt.v4_10.DefaultOpenShiftClient; +import io.fabric8.openshift.clnt.v4_10.NamespacedOpenShiftClient; +import io.fabric8.openshift.clnt.v4_10.OpenShiftConfig; +import io.fabric8.openshift.clnt.v4_10.OpenShiftConfigBuilder; +import io.fabric8.openshift.clnt.v4_10.ParameterValue; +import io.fabric8.openshift.clnt.v4_10.dsl.DeployableScalableResource; +import io.fabric8.openshift.clnt.v4_10.dsl.TemplateResource; import okhttp3.Response; import org.arquillian.cube.openshift.api.MountSecret; import org.arquillian.cube.openshift.api.model.OpenShiftResource; diff --git a/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/fabric8/F8OpenShiftAdapterProvider.java b/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/fabric8/F8OpenShiftAdapterProvider.java index 7c78627ed..8a00c668d 100644 --- a/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/fabric8/F8OpenShiftAdapterProvider.java +++ b/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/fabric8/F8OpenShiftAdapterProvider.java @@ -23,7 +23,7 @@ package org.arquillian.cube.openshift.impl.fabric8; -import io.fabric8.openshift.clnt.v4_0.NamespacedOpenShiftClient; +import io.fabric8.openshift.clnt.v4_10.NamespacedOpenShiftClient; import org.arquillian.cube.openshift.impl.adapter.OpenShiftAdapter; import org.arquillian.cube.openshift.impl.adapter.OpenShiftAdapterProvider; import org.arquillian.cube.openshift.impl.client.CubeOpenShiftConfiguration; diff --git a/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/fabric8/F8Proxy.java b/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/fabric8/F8Proxy.java index 74fdf70f0..26708d804 100644 --- a/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/fabric8/F8Proxy.java +++ b/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/fabric8/F8Proxy.java @@ -23,13 +23,13 @@ package org.arquillian.cube.openshift.impl.fabric8; -import io.fabric8.kubernetes.api.model.v4_0.Pod; -import io.fabric8.kubernetes.api.model.v4_0.PodCondition; -import io.fabric8.kubernetes.api.model.v4_0.PodStatus; -import io.fabric8.kubernetes.clnt.v4_0.Adapters; -import io.fabric8.kubernetes.clnt.v4_0.internal.SSLUtils; -import io.fabric8.openshift.clnt.v4_0.NamespacedOpenShiftClient; -import io.fabric8.openshift.clnt.v4_0.OpenShiftClient; +import io.fabric8.kubernetes.api.model.v4_10.Pod; +import io.fabric8.kubernetes.api.model.v4_10.PodCondition; +import io.fabric8.kubernetes.api.model.v4_10.PodStatus; +import io.fabric8.kubernetes.clnt.v4_10.Adapters; +import io.fabric8.kubernetes.clnt.v4_10.internal.SSLUtils; +import io.fabric8.openshift.clnt.v4_10.NamespacedOpenShiftClient; +import io.fabric8.openshift.clnt.v4_10.OpenShiftClient; import java.util.List; import java.util.Map; import javax.net.ssl.SSLContext; diff --git a/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/fabric8/model/F8DeploymentConfig.java b/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/fabric8/model/F8DeploymentConfig.java index 8e99e8f98..45c409089 100644 --- a/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/fabric8/model/F8DeploymentConfig.java +++ b/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/fabric8/model/F8DeploymentConfig.java @@ -34,12 +34,12 @@ */ public class F8DeploymentConfig implements DeploymentConfig { - private final io.fabric8.openshift.api.model.v4_0.DeploymentConfig delegate; + private final io.fabric8.openshift.api.model.v4_10.DeploymentConfig delegate; /** * Create a new F8DeploymentConfig. */ - public F8DeploymentConfig(final io.fabric8.openshift.api.model.v4_0.DeploymentConfig delegate) { + public F8DeploymentConfig(final io.fabric8.openshift.api.model.v4_10.DeploymentConfig delegate) { this.delegate = delegate; } diff --git a/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/feedback/OpenshiftFeedbackProvider.java b/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/feedback/OpenshiftFeedbackProvider.java index d8c15e326..75d3a1047 100644 --- a/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/feedback/OpenshiftFeedbackProvider.java +++ b/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/feedback/OpenshiftFeedbackProvider.java @@ -1,16 +1,16 @@ package org.arquillian.cube.openshift.impl.feedback; -import io.fabric8.kubernetes.api.model.v4_0.Endpoints; -import io.fabric8.kubernetes.api.model.v4_0.HasMetadata; -import io.fabric8.kubernetes.api.model.v4_0.Pod; -import io.fabric8.kubernetes.api.model.v4_0.PodList; -import io.fabric8.kubernetes.api.model.v4_0.PodListBuilder; -import io.fabric8.kubernetes.api.model.v4_0.ReplicationController; -import io.fabric8.kubernetes.api.model.v4_0.Service; -import io.fabric8.kubernetes.api.model.v4_0.apps.Deployment; -import io.fabric8.kubernetes.api.model.v4_0.apps.ReplicaSet; -import io.fabric8.kubernetes.clnt.v4_0.KubernetesClient; -import io.fabric8.openshift.api.model.v4_0.DeploymentConfig; +import io.fabric8.kubernetes.api.model.v4_10.Endpoints; +import io.fabric8.kubernetes.api.model.v4_10.HasMetadata; +import io.fabric8.kubernetes.api.model.v4_10.Pod; +import io.fabric8.kubernetes.api.model.v4_10.PodList; +import io.fabric8.kubernetes.api.model.v4_10.PodListBuilder; +import io.fabric8.kubernetes.api.model.v4_10.ReplicationController; +import io.fabric8.kubernetes.api.model.v4_10.Service; +import io.fabric8.kubernetes.api.model.v4_10.apps.Deployment; +import io.fabric8.kubernetes.api.model.v4_10.apps.ReplicaSet; +import io.fabric8.kubernetes.clnt.v4_10.KubernetesClient; +import io.fabric8.openshift.api.model.v4_10.DeploymentConfig; import org.arquillian.cube.kubernetes.api.FeedbackProvider; import org.arquillian.cube.kubernetes.api.Logger; import org.arquillian.cube.kubernetes.api.WithToImmutable; diff --git a/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/install/OpenshiftResourceInstaller.java b/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/install/OpenshiftResourceInstaller.java index 7ba437aed..922bd5352 100644 --- a/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/install/OpenshiftResourceInstaller.java +++ b/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/install/OpenshiftResourceInstaller.java @@ -1,11 +1,11 @@ package org.arquillian.cube.openshift.impl.install; -import io.fabric8.kubernetes.api.builder.v4_0.Visitor; -import io.fabric8.kubernetes.api.model.v4_0.HasMetadata; -import io.fabric8.kubernetes.api.model.v4_0.KubernetesList; -import io.fabric8.kubernetes.clnt.v4_0.KubernetesClient; -import io.fabric8.kubernetes.clnt.v4_0.KubernetesClientException; -import io.fabric8.openshift.clnt.v4_0.OpenShiftClient; +import io.fabric8.kubernetes.api.builder.v4_10.Visitor; +import io.fabric8.kubernetes.api.model.v4_10.HasMetadata; +import io.fabric8.kubernetes.api.model.v4_10.KubernetesList; +import io.fabric8.kubernetes.clnt.v4_10.KubernetesClient; +import io.fabric8.kubernetes.clnt.v4_10.KubernetesClientException; +import io.fabric8.openshift.clnt.v4_10.OpenShiftClient; import org.arquillian.cube.impl.util.Strings; import org.arquillian.cube.impl.util.SystemEnvironmentVariables; import org.arquillian.cube.kubernetes.api.Configuration; diff --git a/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/locator/OpenshiftKubernetesResourceLocator.java b/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/locator/OpenshiftKubernetesResourceLocator.java index 7480b1204..3998564f7 100644 --- a/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/locator/OpenshiftKubernetesResourceLocator.java +++ b/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/locator/OpenshiftKubernetesResourceLocator.java @@ -1,7 +1,7 @@ package org.arquillian.cube.openshift.impl.locator; -import io.fabric8.kubernetes.clnt.v4_0.KubernetesClient; -import io.fabric8.openshift.clnt.v4_0.OpenShiftClient; +import io.fabric8.kubernetes.clnt.v4_10.KubernetesClient; +import io.fabric8.openshift.clnt.v4_10.OpenShiftClient; import org.arquillian.cube.kubernetes.api.Configuration; import org.arquillian.cube.kubernetes.impl.locator.DefaultKubernetesResourceLocator; import org.arquillian.cube.openshift.impl.client.CubeOpenShiftConfiguration; diff --git a/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/model/BuildablePodCube.java b/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/model/BuildablePodCube.java index 26d8872c0..d4d55e557 100644 --- a/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/model/BuildablePodCube.java +++ b/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/model/BuildablePodCube.java @@ -1,8 +1,8 @@ package org.arquillian.cube.openshift.impl.model; -import io.fabric8.kubernetes.api.model.v4_0.Container; -import io.fabric8.kubernetes.api.model.v4_0.ContainerPort; -import io.fabric8.kubernetes.api.model.v4_0.Pod; +import io.fabric8.kubernetes.api.model.v4_10.Container; +import io.fabric8.kubernetes.api.model.v4_10.ContainerPort; +import io.fabric8.kubernetes.api.model.v4_10.Pod; import java.net.InetAddress; import java.net.ServerSocket; import java.net.UnknownHostException; diff --git a/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/model/ServiceCube.java b/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/model/ServiceCube.java index 706e93486..734a98a4e 100644 --- a/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/model/ServiceCube.java +++ b/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/model/ServiceCube.java @@ -1,7 +1,7 @@ package org.arquillian.cube.openshift.impl.model; -import io.fabric8.kubernetes.api.model.v4_0.Service; -import io.fabric8.kubernetes.api.model.v4_0.ServicePort; +import io.fabric8.kubernetes.api.model.v4_10.Service; +import io.fabric8.kubernetes.api.model.v4_10.ServicePort; import java.net.InetAddress; import java.util.Collections; import java.util.HashMap; diff --git a/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/model/Template.java b/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/model/Template.java index 435b6ea23..3d27b0594 100644 --- a/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/model/Template.java +++ b/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/model/Template.java @@ -1,8 +1,8 @@ package org.arquillian.cube.openshift.impl.model; -import io.fabric8.kubernetes.api.model.v4_0.Container; -import io.fabric8.kubernetes.api.model.v4_0.Pod; -import io.fabric8.openshift.api.model.v4_0.DeploymentConfig; +import io.fabric8.kubernetes.api.model.v4_10.Container; +import io.fabric8.kubernetes.api.model.v4_10.Pod; +import io.fabric8.openshift.api.model.v4_10.DeploymentConfig; import java.util.ArrayList; import java.util.List; diff --git a/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/namespace/OpenshiftNamespaceService.java b/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/namespace/OpenshiftNamespaceService.java index 7c7dcec51..da00a71e9 100644 --- a/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/namespace/OpenshiftNamespaceService.java +++ b/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/namespace/OpenshiftNamespaceService.java @@ -1,11 +1,11 @@ package org.arquillian.cube.openshift.impl.namespace; -import io.fabric8.kubernetes.api.model.v4_0.Namespace; -import io.fabric8.kubernetes.clnt.v4_0.KubernetesClient; -import io.fabric8.kubernetes.clnt.v4_0.KubernetesClientException; -import io.fabric8.openshift.api.model.v4_0.ProjectRequest; -import io.fabric8.openshift.api.model.v4_0.ProjectRequestBuilder; -import io.fabric8.openshift.clnt.v4_0.OpenShiftClient; +import io.fabric8.kubernetes.api.model.v4_10.Namespace; +import io.fabric8.kubernetes.clnt.v4_10.KubernetesClient; +import io.fabric8.kubernetes.clnt.v4_10.KubernetesClientException; +import io.fabric8.openshift.api.model.v4_10.ProjectRequest; +import io.fabric8.openshift.api.model.v4_10.ProjectRequestBuilder; +import io.fabric8.openshift.clnt.v4_10.OpenShiftClient; import java.util.Collections; import java.util.Map; import java.util.function.Predicate; diff --git a/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/requirement/OpenshiftRequirement.java b/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/requirement/OpenshiftRequirement.java index be79a9d8c..7805cebc5 100644 --- a/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/requirement/OpenshiftRequirement.java +++ b/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/requirement/OpenshiftRequirement.java @@ -1,9 +1,9 @@ package org.arquillian.cube.openshift.impl.requirement; -import io.fabric8.kubernetes.clnt.v4_0.DefaultKubernetesClient; -import io.fabric8.kubernetes.clnt.v4_0.KubernetesClient; -import io.fabric8.kubernetes.clnt.v4_0.utils.URLUtils; -import io.fabric8.openshift.clnt.v4_0.OpenShiftClient; +import io.fabric8.kubernetes.clnt.v4_10.DefaultKubernetesClient; +import io.fabric8.kubernetes.clnt.v4_10.KubernetesClient; +import io.fabric8.kubernetes.clnt.v4_10.utils.URLUtils; +import io.fabric8.openshift.clnt.v4_10.OpenShiftClient; import java.io.IOException; import java.util.Arrays; import java.util.List; diff --git a/openshift/openshift/src/test/java/org/arquillian/cube/openshift/impl/DnsServiceTest.java b/openshift/openshift/src/test/java/org/arquillian/cube/openshift/impl/DnsServiceTest.java index 895a11eff..c3e05fba3 100644 --- a/openshift/openshift/src/test/java/org/arquillian/cube/openshift/impl/DnsServiceTest.java +++ b/openshift/openshift/src/test/java/org/arquillian/cube/openshift/impl/DnsServiceTest.java @@ -1,8 +1,8 @@ package org.arquillian.cube.openshift.impl; -import io.fabric8.openshift.api.model.v4_0.Route; -import io.fabric8.openshift.api.model.v4_0.RouteList; -import io.fabric8.openshift.api.model.v4_0.RouteSpec; +import io.fabric8.openshift.api.model.v4_10.Route; +import io.fabric8.openshift.api.model.v4_10.RouteList; +import io.fabric8.openshift.api.model.v4_10.RouteSpec; import org.arquillian.cube.openshift.impl.dns.ArqCubeNameService; import org.junit.Assert; import org.junit.Before; diff --git a/openshift/openshift/src/test/java/org/arquillian/cube/openshift/impl/model/BuildablePodCubeTest.java b/openshift/openshift/src/test/java/org/arquillian/cube/openshift/impl/model/BuildablePodCubeTest.java index 1b5aa8558..15d9994f5 100644 --- a/openshift/openshift/src/test/java/org/arquillian/cube/openshift/impl/model/BuildablePodCubeTest.java +++ b/openshift/openshift/src/test/java/org/arquillian/cube/openshift/impl/model/BuildablePodCubeTest.java @@ -1,10 +1,10 @@ package org.arquillian.cube.openshift.impl.model; -import io.fabric8.kubernetes.api.model.v4_0.ObjectMeta; -import io.fabric8.kubernetes.api.model.v4_0.Pod; -import io.fabric8.kubernetes.api.model.v4_0.PodSpec; -import io.fabric8.openshift.api.model.v4_0.RouteList; -import io.fabric8.openshift.clnt.v4_0.dsl.internal.RouteOperationsImpl; +import io.fabric8.kubernetes.api.model.v4_10.ObjectMeta; +import io.fabric8.kubernetes.api.model.v4_10.Pod; +import io.fabric8.kubernetes.api.model.v4_10.PodSpec; +import io.fabric8.openshift.api.model.v4_10.RouteList; +import io.fabric8.openshift.clnt.v4_10.dsl.internal.RouteOperationsImpl; import org.arquillian.cube.openshift.impl.client.CubeOpenShiftConfiguration; import org.arquillian.cube.openshift.impl.client.OpenShiftClient; import org.arquillian.cube.spi.event.lifecycle.AfterCreate; @@ -39,7 +39,7 @@ public class BuildablePodCubeTest extends AbstractManagerTestBase { private OpenShiftClient openShiftClient; @Mock - private io.fabric8.openshift.clnt.v4_0.OpenShiftClient openShiftClientExt; + private io.fabric8.openshift.clnt.v4_10.OpenShiftClient openShiftClientExt; @Mock private RouteOperationsImpl routeOperations; diff --git a/pom.xml b/pom.xml index 6d6488874..22553759a 100644 --- a/pom.xml +++ b/pom.xml @@ -72,7 +72,7 @@ 4.12 1.3 3.2.0 - 4.0.3 + 4.10.2 1.25 3.0.1 1.2.6 @@ -94,7 +94,7 @@ 2.9.3 - 1.0.0.Beta4 + 1.6.5-Beta6 4.0.1 5.4.2