Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update Fabric8 Kubernetes Client to 4.10.2 #1192

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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<FeedbackProvider> {

Expand Down
Original file line number Diff line number Diff line change
@@ -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<NamespaceService> {
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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_]+)";
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Loading