simpler

Author: wind57

spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/fabric8_client/Util.java

@@ -63,15 +63,9 @@ public final class Util {
 
 	private static final Log LOG = LogFactory.getLog(Util.class);
 
-	/** Image we get {@code istioctl} from in order to install Istio. */
-	public static final String ISTIO_ISTIOCTL = "istio/istioctl";
-
-	private final K3sContainer container;
-
 	private final KubernetesClient client;
 
 	public Util(K3sContainer container) {
-		this.container = container;
 		this.client = new KubernetesClientBuilder().withConfig(Config.fromKubeconfig(container.getKubeConfigYaml()))
 			.build();
 	}
@@ -83,7 +77,7 @@ public Util(K3sContainer container) {
 	 * tight as possible, providing reasonable defaults.
 	 *
 	 */
-	public void createAndWait(String namespace, String name, @Nullable Deployment deployment, @Nullable Service service,
+	public void createAndWait(String namespace, @Nullable Deployment deployment, @Nullable Service service,
 			@Nullable Ingress ingress, boolean changeVersion) {
 		try {
 
@@ -134,7 +128,7 @@ public void busybox(String namespace, Phase phase) {
 		Service service = client.services().load(serviceStream).item();
 
 		if (phase.equals(Phase.CREATE)) {
-			createAndWait(namespace, "busybox", deployment, service, null, false);
+			createAndWait(namespace, deployment, service, null, false);
 		}
 		else if (phase.equals(Phase.DELETE)) {
 			deleteAndWait(namespace, deployment, service, null);
@@ -304,7 +298,7 @@ public void setUpIstioctl(String namespace, Phase phase) {
 		istioctlDeployment.getSpec().getTemplate().getSpec().getContainers().get(0).setImage(imageWithVersion);
 
 		if (phase.equals(Phase.CREATE)) {
-			createAndWait(namespace, null, istioctlDeployment, null, null, false);
+			createAndWait(namespace, istioctlDeployment, null, null, false);
 		}
 		else {
 			deleteAndWait(namespace, istioctlDeployment, null, null);
@@ -355,7 +349,7 @@ public void wiremock(String namespace, String path, Phase phase, boolean withIng
 
 			deployment.getMetadata().setNamespace(namespace);
 			service.getMetadata().setNamespace(namespace);
-			createAndWait(namespace, "wiremock", deployment, service, ingress, false);
+			createAndWait(namespace, deployment, service, ingress, false);
 		}
 		else {
 

spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/native_client/Util.java

@@ -82,8 +82,6 @@ public final class Util {
 
 	private final RbacAuthorizationV1Api rbacApi;
 
-	private final K3sContainer container;
-
 	public Util(K3sContainer container) {
 
 		ApiClient client;
@@ -97,7 +95,6 @@ public Util(K3sContainer container) {
 		client.setDebugging(false);
 		Configuration.setDefaultApiClient(client);
 
-		this.container = container;
 		this.coreV1Api = new CoreV1Api();
 		this.appsV1Api = new AppsV1Api();
 		this.networkingV1Api = new NetworkingV1Api();
@@ -111,8 +108,8 @@ public Util(K3sContainer container) {
 	 * tight as possible, providing reasonable defaults.
 	 *
 	 */
-	public void createAndWait(String namespace, String name, V1Deployment deployment, V1Service service,
-			@Nullable V1Ingress ingress, boolean changeVersion) {
+	public void createAndWait(String namespace, V1Deployment deployment, V1Service service, @Nullable V1Ingress ingress,
+			boolean changeVersion) {
 		try {
 
 			coreV1Api.createNamespacedService(namespace, service, null, null, null, null);
@@ -245,7 +242,7 @@ public void busybox(String namespace, Phase phase) {
 
 		V1Service service = (V1Service) yaml("busybox/service.yaml");
 		if (phase.equals(Phase.CREATE)) {
-			createAndWait(namespace, "busybox", deployment, service, null, false);
+			createAndWait(namespace, deployment, service, null, false);
 		}
 		else if (phase.equals(Phase.DELETE)) {
 			deleteAndWait(namespace, deployment, service, null);
@@ -264,7 +261,7 @@ public void kafka(String namespace, Phase phase) {
 
 		if (phase.equals(Phase.CREATE)) {
 			createAndWait(namespace, configMap, null);
-			createAndWait(namespace, "kafka", deployment, service, null, false);
+			createAndWait(namespace, deployment, service, null, false);
 		}
 		else if (phase.equals(Phase.DELETE)) {
 			deleteAndWait(namespace, configMap, null);
@@ -282,7 +279,7 @@ public void rabbitMq(String namespace, Phase phase) {
 		V1Service service = (V1Service) yaml("rabbitmq/rabbitmq-service.yaml");
 
 		if (phase.equals(Phase.CREATE)) {
-			createAndWait(namespace, "rabbitmq", deployment, service, null, false);
+			createAndWait(namespace, deployment, service, null, false);
 		}
 		else if (phase.equals(Phase.DELETE)) {
 			deleteAndWait(namespace, deployment, service, null);
@@ -472,7 +469,7 @@ public void wiremock(String namespace, String path, Phase phase, boolean withIng
 
 			deployment.getMetadata().setNamespace(namespace);
 			service.getMetadata().setNamespace(namespace);
-			createAndWait(namespace, "wiremock", deployment, service, ingress, false);
+			createAndWait(namespace, deployment, service, ingress, false);
 		}
 		else {
 			if (withIngress) {