Skip to content

Commit cd031ba

Browse files
spoltispolti
committed
bump kubernetes client version
A new version of arquillian-cube was released with the kubernetes client version 2.5.6
1 parent 8ccd447 commit cd031ba

File tree

8 files changed

+69
-70
lines changed

8 files changed

+69
-70
lines changed

‎README.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ Additional properties you **can** set / change.
2929
3030
-Ddeployment.dir=[EAP deployment directory], default is "/opt/eap/standalone/deployments/"
3131
32-
-Dkubernetes.ignore.cleanup=(true|false) -- do we leave the test image, pod and services still running after the test is finished, default is "false"
33-
3432
-Dcontainer.mgmt.port=[EAP container management port], default is 9990
3533
3634
-Ddocker.username=[OpenShift username]

‎api/src/main/java/org/jboss/arquillian/ce/api/TemplateParameter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
* @author Marko Luksa
3333
*/
3434
@Retention(RetentionPolicy.RUNTIME)
35-
@Target(ElementType.TYPE)
35+
@Target({ElementType.TYPE, ElementType.ANNOTATION_TYPE})
3636
public @interface TemplateParameter {
3737
String name();
3838
String value();

‎cube/src/main/java/org/jboss/arquillian/ce/cube/dns/CENameService.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
*/
2323
package org.jboss.arquillian.ce.cube.dns;
2424

25-
import io.fabric8.openshift.api.model.v2_2.Route;
26-
import io.fabric8.openshift.api.model.v2_2.RouteList;
25+
import io.fabric8.openshift.api.model.v2_5.Route;
26+
import io.fabric8.openshift.api.model.v2_5.RouteList;
2727

2828
import java.net.InetAddress;
2929
import java.net.UnknownHostException;

‎cube/src/main/java/org/jboss/arquillian/ce/cube/enrichers/RouteURLEnricher.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import java.net.MalformedURLException;
2929
import java.net.URL;
3030

31-
import io.fabric8.openshift.api.model.v2_2.Route;
31+
import io.fabric8.openshift.api.model.v2_5.Route;
3232
import org.arquillian.cube.impl.util.ReflectionUtil;
3333
import org.arquillian.cube.openshift.impl.client.OpenShiftClient;
3434
import org.jboss.arquillian.ce.cube.CECubeConfiguration;
@@ -103,7 +103,7 @@ private URL lookup(RouteURL routeURL) {
103103
throw new IllegalArgumentException("Must specify routerHost!");
104104
}
105105
final OpenShiftClient client = clientInstance.get();
106-
final Route route = client.getClientExt().routes().inNamespace(config.getNamespace()).withName(routeName).get();
106+
final Route route = client.getClient().routes().inNamespace(config.getNamespace()).withName(routeName).get();
107107
if (route == null) {
108108
throw new IllegalArgumentException("Could not resolve route: " + routeName);
109109
}

‎fabric8/src/main/java/org/jboss/arquillian/ce/fabric8/F8OpenShiftAdapter.java‎

Lines changed: 52 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -58,58 +58,58 @@
5858
import org.jboss.dmr.ModelNode;
5959

6060
import io.fabric8.kubernetes.api.KubernetesHelper;
61-
import io.fabric8.kubernetes.api.model.v2_2.Container;
62-
import io.fabric8.kubernetes.api.model.v2_2.ContainerPort;
63-
import io.fabric8.kubernetes.api.model.v2_2.DoneablePod;
64-
import io.fabric8.kubernetes.api.model.v2_2.EnvVar;
65-
import io.fabric8.kubernetes.api.model.v2_2.ExecAction;
66-
import io.fabric8.kubernetes.api.model.v2_2.HTTPGetAction;
67-
import io.fabric8.kubernetes.api.model.v2_2.Handler;
68-
import io.fabric8.kubernetes.api.model.v2_2.HasMetadata;
69-
import io.fabric8.kubernetes.api.model.v2_2.IntOrString;
70-
import io.fabric8.kubernetes.api.model.v2_2.KubernetesList;
71-
import io.fabric8.kubernetes.api.model.v2_2.Lifecycle;
72-
import io.fabric8.kubernetes.api.model.v2_2.ObjectMeta;
73-
import io.fabric8.kubernetes.api.model.v2_2.PersistentVolumeClaim;
74-
import io.fabric8.kubernetes.api.model.v2_2.Pod;
75-
import io.fabric8.kubernetes.api.model.v2_2.PodList;
76-
import io.fabric8.kubernetes.api.model.v2_2.PodSpec;
77-
import io.fabric8.kubernetes.api.model.v2_2.PodTemplateSpec;
78-
import io.fabric8.kubernetes.api.model.v2_2.Probe;
79-
import io.fabric8.kubernetes.api.model.v2_2.ReplicationController;
80-
import io.fabric8.kubernetes.api.model.v2_2.ReplicationControllerList;
81-
import io.fabric8.kubernetes.api.model.v2_2.ReplicationControllerSpec;
82-
import io.fabric8.kubernetes.api.model.v2_2.Secret;
83-
import io.fabric8.kubernetes.api.model.v2_2.SecretVolumeSource;
84-
import io.fabric8.kubernetes.api.model.v2_2.Service;
85-
import io.fabric8.kubernetes.api.model.v2_2.ServiceAccount;
86-
import io.fabric8.kubernetes.api.model.v2_2.ServicePort;
87-
import io.fabric8.kubernetes.api.model.v2_2.Volume;
88-
import io.fabric8.kubernetes.api.model.v2_2.VolumeMount;
89-
import io.fabric8.kubernetes.clnt.v2_2.dsl.Deletable;
90-
import io.fabric8.kubernetes.clnt.v2_2.dsl.ExecListener;
91-
import io.fabric8.kubernetes.clnt.v2_2.dsl.NonNamespaceOperation;
92-
import io.fabric8.kubernetes.clnt.v2_2.dsl.PodResource;
93-
import io.fabric8.openshift.api.model.v2_2.Build;
94-
import io.fabric8.openshift.api.model.v2_2.BuildList;
95-
import io.fabric8.openshift.api.model.v2_2.DeploymentConfig;
96-
import io.fabric8.openshift.api.model.v2_2.DeploymentConfigList;
97-
import io.fabric8.openshift.api.model.v2_2.DeploymentConfigStatus;
98-
import io.fabric8.openshift.api.model.v2_2.DoneableDeploymentConfig;
99-
import io.fabric8.openshift.api.model.v2_2.DoneableTemplate;
100-
import io.fabric8.openshift.api.model.v2_2.ImageStream;
101-
import io.fabric8.openshift.api.model.v2_2.Project;
102-
import io.fabric8.openshift.api.model.v2_2.RoleBinding;
103-
import io.fabric8.openshift.api.model.v2_2.RoleBindingBuilder;
104-
import io.fabric8.openshift.api.model.v2_2.Route;
105-
import io.fabric8.openshift.api.model.v2_2.Template;
106-
import io.fabric8.openshift.clnt.v2_2.DefaultOpenShiftClient;
107-
import io.fabric8.openshift.clnt.v2_2.NamespacedOpenShiftClient;
108-
import io.fabric8.openshift.clnt.v2_2.OpenShiftConfig;
109-
import io.fabric8.openshift.clnt.v2_2.OpenShiftConfigBuilder;
110-
import io.fabric8.openshift.clnt.v2_2.ParameterValue;
111-
import io.fabric8.openshift.clnt.v2_2.dsl.DeployableScalableResource;
112-
import io.fabric8.openshift.clnt.v2_2.dsl.TemplateResource;
61+
import io.fabric8.kubernetes.api.model.v2_5.Container;
62+
import io.fabric8.kubernetes.api.model.v2_5.ContainerPort;
63+
import io.fabric8.kubernetes.api.model.v2_5.DoneablePod;
64+
import io.fabric8.kubernetes.api.model.v2_5.EnvVar;
65+
import io.fabric8.kubernetes.api.model.v2_5.ExecAction;
66+
import io.fabric8.kubernetes.api.model.v2_5.HTTPGetAction;
67+
import io.fabric8.kubernetes.api.model.v2_5.Handler;
68+
import io.fabric8.kubernetes.api.model.v2_5.HasMetadata;
69+
import io.fabric8.kubernetes.api.model.v2_5.IntOrString;
70+
import io.fabric8.kubernetes.api.model.v2_5.KubernetesList;
71+
import io.fabric8.kubernetes.api.model.v2_5.Lifecycle;
72+
import io.fabric8.kubernetes.api.model.v2_5.ObjectMeta;
73+
import io.fabric8.kubernetes.api.model.v2_5.PersistentVolumeClaim;
74+
import io.fabric8.kubernetes.api.model.v2_5.Pod;
75+
import io.fabric8.kubernetes.api.model.v2_5.PodList;
76+
import io.fabric8.kubernetes.api.model.v2_5.PodSpec;
77+
import io.fabric8.kubernetes.api.model.v2_5.PodTemplateSpec;
78+
import io.fabric8.kubernetes.api.model.v2_5.Probe;
79+
import io.fabric8.kubernetes.api.model.v2_5.ReplicationController;
80+
import io.fabric8.kubernetes.api.model.v2_5.ReplicationControllerList;
81+
import io.fabric8.kubernetes.api.model.v2_5.ReplicationControllerSpec;
82+
import io.fabric8.kubernetes.api.model.v2_5.Secret;
83+
import io.fabric8.kubernetes.api.model.v2_5.SecretVolumeSource;
84+
import io.fabric8.kubernetes.api.model.v2_5.Service;
85+
import io.fabric8.kubernetes.api.model.v2_5.ServiceAccount;
86+
import io.fabric8.kubernetes.api.model.v2_5.ServicePort;
87+
import io.fabric8.kubernetes.api.model.v2_5.Volume;
88+
import io.fabric8.kubernetes.api.model.v2_5.VolumeMount;
89+
import io.fabric8.kubernetes.clnt.v2_5.dsl.Deletable;
90+
import io.fabric8.kubernetes.clnt.v2_5.dsl.ExecListener;
91+
import io.fabric8.kubernetes.clnt.v2_5.dsl.NonNamespaceOperation;
92+
import io.fabric8.kubernetes.clnt.v2_5.dsl.PodResource;
93+
import io.fabric8.openshift.api.model.v2_5.Build;
94+
import io.fabric8.openshift.api.model.v2_5.BuildList;
95+
import io.fabric8.openshift.api.model.v2_5.DeploymentConfig;
96+
import io.fabric8.openshift.api.model.v2_5.DeploymentConfigList;
97+
import io.fabric8.openshift.api.model.v2_5.DeploymentConfigStatus;
98+
import io.fabric8.openshift.api.model.v2_5.DoneableDeploymentConfig;
99+
import io.fabric8.openshift.api.model.v2_5.DoneableTemplate;
100+
import io.fabric8.openshift.api.model.v2_5.ImageStream;
101+
import io.fabric8.openshift.api.model.v2_5.Project;
102+
import io.fabric8.openshift.api.model.v2_5.RoleBinding;
103+
import io.fabric8.openshift.api.model.v2_5.RoleBindingBuilder;
104+
import io.fabric8.openshift.api.model.v2_5.Route;
105+
import io.fabric8.openshift.api.model.v2_5.Template;
106+
import io.fabric8.openshift.clnt.v2_5.DefaultOpenShiftClient;
107+
import io.fabric8.openshift.clnt.v2_5.NamespacedOpenShiftClient;
108+
import io.fabric8.openshift.clnt.v2_5.OpenShiftConfig;
109+
import io.fabric8.openshift.clnt.v2_5.OpenShiftConfigBuilder;
110+
import io.fabric8.openshift.clnt.v2_5.ParameterValue;
111+
import io.fabric8.openshift.clnt.v2_5.dsl.DeployableScalableResource;
112+
import io.fabric8.openshift.clnt.v2_5.dsl.TemplateResource;
113113
import okhttp3.Response;
114114

115115
/**

‎fabric8/src/main/java/org/jboss/arquillian/ce/fabric8/F8Proxy.java‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,13 @@
2828

2929
import javax.net.ssl.SSLContext;
3030

31-
import io.fabric8.kubernetes.api.model.v2_2.Pod;
32-
import io.fabric8.kubernetes.api.model.v2_2.PodCondition;
33-
import io.fabric8.kubernetes.api.model.v2_2.PodStatus;
34-
import io.fabric8.kubernetes.clnt.v2_2.Adapters;
35-
import io.fabric8.kubernetes.clnt.v2_2.internal.SSLUtils;
36-
import io.fabric8.openshift.clnt.v2_2.OpenShiftClient;
31+
import io.fabric8.kubernetes.api.model.v2_5.Pod;
32+
import io.fabric8.kubernetes.api.model.v2_5.PodCondition;
33+
import io.fabric8.kubernetes.api.model.v2_5.PodStatus;
34+
import io.fabric8.kubernetes.clnt.v2_5.Adapters;
35+
import io.fabric8.kubernetes.clnt.v2_5.internal.SSLUtils;
36+
import io.fabric8.openshift.clnt.v2_5.OpenShiftClient;
37+
import io.fabric8.openshift.clnt.v2_5.NamespacedOpenShiftClient;
3738
import okhttp3.OkHttpClient;
3839
import org.jboss.arquillian.ce.proxy.AbstractProxy;
3940
import org.jboss.arquillian.ce.utils.Configuration;
@@ -46,7 +47,7 @@ public class F8Proxy extends AbstractProxy<Pod> {
4647
private final OpenShiftClient client;
4748
private OkHttpClient httpClient;
4849

49-
public F8Proxy(Configuration configuration, OpenShiftClient client) {
50+
public F8Proxy(Configuration configuration, NamespacedOpenShiftClient client) {
5051
super(configuration);
5152
this.client = client;
5253
}

‎fabric8/src/main/java/org/jboss/arquillian/ce/fabric8/model/F8DeploymentConfig.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@
3535
*/
3636
public class F8DeploymentConfig implements DeploymentConfig {
3737

38-
private final io.fabric8.openshift.api.model.v2_2.DeploymentConfig delegate;
38+
private final io.fabric8.openshift.api.model.v2_5.DeploymentConfig delegate;
3939

4040
/**
4141
* Create a new F8DeploymentConfig.
4242
*/
43-
public F8DeploymentConfig(final io.fabric8.openshift.api.model.v2_2.DeploymentConfig delegate) {
43+
public F8DeploymentConfig(final io.fabric8.openshift.api.model.v2_5.DeploymentConfig delegate) {
4444
this.delegate = delegate;
4545
}
4646

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@
2929
<!-- Properties -->
3030
<properties>
3131
<version.arquillian>1.1.13.Final</version.arquillian>
32-
<version.arquillian.cube>1.6.1-SNAPSHOT</version.arquillian.cube>
32+
<version.arquillian.cube>1.7.0</version.arquillian.cube>
3333
<version.dockerjava>2.1.3</version.dockerjava>
3434
<version.ok-http-client>3.8.0</version.ok-http-client>
3535
<version.openshift.client>4.0.3.Final</version.openshift.client>
36-
<version.kubernetes_client>2.2.14</version.kubernetes_client>
36+
<version.kubernetes_client>2.5.6</version.kubernetes_client>
3737
<version.fabric8>2.2.211</version.fabric8>
3838
<version.jgit>4.1.0.201509280440-r</version.jgit>
3939
<version.jackson>2.6.3</version.jackson>

0 commit comments

Comments
 (0)