SpringCloud/spring-cloud-kubernetes
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixes failing integration test due to removal of configuration-watcher images from dockerhub

Browse Source
This commit is contained in:
yue9944882
2020-12-24 17:20:42 +08:00
parent 2f752a8df2
commit 9500d913ca
7 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-cloud-kubernetes-integration-tests/pom.xml
View File

@@ -160,6 +160,11 @@
<module>discovery</module>
<module>load-balancer</module>
<!-- Add this module back once we convert everything over to kind -->
<!-- <module>spring-cloud-kubernetes-configuration-watcher-it</module>-->
<!-- <module>spring-cloud-kubernetes-client-config-it</module>-->
<!-- <module>spring-cloud-kubernetes-client-loadbalancer-it</module>-->
<!-- <module>spring-cloud-kubernetes-client-reactive-discovery-client-it</module>-->
<!-- <module>spring-cloud-kubernetes-configuration-watcher-it</module>-->
<!-- <module>spring-cloud-kubernetes-configuration-watcher-it</module>-->
<!-- <module>spring-cloud-kubernetes-core-k8s-client-it</module>-->
</modules>
</project>

14
spring-cloud-kubernetes-integration-tests/run.sh
View File

@@ -14,6 +14,8 @@ KIND="${BIN_DIR}/kind"
ISTIOCTL="${BIN_DIR}/istio-1.6.2/bin/istioctl"
CURRENT_DIR="$(pwd)"
MVN="${CURRENT_DIR}/../mvnw"
MVN_VERSION=$(../mvnw -q \
-Dexec.executable=echo \
-Dexec.args='${project.version}' \
@@ -34,7 +36,6 @@ DEFAULT_PULLING_IMAGES=(
)
PULLING_IMAGES=(${PULLING_IMAGES:-${DEFAULT_PULLING_IMAGES[@]}})
CURRENT_DIR="$(pwd)"
# cleanup on exit (useful for running locally)
cleanup() {
@@ -100,12 +101,13 @@ main() {
# curl -L https://istio.io/downloadIstio | sh -
#"${ISTIOCTL}" install --set profile=demo
cd $CURRENT_DIR
# building required images for running integration tests
cd $CURRENT_DIR/../spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher
${MVN} clean install
cd $CURRENT_DIR
# 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
@@ -113,10 +115,10 @@ main() {
for p in "${INTEGRATION_PROJECTS[@]}"; do
echo "Running test: $p"
cd $p
../../mvnw spring-boot:build-image \
${MVN} 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
${MVN} clean install -P it
cd ..
done

2
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-config-it/src/test/java/org/springframework/cloud/kubernetes/client/config/it/ConfigMapAndSecretIT.java
View File

@@ -88,7 +88,7 @@ public class ConfigMapAndSecretIT {
@After
public void after() throws Exception {
appsApi.deleteCollectionNamespacedDeployment(NAMESPACE, null, null, null,
"metadata.name=" + K8S_CONFIG_CLIENT_IT_NAME, null, null, null, null, null, null, null, null);
"metadata.name=" + K8S_CONFIG_CLIENT_IT_NAME, null, null, null, null, null, null, null, null, null);
api.deleteNamespacedService(K8S_CONFIG_CLIENT_IT_SERVICE_NAME, NAMESPACE, null, null, null, null, null, null);
networkingApi.deleteNamespacedIngress("it-ingress", NAMESPACE, null, null, null, null, null, null);
api.deleteNamespacedConfigMap(APP_NAME, NAMESPACE, null, null, null, null, null, null);

4
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-loadbalancer-it/src/test/java/org/springframework/cloud/kubernetes/client/loadbalancer/it/LoadBalancerIT.java
View File

@@ -119,7 +119,7 @@ public class LoadBalancerIT {
private void cleanup() throws ApiException {
appsApi.deleteCollectionNamespacedDeployment(NAMESPACE, null, null, null,
"metadata.name=" + SPRING_CLOUD_K8S_LOADBALANCER_DEPLOYMENT_NAME, null, null, null, null, null, null,
"metadata.name=" + SPRING_CLOUD_K8S_LOADBALANCER_DEPLOYMENT_NAME, null, null, null, null, null, null, null,
null, null);
api.deleteNamespacedService(SPRING_CLOUD_K8S_LOADBALANCER_APP_NAME, NAMESPACE, null, null, null, null, null,
null);
@@ -159,7 +159,7 @@ public class LoadBalancerIT {
@After
public void after() throws Exception {
appsApi.deleteCollectionNamespacedDeployment(NAMESPACE, null, null, null,
"metadata.name=" + WIREMOCK_DEPLOYMENT_NAME, null, null, null, null, null, null, null, null);
"metadata.name=" + WIREMOCK_DEPLOYMENT_NAME, null, null, null, null, null, null, null, null, null);
api.deleteNamespacedService(WIREMOCK_APP_NAME, NAMESPACE, null, null, null, null, null, null);
networkingApi.deleteNamespacedIngress("wiremock-ingress", NAMESPACE, null, null, null, null, null, null);

4
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-reactive-discovery-client-it/src/test/java/org/springframework/cloud/kubernetes/client/reactive/discovery/it/ReactiveDiscoveryClientIT.java
View File

@@ -112,7 +112,7 @@ public class ReactiveDiscoveryClientIT {
private void cleanup() throws ApiException {
appsApi.deleteCollectionNamespacedDeployment(NAMESPACE, null, null, null,
"metadata.name=" + SPRING_CLOUD_K8S_REACTIVE_DISCOVERY_DEPLOYMENT_NAME, null, null, null, null, null,
null, null, null);
null, null, null, null);
api.deleteNamespacedService(SPRING_CLOUD_K8S_REACTIVE_DISCOVERY_APP_NAME, NAMESPACE, null, null, null, null,
null, null);
networkingApi.deleteNamespacedIngress("it-ingress", NAMESPACE, null, null, null, null, null, null);
@@ -150,7 +150,7 @@ public class ReactiveDiscoveryClientIT {
@After
public void after() throws Exception {
appsApi.deleteCollectionNamespacedDeployment(NAMESPACE, null, null, null,
"metadata.name=" + WIREMOCK_DEPLOYMENT_NAME, null, null, null, null, null, null, null, null);
"metadata.name=" + WIREMOCK_DEPLOYMENT_NAME, null, null, null, null, null, null, null, null, null);
api.deleteNamespacedService(WIREMOCK_APP_NAME, NAMESPACE, null, null, null, null, null, null);
networkingApi.deleteNamespacedIngress("wiremock-ingress", NAMESPACE, null, null, null, null, null, null);

4
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshIT.java
View File

@@ -141,10 +141,10 @@ public class ActuatorRefreshIT {
appsApi.deleteCollectionNamespacedDeployment(NAMESPACE, null, null, null,
"metadata.name=" + SPRING_CLOUD_K8S_CONFIG_WATCHER_DEPLOYMENT_NAME, null, null, null, null, null, null,
null, null);
null, null, null);
appsApi.deleteCollectionNamespacedDeployment(NAMESPACE, null, null, null,
"metadata.name=" + CONFIG_WATCHER_WIREMOCK_DEPLOYMENT_NAME, null, null, null, null, null, null, null,
null);
null, null);
api.deleteNamespacedService(SPRING_CLOUD_K8S_CONFIG_WATCHER_APP_NAME, NAMESPACE, null, null, null, null, null,
null);
api.deleteNamespacedService(CONFIG_WATCHER_WIREMOCK_APP_NAME, NAMESPACE, null, null, null, null, null, null);

2
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-core-k8s-client-it/src/test/java/org/springframework/cloud/kubernetes/core/k8s/it/ActuatorEndpointIT.java
View File

@@ -192,7 +192,7 @@ public class ActuatorEndpointIT {
@AfterClass
public static void after() throws Exception {
appsApi.deleteCollectionNamespacedDeployment(NAMESPACE, null, null, null,
"metadata.name=" + K8S_CONFIG_CLIENT_IT_NAME, null, null, null, null, null, null, null, null);
"metadata.name=" + K8S_CONFIG_CLIENT_IT_NAME, null, null, null, null, null, null, null, null, null);
api.deleteNamespacedService(K8S_CONFIG_CLIENT_IT_SERVICE_NAME, NAMESPACE, null, null, null, null, null, null);
networkingApi.deleteNamespacedIngress("it-ingress", NAMESPACE, null, null, null, null, null, null);
}