From 9b8eb4267e4cce85e084b39e84546f0e932d887a Mon Sep 17 00:00:00 2001 From: yue9944882 <291271447@qq.com> Date: Tue, 1 Dec 2020 20:14:29 +0800 Subject: [PATCH] removing local registry from the integration scripts --- .../run.sh | 115 ++++++------------ .../pom.xml | 24 ---- .../config/it/ConfigMapAndSecretIT.java | 15 --- ...ubernetes-client-config-it-deployment.yaml | 2 +- ...s-client-config-it-polling-deployment.yaml | 2 +- .../pom.xml | 23 ---- .../watcher/ActuatorRefreshIT.java | 16 +-- .../watcher/ActuatorRefreshKafkaIT.java | 21 +--- .../watcher/ActuatorRefreshRabbitMQIT.java | 19 +-- ...iguration-watcher-bus-amqp-deployment.yaml | 2 +- ...guration-watcher-bus-kafka-deployment.yaml | 2 +- ...configuration-watcher-http-deployment.yaml | 2 +- ...ration-watcher-it-bus-amqp-deployment.yaml | 2 +- ...ation-watcher-it-bus-kafka-deployment.yaml | 2 +- .../pom.xml | 23 ---- .../core/k8s/it/ActuatorEndpointIT.java | 15 --- ...ernetes-core-k8s-client-it-deployment.yaml | 2 +- 17 files changed, 52 insertions(+), 235 deletions(-) diff --git a/spring-cloud-kubernetes-integration-tests/run.sh b/spring-cloud-kubernetes-integration-tests/run.sh index e2ca839b..d2ac35de 100755 --- a/spring-cloud-kubernetes-integration-tests/run.sh +++ b/spring-cloud-kubernetes-integration-tests/run.sh @@ -14,16 +14,30 @@ KIND="${BIN_DIR}/kind" ISTIOCTL="${BIN_DIR}/istio-1.6.2/bin/istioctl" +MVN_VERSION=$(mvn -q \ + -Dexec.executable=echo \ + -Dexec.args='${project.version}' \ + --non-recursive \ + exec:exec) + +ALL_INTEGRATION_PROJECTS=( + "spring-cloud-kubernetes-core-k8s-client-it" + "spring-cloud-kubernetes-client-config-it" + "spring-cloud-kubernetes-configuration-watcher-it" +) +INTEGRATION_PROJECTS=(${INTEGRATION_PROJECTS:-${ALL_INTEGRATION_PROJECTS[@]}}) + +DEFAULT_PULLING_IMAGES=( + "docker.io/springcloud/spring-cloud-kubernetes-configuration-watcher:${MVN_VERSION}" +) +PULLING_IMAGES=(${PULLING_IMAGES:-${DEFAULT_PULLING_IMAGES[@]}}) + CURRENT_DIR="$(pwd)" # cleanup on exit (useful for running locally) cleanup() { "${KIND}" delete cluster || true rm -rf "${BIN_DIR}" - - docker kill kind-registry - docker rm kind-registry - docker network rm kind } trap cleanup EXIT @@ -56,40 +70,6 @@ install_kind_release() { chmod +x "${KIND}" } -setup_registry() { -set -o errexit - -# create registry container unless it already exists -reg_name='kind-registry' -reg_port='5000' -running="$(docker inspect -f '{{.State.Running}}' "${reg_name}" 2>/dev/null || true)" -if [ "${running}" != 'true' ]; then - docker run \ - -d --restart=always -p "${reg_port}:5000" --name "${reg_name}" \ - registry:2 -fi - -# create a cluster with the local registry enabled in containerd -cat </dev/null || true)" - if [ "${running}" != 'true' ]; then - # If the container is not running but has exited remove it before trying to start it - if [ "$(docker ps -aq -f status=exited -f name=${reg_name})" ]; then - # cleanup - docker rm "${reg_name}" - fi - - docker run \ - -d --restart=always -p "${reg_port}:5000" --name "${reg_name}" \ - registry:2 - fi - #TODO what happens if cluster is already there???? - "${KIND}" create cluster --config kind-config.yaml --loglevel=debug - - # connect the registry to the cluster network - docker network connect "kind" "${reg_name}" - - # tell https://tilt.dev to use the registry - # https://docs.tilt.dev/choosing_clusters.html#discovering-the-registry - for node in $("${KIND}" get nodes); do - kubectl annotate node "${node}" "kind.x-k8s.io/registry=localhost:${reg_port}"; - done + "${KIND}" create cluster --config=kind-config.yaml --loglevel=debug # set KUBECONFIG to point to the cluster kubectl cluster-info --context kind-kind @@ -131,26 +86,36 @@ main() { #setup nginx ingress # kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/master/deploy/static/provider/kind/deploy.yaml kubectl apply -fhttps://raw.githubusercontent.com/kubernetes/ingress-nginx/12150e318b972a03fb49d827e6cabb8ef62247ef/deploy/static/provider/kind/deploy.yaml + sleep 5 # hold 5 sec so that the pods can be created kubectl wait --namespace ingress-nginx --for=condition=ready pod --selector=app.kubernetes.io/component=controller --timeout=360s # This creates the service account, role, and role binding necessary for Spring Cloud k8s apps kubectl apply -f ./permissions.yaml -# cd ${BIN_DIR} -# curl -L https://istio.io/downloadIstio | sh - + # cd ${BIN_DIR} + # curl -L https://istio.io/downloadIstio | sh - #"${ISTIOCTL}" install --set profile=demo cd $CURRENT_DIR - # TODO: invoke your tests here - cd spring-cloud-kubernetes-core-k8s-client-it - ../../mvnw clean install -P it - cd ../ - cd spring-cloud-kubernetes-client-config-it - ../../mvnw clean install -P it - cd ../ - cd spring-cloud-kubernetes-configuration-watcher-it - ../../mvnw clean install -P it + # pulling necessary images for setting up the integration test environment + for i in "${PULLING_IMAGES[@]}"; do + echo "Pull images for prepping testing environment: $i" + docker pull $i + "${KIND}" load docker-image $i + done + + # running tests.. + for p in "${INTEGRATION_PROJECTS[@]}"; do + echo "Running test: $p" + cd $p + ../../mvnw spring-boot:build-image \ + -Dspring-boot.build-image.imageName=docker.io/springcloud/$p:${MVN_VERSION} + "${KIND}" load docker-image docker.io/springcloud/$p:${MVN_VERSION} + ../../mvnw clean install -P it + cd .. + done + # teardown will happen automatically on exit } diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-config-it/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-config-it/pom.xml index 3d6db651..e3e0bdb3 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-config-it/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-config-it/pom.xml @@ -63,28 +63,4 @@ - - - - org.springframework.boot - spring-boot-maven-plugin - - - ${env.IMAGE} - - build-image - - - - package - - build-image - - - - - - - - diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-config-it/src/test/java/org/springframework/cloud/kubernetes/client/config/it/ConfigMapAndSecretIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-config-it/src/test/java/org/springframework/cloud/kubernetes/client/config/it/ConfigMapAndSecretIT.java index dfe1ce3f..30515a55 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-config-it/src/test/java/org/springframework/cloud/kubernetes/client/config/it/ConfigMapAndSecretIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-config-it/src/test/java/org/springframework/cloud/kubernetes/client/config/it/ConfigMapAndSecretIT.java @@ -20,12 +20,6 @@ import java.io.IOException; import java.time.Duration; import java.util.Map; -import com.github.dockerjava.api.DockerClient; -import com.github.dockerjava.core.DefaultDockerClientConfig; -import com.github.dockerjava.core.DockerClientConfig; -import com.github.dockerjava.core.DockerClientImpl; -import com.github.dockerjava.httpclient5.ApacheDockerHttpClient; -import com.github.dockerjava.transport.DockerHttpClient; import io.kubernetes.client.openapi.ApiClient; import io.kubernetes.client.openapi.Configuration; import io.kubernetes.client.openapi.apis.AppsV1Api; @@ -108,15 +102,6 @@ public class ConfigMapAndSecretIT { appsApi = new AppsV1Api(); networkingApi = new NetworkingV1beta1Api(); k8SUtils = new K8SUtils(api, appsApi); - - DockerClientConfig config = DefaultDockerClientConfig.createDefaultConfigBuilder() - .withRegistryUrl(KIND_REPO_URL).build(); - DockerHttpClient httpClient = new ApacheDockerHttpClient.Builder().dockerHost(config.getDockerHost()) - .sslConfig(config.getSSLConfig()).build(); - - DockerClient dockerClient = DockerClientImpl.getInstance(config, httpClient); - dockerClient.tagImageCmd(LOCAL_IMAGE, KIND_IMAGE, IMAGE_TAG).exec(); - dockerClient.pushImageCmd(KIND_IMAGE_WITH_TAG).start(); } @After diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-config-it/src/test/resources/spring-cloud-kubernetes-client-config-it-deployment.yaml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-config-it/src/test/resources/spring-cloud-kubernetes-client-config-it-deployment.yaml index 7ad29f53..f2fe4f2d 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-config-it/src/test/resources/spring-cloud-kubernetes-client-config-it-deployment.yaml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-config-it/src/test/resources/spring-cloud-kubernetes-client-config-it-deployment.yaml @@ -14,7 +14,7 @@ spec: serviceAccountName: spring-cloud-kubernetes-serviceaccount containers: - name: spring-cloud-kubernetes-client-config-it - image: localhost:5000/spring-cloud-kubernetes-client-config-it:2.0.0-SNAPSHOT + image: docker.io/springcloud/spring-cloud-kubernetes-client-config-it:2.0.0-SNAPSHOT imagePullPolicy: IfNotPresent readinessProbe: httpGet: diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-config-it/src/test/resources/spring-cloud-kubernetes-client-config-it-polling-deployment.yaml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-config-it/src/test/resources/spring-cloud-kubernetes-client-config-it-polling-deployment.yaml index f769348e..64f415e0 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-config-it/src/test/resources/spring-cloud-kubernetes-client-config-it-polling-deployment.yaml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-config-it/src/test/resources/spring-cloud-kubernetes-client-config-it-polling-deployment.yaml @@ -14,7 +14,7 @@ spec: serviceAccountName: spring-cloud-kubernetes-serviceaccount containers: - name: spring-cloud-kubernetes-client-config-it - image: localhost:5000/spring-cloud-kubernetes-client-config-it:2.0.0-SNAPSHOT + image: docker.io/springcloud/spring-cloud-kubernetes-client-config-it:2.0.0-SNAPSHOT imagePullPolicy: IfNotPresent readinessProbe: httpGet: diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/pom.xml index 48ec633f..f6d819cc 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/pom.xml @@ -76,27 +76,4 @@ - - - - - org.springframework.boot - spring-boot-maven-plugin - - - springcloud/${project.artifactId}:${project.version} - - build-image - - - - package - - build-image - - - - - - diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshIT.java index 14728d70..1c0faa77 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshIT.java @@ -18,12 +18,6 @@ package org.springframework.cloud.kubernetes.configuration.watcher; import java.time.Duration; -import com.github.dockerjava.api.DockerClient; -import com.github.dockerjava.core.DefaultDockerClientConfig; -import com.github.dockerjava.core.DockerClientConfig; -import com.github.dockerjava.core.DockerClientImpl; -import com.github.dockerjava.httpclient5.ApacheDockerHttpClient; -import com.github.dockerjava.transport.DockerHttpClient; import com.github.tomakehurst.wiremock.client.WireMock; import io.kubernetes.client.openapi.ApiClient; import io.kubernetes.client.openapi.Configuration; @@ -104,6 +98,7 @@ public class ActuatorRefreshIT { @Before public void setup() throws Exception { this.client = Config.defaultClient(); + this.client.setHttpClient(this.client.getHttpClient().newBuilder().readTimeout(Duration.ofSeconds(15)).build()); // client.setDebugging(true); Configuration.setDefaultApiClient(client); this.api = new CoreV1Api(); @@ -111,15 +106,6 @@ public class ActuatorRefreshIT { this.networkingApi = new NetworkingV1beta1Api(); this.k8SUtils = new K8SUtils(api, appsApi); - DockerClientConfig config = DefaultDockerClientConfig.createDefaultConfigBuilder() - .withRegistryUrl(KIND_REPO_URL).build(); - DockerHttpClient httpClient = new ApacheDockerHttpClient.Builder().dockerHost(config.getDockerHost()) - .sslConfig(config.getSSLConfig()).build(); - - DockerClient dockerClient = DockerClientImpl.getInstance(config, httpClient); - dockerClient.tagImageCmd(LOCAL_IMAGE, KIND_IMAGE, IMAGE_TAG).exec(); - dockerClient.pushImageCmd(KIND_IMAGE_WITH_TAG).start(); - deployWiremock(); // Check to make sure the wiremock deployment is ready diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshKafkaIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshKafkaIT.java index 6086e351..b717c3f7 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshKafkaIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshKafkaIT.java @@ -18,12 +18,6 @@ package org.springframework.cloud.kubernetes.configuration.watcher; import java.time.Duration; -import com.github.dockerjava.api.DockerClient; -import com.github.dockerjava.core.DefaultDockerClientConfig; -import com.github.dockerjava.core.DockerClientConfig; -import com.github.dockerjava.core.DockerClientImpl; -import com.github.dockerjava.httpclient5.ApacheDockerHttpClient; -import com.github.dockerjava.transport.DockerHttpClient; import io.kubernetes.client.openapi.ApiClient; import io.kubernetes.client.openapi.Configuration; import io.kubernetes.client.openapi.apis.AppsV1Api; @@ -112,25 +106,14 @@ public class ActuatorRefreshKafkaIT { @Before public void setup() throws Exception { this.client = Config.defaultClient(); - client.setDebugging(true); + // client.setDebugging(true); + this.client.setHttpClient(this.client.getHttpClient().newBuilder().readTimeout(Duration.ofSeconds(15)).build()); Configuration.setDefaultApiClient(client); this.api = new CoreV1Api(); this.appsApi = new AppsV1Api(); this.networkingApi = new NetworkingV1beta1Api(); this.k8SUtils = new K8SUtils(api, appsApi); - DockerClientConfig config = DefaultDockerClientConfig.createDefaultConfigBuilder() - .withRegistryUrl(KIND_REPO_URL).build(); - DockerHttpClient httpClient = new ApacheDockerHttpClient.Builder().dockerHost(config.getDockerHost()) - .sslConfig(config.getSSLConfig()).build(); - - DockerClient dockerClient = DockerClientImpl.getInstance(config, httpClient); - dockerClient.tagImageCmd(CONFIG_WATCHER_LOCAL_IMAGE, CONFIG_WATCHER_KIND_IMAGE, IMAGE_TAG).exec(); - dockerClient.pushImageCmd(CONFIG_WATCHER_KIND_IMAGE_WITH_TAG).start(); - - dockerClient.tagImageCmd(CONFIG_WATCHER_IT_LOCAL_IMAGE, CONFIG_WATCHER_IT_KIND_IMAGE, IMAGE_TAG).exec(); - dockerClient.pushImageCmd(CONFIG_WATCHER_IT_KIND_IMAGE_WITH_TAG).start(); - deployZookeeper(); k8SUtils.waitForDeployment(ZOOKEEPER_DEPLOYMENT, NAMESPACE); diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshRabbitMQIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshRabbitMQIT.java index fe5043a0..c46af336 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshRabbitMQIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshRabbitMQIT.java @@ -18,12 +18,6 @@ package org.springframework.cloud.kubernetes.configuration.watcher; import java.time.Duration; -import com.github.dockerjava.api.DockerClient; -import com.github.dockerjava.core.DefaultDockerClientConfig; -import com.github.dockerjava.core.DockerClientConfig; -import com.github.dockerjava.core.DockerClientImpl; -import com.github.dockerjava.httpclient5.ApacheDockerHttpClient; -import com.github.dockerjava.transport.DockerHttpClient; import io.kubernetes.client.openapi.ApiClient; import io.kubernetes.client.openapi.Configuration; import io.kubernetes.client.openapi.apis.AppsV1Api; @@ -107,6 +101,7 @@ public class ActuatorRefreshRabbitMQIT { @Before public void setup() throws Exception { this.client = Config.defaultClient(); + this.client.setHttpClient(this.client.getHttpClient().newBuilder().readTimeout(Duration.ofSeconds(15)).build()); // client.setDebugging(true); Configuration.setDefaultApiClient(client); this.api = new CoreV1Api(); @@ -114,18 +109,6 @@ public class ActuatorRefreshRabbitMQIT { this.networkingApi = new NetworkingV1beta1Api(); this.k8SUtils = new K8SUtils(api, appsApi); - DockerClientConfig config = DefaultDockerClientConfig.createDefaultConfigBuilder() - .withRegistryUrl(KIND_REPO_URL).build(); - DockerHttpClient httpClient = new ApacheDockerHttpClient.Builder().dockerHost(config.getDockerHost()) - .sslConfig(config.getSSLConfig()).build(); - - DockerClient dockerClient = DockerClientImpl.getInstance(config, httpClient); - dockerClient.tagImageCmd(CONFIG_WATCHER_LOCAL_IMAGE, CONFIG_WATCHER_KIND_IMAGE, IMAGE_TAG).exec(); - dockerClient.pushImageCmd(CONFIG_WATCHER_KIND_IMAGE_WITH_TAG).start(); - - dockerClient.tagImageCmd(CONFIG_WATCHER_IT_LOCAL_IMAGE, CONFIG_WATCHER_IT_KIND_IMAGE, IMAGE_TAG).exec(); - dockerClient.pushImageCmd(CONFIG_WATCHER_IT_KIND_IMAGE_WITH_TAG).start(); - deployRabbitMQ(); k8SUtils.waitForReplicationController(RABBIT_MQ_CONTROLLER_NAME, NAMESPACE); diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/resources/spring-cloud-kubernetes-configuration-watcher-bus-amqp-deployment.yaml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/resources/spring-cloud-kubernetes-configuration-watcher-bus-amqp-deployment.yaml index 4d9a72fd..0e2ead1d 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/resources/spring-cloud-kubernetes-configuration-watcher-bus-amqp-deployment.yaml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/resources/spring-cloud-kubernetes-configuration-watcher-bus-amqp-deployment.yaml @@ -14,7 +14,7 @@ spec: serviceAccountName: spring-cloud-kubernetes-serviceaccount containers: - name: spring-cloud-kubernetes-configuration-watcher - image: localhost:5000/spring-cloud-kubernetes-configuration-watcher:2.0.0-SNAPSHOT + image: docker.io/springcloud/spring-cloud-kubernetes-configuration-watcher:2.0.0-SNAPSHOT imagePullPolicy: IfNotPresent env: - name: SPRING_PROFILES_ACTIVE diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/resources/spring-cloud-kubernetes-configuration-watcher-bus-kafka-deployment.yaml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/resources/spring-cloud-kubernetes-configuration-watcher-bus-kafka-deployment.yaml index 6b9cca5a..39165cc4 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/resources/spring-cloud-kubernetes-configuration-watcher-bus-kafka-deployment.yaml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/resources/spring-cloud-kubernetes-configuration-watcher-bus-kafka-deployment.yaml @@ -14,7 +14,7 @@ spec: serviceAccountName: spring-cloud-kubernetes-serviceaccount containers: - name: spring-cloud-kubernetes-configuration-watcher - image: localhost:5000/spring-cloud-kubernetes-configuration-watcher:2.0.0-SNAPSHOT + image: docker.io/springcloud/spring-cloud-kubernetes-configuration-watcher:2.0.0-SNAPSHOT imagePullPolicy: IfNotPresent env: - name: SPRING_PROFILES_ACTIVE diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/resources/spring-cloud-kubernetes-configuration-watcher-http-deployment.yaml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/resources/spring-cloud-kubernetes-configuration-watcher-http-deployment.yaml index 68089e13..1ece4aa8 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/resources/spring-cloud-kubernetes-configuration-watcher-http-deployment.yaml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/resources/spring-cloud-kubernetes-configuration-watcher-http-deployment.yaml @@ -14,7 +14,7 @@ spec: serviceAccountName: spring-cloud-kubernetes-serviceaccount containers: - name: spring-cloud-kubernetes-configuration-watcher - image: localhost:5000/spring-cloud-kubernetes-configuration-watcher:2.0.0-SNAPSHOT + image: docker.io/springcloud/spring-cloud-kubernetes-configuration-watcher:2.0.0-SNAPSHOT imagePullPolicy: IfNotPresent readinessProbe: httpGet: diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/resources/spring-cloud-kubernetes-configuration-watcher-it-bus-amqp-deployment.yaml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/resources/spring-cloud-kubernetes-configuration-watcher-it-bus-amqp-deployment.yaml index 3f5fa899..12a885e8 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/resources/spring-cloud-kubernetes-configuration-watcher-it-bus-amqp-deployment.yaml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/resources/spring-cloud-kubernetes-configuration-watcher-it-bus-amqp-deployment.yaml @@ -13,7 +13,7 @@ spec: spec: containers: - name: spring-cloud-kubernetes-configuration-watcher-it - image: localhost:5000/spring-cloud-kubernetes-configuration-watcher-it:2.0.0-SNAPSHOT + image: docker.io/springcloud/spring-cloud-kubernetes-configuration-watcher-it:2.0.0-SNAPSHOT imagePullPolicy: IfNotPresent env: - name: SPRING_PROFILES_ACTIVE diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/resources/spring-cloud-kubernetes-configuration-watcher-it-bus-kafka-deployment.yaml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/resources/spring-cloud-kubernetes-configuration-watcher-it-bus-kafka-deployment.yaml index dcf13336..1b0e27d8 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/resources/spring-cloud-kubernetes-configuration-watcher-it-bus-kafka-deployment.yaml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/resources/spring-cloud-kubernetes-configuration-watcher-it-bus-kafka-deployment.yaml @@ -13,7 +13,7 @@ spec: spec: containers: - name: spring-cloud-kubernetes-configuration-watcher-it - image: localhost:5000/spring-cloud-kubernetes-configuration-watcher-it:2.0.0-SNAPSHOT + image: docker.io/springcloud/spring-cloud-kubernetes-configuration-watcher-it:2.0.0-SNAPSHOT imagePullPolicy: IfNotPresent env: - name: SPRING_PROFILES_ACTIVE diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-core-k8s-client-it/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-core-k8s-client-it/pom.xml index 300f3096..7b17e220 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-core-k8s-client-it/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-core-k8s-client-it/pom.xml @@ -63,27 +63,4 @@ - - - - org.springframework.boot - spring-boot-maven-plugin - - - ${env.IMAGE} - - build-image - - - - package - - build-image - - - - - - - diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-core-k8s-client-it/src/test/java/org/springframework/cloud/kubernetes/core/k8s/it/ActuatorEndpointIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-core-k8s-client-it/src/test/java/org/springframework/cloud/kubernetes/core/k8s/it/ActuatorEndpointIT.java index e093d547..e573e66e 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-core-k8s-client-it/src/test/java/org/springframework/cloud/kubernetes/core/k8s/it/ActuatorEndpointIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-core-k8s-client-it/src/test/java/org/springframework/cloud/kubernetes/core/k8s/it/ActuatorEndpointIT.java @@ -20,12 +20,6 @@ import java.io.IOException; import java.time.Duration; import java.util.Map; -import com.github.dockerjava.api.DockerClient; -import com.github.dockerjava.core.DefaultDockerClientConfig; -import com.github.dockerjava.core.DockerClientConfig; -import com.github.dockerjava.core.DockerClientImpl; -import com.github.dockerjava.httpclient5.ApacheDockerHttpClient; -import com.github.dockerjava.transport.DockerHttpClient; import io.kubernetes.client.openapi.ApiClient; import io.kubernetes.client.openapi.Configuration; import io.kubernetes.client.openapi.apis.AppsV1Api; @@ -104,15 +98,6 @@ public class ActuatorEndpointIT { networkingApi = new NetworkingV1beta1Api(); k8SUtils = new K8SUtils(api, appsApi); - DockerClientConfig config = DefaultDockerClientConfig.createDefaultConfigBuilder() - .withRegistryUrl(KIND_REPO_URL).build(); - DockerHttpClient httpClient = new ApacheDockerHttpClient.Builder().dockerHost(config.getDockerHost()) - .sslConfig(config.getSSLConfig()).build(); - - DockerClient dockerClient = DockerClientImpl.getInstance(config, httpClient); - dockerClient.tagImageCmd(LOCAL_IMAGE, KIND_IMAGE, IMAGE_TAG).exec(); - dockerClient.pushImageCmd(KIND_IMAGE_WITH_TAG).start(); - deployCoreK8sClientIt(); // Check to make sure the controller deployment is ready diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-core-k8s-client-it/src/test/resources/spring-cloud-kubernetes-core-k8s-client-it-deployment.yaml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-core-k8s-client-it/src/test/resources/spring-cloud-kubernetes-core-k8s-client-it-deployment.yaml index e2b721bf..4f0bbc0d 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-core-k8s-client-it/src/test/resources/spring-cloud-kubernetes-core-k8s-client-it-deployment.yaml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-core-k8s-client-it/src/test/resources/spring-cloud-kubernetes-core-k8s-client-it-deployment.yaml @@ -14,7 +14,7 @@ spec: serviceAccountName: spring-cloud-kubernetes-serviceaccount containers: - name: spring-cloud-kubernetes-core-k8s-client-it - image: localhost:5000/spring-cloud-kubernetes-core-k8s-client-it:2.0.0-SNAPSHOT + image: docker.io/springcloud/spring-cloud-kubernetes-core-k8s-client-it:2.0.0-SNAPSHOT imagePullPolicy: IfNotPresent readinessProbe: httpGet: