From 032014e7b841bb3346f2a9a097fe9bd5983a30e9 Mon Sep 17 00:00:00 2001 From: wind57 Date: Sat, 4 Dec 2021 07:59:07 -0800 Subject: [PATCH 01/70] test --- delme.sh | 1 + 1 file changed, 1 insertion(+) create mode 100644 delme.sh diff --git a/delme.sh b/delme.sh new file mode 100644 index 0000000000..707d90cb73 --- /dev/null +++ b/delme.sh @@ -0,0 +1 @@ +dadsa \ No newline at end of file From 10889fd1fc9c5ec3a32699d70d4a0e914aae7577 Mon Sep 17 00:00:00 2001 From: wind57 Date: Thu, 16 Dec 2021 04:15:40 -0800 Subject: [PATCH 02/70] fix @Nested tests not running --- .circleci/config.yml | 2 +- pom.xml | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2f197c14d8..7eed9f3449 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -44,7 +44,7 @@ jobs: echo $CLASSNAMES TEST_ARG=$(echo $CLASSNAMES | sed 's/ /,/g') echo $TEST_ARG - ./mvnw -s .settings.xml -DfailIfNoTests=false -Dtest=$TEST_ARG -e clean org.jacoco:jacoco-maven-plugin:prepare-agent test -U -P sonar -nsu --batch-mode -Dmaven.test.redirectTestOutputToFile=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + ./mvnw -s .settings.xml -DfailIfNoTests=false -DtestsToRun=$TEST_ARG -e clean org.jacoco:jacoco-maven-plugin:prepare-agent test -U -P sonar -nsu --batch-mode -Dmaven.test.redirectTestOutputToFile=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn mkdir -p $HOME/artifacts/junit/ find . -type f -regex ".*/spring-cloud-*.*/target/*.*" -exec cp {} $HOME/artifacts/ \; find . -type f -regex ".*/target/.*-reports/.*" -exec cp {} $HOME/artifacts/junit/ \; diff --git a/pom.xml b/pom.xml index 191dae7c2d..e25caca33c 100644 --- a/pom.xml +++ b/pom.xml @@ -204,6 +204,11 @@ all false + + + + ${testsToRun} + @@ -356,6 +361,11 @@ all false + + + + ${testsToRun} + ${surefireArgLine} From b041c00ea5cac0bb3e7bd43bc75ee470920cc3fe Mon Sep 17 00:00:00 2001 From: wind57 Date: Thu, 13 Jan 2022 15:33:08 +0200 Subject: [PATCH 03/70] trigger again From a34ac473971fca316b05a0b886de000f05220b1e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 13 Jul 2022 08:43:39 +0000 Subject: [PATCH 04/70] Add renovate.json --- renovate.json | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 renovate.json diff --git a/renovate.json b/renovate.json new file mode 100644 index 0000000000..7bd954555f --- /dev/null +++ b/renovate.json @@ -0,0 +1,6 @@ +{ + "$schema": "https://docs.renovatebot.com/renovate-schema.json", + "extends": [ + "config:base" + ] +} From cabd82ac6d11e8629a21f21848af0ca0ca55d7f5 Mon Sep 17 00:00:00 2001 From: wind57 Date: Tue, 7 Feb 2023 11:14:36 +0200 Subject: [PATCH 05/70] fix --- ...ormerDiscoveryClientAutoConfiguration.java | 17 ++------ ...tesDiscoveryClientHealthConfiguration.java | 41 +++++++++++++++++++ ...netesDiscoveryClientAutoConfiguration.java | 17 ++------ 3 files changed, 47 insertions(+), 28 deletions(-) create mode 100644 spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/discovery/KubernetesDiscoveryClientHealthConfiguration.java diff --git a/spring-cloud-kubernetes-client-discovery/src/main/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesInformerDiscoveryClientAutoConfiguration.java b/spring-cloud-kubernetes-client-discovery/src/main/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesInformerDiscoveryClientAutoConfiguration.java index 07ddaf055d..1966283bf6 100644 --- a/spring-cloud-kubernetes-client-discovery/src/main/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesInformerDiscoveryClientAutoConfiguration.java +++ b/spring-cloud-kubernetes-client-discovery/src/main/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesInformerDiscoveryClientAutoConfiguration.java @@ -23,28 +23,24 @@ import io.kubernetes.client.openapi.models.V1Service; import io.kubernetes.client.spring.extended.controller.config.KubernetesInformerAutoConfiguration; -import org.springframework.boot.actuate.health.HealthIndicator; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.AutoConfigureBefore; -import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnCloudPlatform; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.cloud.CloudPlatform; import org.springframework.cloud.client.CommonsClientAutoConfiguration; import org.springframework.cloud.client.ConditionalOnBlockingDiscoveryEnabled; import org.springframework.cloud.client.ConditionalOnDiscoveryEnabled; -import org.springframework.cloud.client.ConditionalOnDiscoveryHealthIndicatorEnabled; import org.springframework.cloud.client.discovery.simple.SimpleDiscoveryClientAutoConfiguration; import org.springframework.cloud.kubernetes.client.KubernetesClientAutoConfiguration; import org.springframework.cloud.kubernetes.commons.KubernetesNamespaceProvider; -import org.springframework.cloud.kubernetes.commons.PodUtils; import org.springframework.cloud.kubernetes.commons.discovery.ConditionalOnKubernetesDiscoveryEnabled; -import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryClientHealthIndicatorInitializer; +import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryClientHealthConfiguration; import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryProperties; import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryPropertiesAutoConfiguration; -import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Import; import org.springframework.core.env.Environment; /** @@ -60,16 +56,9 @@ // factory KubernetesInformerAutoConfiguration.class }) @AutoConfigureAfter({ KubernetesClientAutoConfiguration.class, KubernetesDiscoveryPropertiesAutoConfiguration.class }) +@Import(KubernetesDiscoveryClientHealthConfiguration.class) public class KubernetesInformerDiscoveryClientAutoConfiguration { - @Bean - @ConditionalOnClass({ HealthIndicator.class }) - @ConditionalOnDiscoveryHealthIndicatorEnabled - public KubernetesDiscoveryClientHealthIndicatorInitializer indicatorInitializer( - ApplicationEventPublisher applicationEventPublisher, PodUtils podUtils) { - return new KubernetesDiscoveryClientHealthIndicatorInitializer(podUtils, applicationEventPublisher); - } - @Bean @ConditionalOnMissingBean public KubernetesInformerDiscoveryClient kubernetesInformerDiscoveryClient( diff --git a/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/discovery/KubernetesDiscoveryClientHealthConfiguration.java b/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/discovery/KubernetesDiscoveryClientHealthConfiguration.java new file mode 100644 index 0000000000..a1ca21f336 --- /dev/null +++ b/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/discovery/KubernetesDiscoveryClientHealthConfiguration.java @@ -0,0 +1,41 @@ +/* + * Copyright 2019-2023 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.cloud.kubernetes.commons.discovery; + +import org.springframework.boot.actuate.health.HealthIndicator; +import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; +import org.springframework.cloud.client.ConditionalOnDiscoveryHealthIndicatorEnabled; +import org.springframework.cloud.kubernetes.commons.PodUtils; +import org.springframework.context.ApplicationEventPublisher; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +/** + * @author wind57 + */ +@Configuration +public class KubernetesDiscoveryClientHealthConfiguration { + + @Bean + @ConditionalOnClass({ HealthIndicator.class }) + @ConditionalOnDiscoveryHealthIndicatorEnabled + public KubernetesDiscoveryClientHealthIndicatorInitializer indicatorInitializer( + ApplicationEventPublisher applicationEventPublisher, PodUtils podUtils) { + return new KubernetesDiscoveryClientHealthIndicatorInitializer(podUtils, applicationEventPublisher); + } + +} diff --git a/spring-cloud-kubernetes-fabric8-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/discovery/KubernetesDiscoveryClientAutoConfiguration.java b/spring-cloud-kubernetes-fabric8-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/discovery/KubernetesDiscoveryClientAutoConfiguration.java index d834a1eaf0..d291be1b51 100644 --- a/spring-cloud-kubernetes-fabric8-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/discovery/KubernetesDiscoveryClientAutoConfiguration.java +++ b/spring-cloud-kubernetes-fabric8-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/discovery/KubernetesDiscoveryClientAutoConfiguration.java @@ -18,27 +18,23 @@ import io.fabric8.kubernetes.client.KubernetesClient; -import org.springframework.boot.actuate.health.HealthIndicator; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.AutoConfigureBefore; -import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnCloudPlatform; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.cloud.CloudPlatform; import org.springframework.cloud.client.CommonsClientAutoConfiguration; import org.springframework.cloud.client.ConditionalOnBlockingDiscoveryEnabled; import org.springframework.cloud.client.ConditionalOnDiscoveryEnabled; -import org.springframework.cloud.client.ConditionalOnDiscoveryHealthIndicatorEnabled; import org.springframework.cloud.client.discovery.simple.SimpleDiscoveryClientAutoConfiguration; -import org.springframework.cloud.kubernetes.commons.PodUtils; import org.springframework.cloud.kubernetes.commons.discovery.ConditionalOnKubernetesDiscoveryEnabled; -import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryClientHealthIndicatorInitializer; +import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryClientHealthConfiguration; import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryProperties; import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryPropertiesAutoConfiguration; import org.springframework.cloud.kubernetes.fabric8.Fabric8AutoConfiguration; -import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Import; import org.springframework.core.env.Environment; /** @@ -54,6 +50,7 @@ @ConditionalOnCloudPlatform(CloudPlatform.KUBERNETES) @AutoConfigureBefore({ SimpleDiscoveryClientAutoConfiguration.class, CommonsClientAutoConfiguration.class }) @AutoConfigureAfter({ Fabric8AutoConfiguration.class, KubernetesDiscoveryPropertiesAutoConfiguration.class }) +@Import(KubernetesDiscoveryClientHealthConfiguration.class) public class KubernetesDiscoveryClientAutoConfiguration { @Bean @@ -72,12 +69,4 @@ public KubernetesDiscoveryClient kubernetesDiscoveryClient(KubernetesClient clie new ServicePortSecureResolver(properties)); } - @Bean - @ConditionalOnClass({ HealthIndicator.class }) - @ConditionalOnDiscoveryHealthIndicatorEnabled - public KubernetesDiscoveryClientHealthIndicatorInitializer indicatorInitializer( - ApplicationEventPublisher applicationEventPublisher, PodUtils podUtils) { - return new KubernetesDiscoveryClientHealthIndicatorInitializer(podUtils, applicationEventPublisher); - } - } From 83b865eec975279658e6efdd4c139b7b8a0aa22e Mon Sep 17 00:00:00 2001 From: wind57 Date: Tue, 7 Feb 2023 12:10:40 +0200 Subject: [PATCH 06/70] fix test --- .../commons/KubernetesCommonsAutoConfigurationTests.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/KubernetesCommonsAutoConfigurationTests.java b/spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/KubernetesCommonsAutoConfigurationTests.java index 4c6d9b6229..e11cf8b0a5 100644 --- a/spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/KubernetesCommonsAutoConfigurationTests.java +++ b/spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/KubernetesCommonsAutoConfigurationTests.java @@ -21,7 +21,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.cloud.kubernetes.commons.config.ConfigUtils; +import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryClientHealthConfiguration; import org.springframework.context.ConfigurableApplicationContext; +import org.springframework.context.annotation.ComponentScan; import static org.assertj.core.api.Assertions.assertThat; @@ -45,6 +48,7 @@ void beansAreCreated() { } @SpringBootApplication + @ComponentScan(basePackageClasses = ConfigUtils.class) static class App { } From f3c5d19f63122dcf56471841df215e98fa9e57d5 Mon Sep 17 00:00:00 2001 From: wind57 Date: Tue, 7 Feb 2023 12:14:34 +0200 Subject: [PATCH 07/70] fix checkstyle --- .../commons/KubernetesCommonsAutoConfigurationTests.java | 1 - 1 file changed, 1 deletion(-) diff --git a/spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/KubernetesCommonsAutoConfigurationTests.java b/spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/KubernetesCommonsAutoConfigurationTests.java index e11cf8b0a5..2a86e2dc29 100644 --- a/spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/KubernetesCommonsAutoConfigurationTests.java +++ b/spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/KubernetesCommonsAutoConfigurationTests.java @@ -22,7 +22,6 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.cloud.kubernetes.commons.config.ConfigUtils; -import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryClientHealthConfiguration; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.ComponentScan; From 618f25aeccb763010ba7777653994148514c8d99 Mon Sep 17 00:00:00 2001 From: erabii Date: Tue, 14 Mar 2023 10:39:50 +0200 Subject: [PATCH 08/70] Delete renovate.json --- renovate.json | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 renovate.json diff --git a/renovate.json b/renovate.json deleted file mode 100644 index 7bd954555f..0000000000 --- a/renovate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "$schema": "https://docs.renovatebot.com/renovate-schema.json", - "extends": [ - "config:base" - ] -} From 100a9cd110d5c5e614573d8c3726b21788c1b550 Mon Sep 17 00:00:00 2001 From: erabii Date: Tue, 14 Mar 2023 10:40:02 +0200 Subject: [PATCH 09/70] Delete delme.sh --- delme.sh | 1 - 1 file changed, 1 deletion(-) delete mode 100644 delme.sh diff --git a/delme.sh b/delme.sh deleted file mode 100644 index 707d90cb73..0000000000 --- a/delme.sh +++ /dev/null @@ -1 +0,0 @@ -dadsa \ No newline at end of file From 71de2f94a2173b4067acbaa53b707e33a97eca01 Mon Sep 17 00:00:00 2001 From: wind57 Date: Thu, 23 Mar 2023 15:23:02 +0200 Subject: [PATCH 10/70] trigger build From 37f1f209fef53289a070209736b0e21b8a90bcb6 Mon Sep 17 00:00:00 2001 From: wind57 Date: Sat, 1 Apr 2023 09:52:39 +0300 Subject: [PATCH 11/70] large timeout --- .../integration/tests/commons/native_client/Util.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/native_client/Util.java b/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/native_client/Util.java index aefe2cd1fe..ab4512148c 100644 --- a/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/native_client/Util.java +++ b/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/native_client/Util.java @@ -391,7 +391,7 @@ private void waitForDeployment(String namespace, V1Deployment deployment) { private void waitForConfigMap(String namespace, V1ConfigMap configMap, Phase phase) { String configMapName = configMapName(configMap); - await().pollInterval(Duration.ofSeconds(1)).atMost(600, TimeUnit.SECONDS).until(() -> { + await().pollInterval(Duration.ofSeconds(1)).atMost(900, TimeUnit.SECONDS).until(() -> { try { coreV1Api.readNamespacedConfigMap(configMapName, namespace, null); return phase.equals(Phase.CREATE); From ce69970b96912eab33ed1cc8f620e915fd8737be Mon Sep 17 00:00:00 2001 From: wind57 Date: Sat, 1 Apr 2023 11:03:21 +0300 Subject: [PATCH 12/70] large timeout --- .../integration/tests/commons/native_client/Util.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/native_client/Util.java b/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/native_client/Util.java index ab4512148c..83fbfc5687 100644 --- a/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/native_client/Util.java +++ b/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/native_client/Util.java @@ -383,9 +383,9 @@ private String secretName(V1Secret secret) { return secret.getMetadata().getName(); } - private void waitForDeployment(String namespace, V1Deployment deployment) { + private voidwaitForDeployment(String namespace, V1Deployment deployment) { String deploymentName = deploymentName(deployment); - await().pollInterval(Duration.ofSeconds(1)).atMost(600, TimeUnit.SECONDS) + await().pollInterval(Duration.ofSeconds(1)).atMost(900, TimeUnit.SECONDS) .until(() -> isDeploymentReady(deploymentName, namespace)); } From b84be3377f1d69936c6f3d454c7967566f5a64d2 Mon Sep 17 00:00:00 2001 From: wind57 Date: Sat, 1 Apr 2023 11:06:11 +0300 Subject: [PATCH 13/70] large timeout --- .../integration/tests/commons/native_client/Util.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/native_client/Util.java b/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/native_client/Util.java index 83fbfc5687..6c4c01182a 100644 --- a/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/native_client/Util.java +++ b/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/native_client/Util.java @@ -383,7 +383,7 @@ private String secretName(V1Secret secret) { return secret.getMetadata().getName(); } - private voidwaitForDeployment(String namespace, V1Deployment deployment) { + private void waitForDeployment(String namespace, V1Deployment deployment) { String deploymentName = deploymentName(deployment); await().pollInterval(Duration.ofSeconds(1)).atMost(900, TimeUnit.SECONDS) .until(() -> isDeploymentReady(deploymentName, namespace)); From 95c60f50f9f308614afd7325194e60d1048e32c3 Mon Sep 17 00:00:00 2001 From: wind57 Date: Sun, 23 Apr 2023 11:08:01 +0300 Subject: [PATCH 14/70] fix test --- ...sInformerDiscoveryClientAutoConfiguration.java | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/spring-cloud-kubernetes-client-discovery/src/main/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesInformerDiscoveryClientAutoConfiguration.java b/spring-cloud-kubernetes-client-discovery/src/main/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesInformerDiscoveryClientAutoConfiguration.java index 734a881d1e..f80565b7db 100644 --- a/spring-cloud-kubernetes-client-discovery/src/main/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesInformerDiscoveryClientAutoConfiguration.java +++ b/spring-cloud-kubernetes-client-discovery/src/main/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesInformerDiscoveryClientAutoConfiguration.java @@ -79,21 +79,6 @@ public KubernetesInformerDiscoveryClient kubernetesInformerDiscoveryClient( serviceLister, endpointsLister, serviceInformer, endpointsInformer, properties); } - /** - * Creation of this bean triggers publishing an InstanceRegisteredEvent. In turn, - * there is the CommonsClientAutoConfiguration::DiscoveryClientHealthIndicator, that - * implements 'ApplicationListener' that will catch this event. It also registers a - * bean of type DiscoveryClientHealthIndicator via ObjectProvider. - */ - @Bean - @ConditionalOnClass({ HealthIndicator.class }) - @ConditionalOnDiscoveryHealthIndicatorEnabled - public KubernetesDiscoveryClientHealthIndicatorInitializer indicatorInitializer( - ApplicationEventPublisher applicationEventPublisher, PodUtils podUtils) { - LOG.debug(() -> "Will publish InstanceRegisteredEvent from blocking implementation"); - return new KubernetesDiscoveryClientHealthIndicatorInitializer(podUtils, applicationEventPublisher); - } - @Bean @ConditionalOnMissingBean @Conditional(ConditionalOnSelectiveNamespacesMissing.class) From 1c8449de3f2ecd3446ee662b2acc0271cf97cae0 Mon Sep 17 00:00:00 2001 From: wind57 Date: Sun, 23 Apr 2023 12:19:24 +0300 Subject: [PATCH 15/70] fix checkstyle --- ...bernetesInformerDiscoveryClientAutoConfiguration.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/spring-cloud-kubernetes-client-discovery/src/main/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesInformerDiscoveryClientAutoConfiguration.java b/spring-cloud-kubernetes-client-discovery/src/main/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesInformerDiscoveryClientAutoConfiguration.java index f80565b7db..901be5c26d 100644 --- a/spring-cloud-kubernetes-client-discovery/src/main/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesInformerDiscoveryClientAutoConfiguration.java +++ b/spring-cloud-kubernetes-client-discovery/src/main/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesInformerDiscoveryClientAutoConfiguration.java @@ -25,27 +25,21 @@ import io.kubernetes.client.openapi.models.V1Service; import org.apache.commons.logging.LogFactory; -import org.springframework.boot.actuate.health.HealthIndicator; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.AutoConfigureBefore; -import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnCloudPlatform; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.cloud.CloudPlatform; import org.springframework.cloud.client.CommonsClientAutoConfiguration; import org.springframework.cloud.client.ConditionalOnBlockingDiscoveryEnabled; import org.springframework.cloud.client.ConditionalOnDiscoveryEnabled; -import org.springframework.cloud.client.ConditionalOnDiscoveryHealthIndicatorEnabled; import org.springframework.cloud.client.discovery.simple.SimpleDiscoveryClientAutoConfiguration; import org.springframework.cloud.kubernetes.client.KubernetesClientAutoConfiguration; import org.springframework.cloud.kubernetes.commons.KubernetesNamespaceProvider; -import org.springframework.cloud.kubernetes.commons.PodUtils; import org.springframework.cloud.kubernetes.commons.discovery.ConditionalOnKubernetesDiscoveryEnabled; import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryClientHealthConfiguration; -import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryClientHealthIndicatorInitializer; import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryProperties; import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryPropertiesAutoConfiguration; -import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; @@ -62,7 +56,8 @@ @ConditionalOnCloudPlatform(CloudPlatform.KUBERNETES) @AutoConfigureBefore({ SimpleDiscoveryClientAutoConfiguration.class, CommonsClientAutoConfiguration.class }) @AutoConfigureAfter({ KubernetesClientAutoConfiguration.class, KubernetesDiscoveryPropertiesAutoConfiguration.class, - KubernetesClientInformerAutoConfiguration.class, KubernetesClientInformerSelectiveNamespacesAutoConfiguration.class }) + KubernetesClientInformerAutoConfiguration.class, + KubernetesClientInformerSelectiveNamespacesAutoConfiguration.class }) @Import(KubernetesDiscoveryClientHealthConfiguration.class) public class KubernetesInformerDiscoveryClientAutoConfiguration { From 97940d915797feca37347af9ea64d61ab5a614d4 Mon Sep 17 00:00:00 2001 From: wind57 Date: Sun, 23 Apr 2023 18:39:23 +0300 Subject: [PATCH 16/70] fix tests --- ...ubernetesInformerDiscoveryClientAutoConfiguration.java | 5 ----- .../KubernetesDiscoveryClientHealthConfiguration.java | 8 ++++++++ ...netesClientDiscoveryMultipleSelectiveNamespacesIT.java | 5 +++++ 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/spring-cloud-kubernetes-client-discovery/src/main/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesInformerDiscoveryClientAutoConfiguration.java b/spring-cloud-kubernetes-client-discovery/src/main/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesInformerDiscoveryClientAutoConfiguration.java index 901be5c26d..08268bd18d 100644 --- a/spring-cloud-kubernetes-client-discovery/src/main/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesInformerDiscoveryClientAutoConfiguration.java +++ b/spring-cloud-kubernetes-client-discovery/src/main/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesInformerDiscoveryClientAutoConfiguration.java @@ -23,7 +23,6 @@ import io.kubernetes.client.informer.cache.Lister; import io.kubernetes.client.openapi.models.V1Endpoints; import io.kubernetes.client.openapi.models.V1Service; -import org.apache.commons.logging.LogFactory; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.AutoConfigureBefore; @@ -44,7 +43,6 @@ import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; -import org.springframework.core.log.LogAccessor; /** * @author wind57 @@ -61,9 +59,6 @@ @Import(KubernetesDiscoveryClientHealthConfiguration.class) public class KubernetesInformerDiscoveryClientAutoConfiguration { - private static final LogAccessor LOG = new LogAccessor( - LogFactory.getLog(KubernetesInformerDiscoveryClientAutoConfiguration.class)); - @Deprecated(forRemoval = true) public KubernetesInformerDiscoveryClient kubernetesInformerDiscoveryClient( KubernetesNamespaceProvider kubernetesNamespaceProvider, SharedInformerFactory sharedInformerFactory, diff --git a/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/discovery/KubernetesDiscoveryClientHealthConfiguration.java b/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/discovery/KubernetesDiscoveryClientHealthConfiguration.java index a1ca21f336..213ed0e7f6 100644 --- a/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/discovery/KubernetesDiscoveryClientHealthConfiguration.java +++ b/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/discovery/KubernetesDiscoveryClientHealthConfiguration.java @@ -16,6 +16,8 @@ package org.springframework.cloud.kubernetes.commons.discovery; +import org.apache.commons.logging.LogFactory; + import org.springframework.boot.actuate.health.HealthIndicator; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.cloud.client.ConditionalOnDiscoveryHealthIndicatorEnabled; @@ -23,6 +25,7 @@ import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.core.log.LogAccessor; /** * @author wind57 @@ -30,11 +33,16 @@ @Configuration public class KubernetesDiscoveryClientHealthConfiguration { + private static final LogAccessor LOG = new LogAccessor( + LogFactory.getLog(KubernetesDiscoveryClientHealthConfiguration.class)); + @Bean @ConditionalOnClass({ HealthIndicator.class }) @ConditionalOnDiscoveryHealthIndicatorEnabled public KubernetesDiscoveryClientHealthIndicatorInitializer indicatorInitializer( ApplicationEventPublisher applicationEventPublisher, PodUtils podUtils) { + + LOG.debug(() -> "Will publish InstanceRegisteredEvent from blocking implementation"); return new KubernetesDiscoveryClientHealthIndicatorInitializer(podUtils, applicationEventPublisher); } diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it/KubernetesClientDiscoveryMultipleSelectiveNamespacesIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it/KubernetesClientDiscoveryMultipleSelectiveNamespacesIT.java index 76b050d39f..dc1466d2d8 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it/KubernetesClientDiscoveryMultipleSelectiveNamespacesIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it/KubernetesClientDiscoveryMultipleSelectiveNamespacesIT.java @@ -200,6 +200,10 @@ private static void manifests(Phase phase, boolean disableBlocking, boolean disa .orElse(List.of())); V1EnvVar debugLevel = new V1EnvVar().name("LOGGING_LEVEL_ORG_SPRINGFRAMEWORK_CLOUD_KUBERNETES_CLIENT_DISCOVERY") .value("DEBUG"); + + V1EnvVar debugLevelForCommons = new V1EnvVar().name("LOGGING_LEVEL_ORG_SPRINGFRAMEWORK_CLOUD_KUBERNETES_COMMONS_DISCOVERY") + .value("DEBUG"); + V1EnvVar selectiveNamespaceA = new V1EnvVar().name("SPRING_CLOUD_KUBERNETES_DISCOVERY_NAMESPACES_0") .value(NAMESPACE_A); V1EnvVar selectiveNamespaceB = new V1EnvVar().name("SPRING_CLOUD_KUBERNETES_DISCOVERY_NAMESPACES_1") @@ -218,6 +222,7 @@ private static void manifests(Phase phase, boolean disableBlocking, boolean disa } envVars.add(debugLevel); + envVars.add(debugLevelForCommons); envVars.add(selectiveNamespaceA); envVars.add(selectiveNamespaceB); deployment.getSpec().getTemplate().getSpec().getContainers().get(0).setEnv(envVars); From 0d19a818c2da56b84807fe6047c5e4056ca52ff2 Mon Sep 17 00:00:00 2001 From: wind57 Date: Sun, 23 Apr 2023 20:15:05 +0300 Subject: [PATCH 17/70] fix tests --- ...ubernetesClientDiscoveryMultipleSelectiveNamespacesIT.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it/KubernetesClientDiscoveryMultipleSelectiveNamespacesIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it/KubernetesClientDiscoveryMultipleSelectiveNamespacesIT.java index dc1466d2d8..7270de2bf3 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it/KubernetesClientDiscoveryMultipleSelectiveNamespacesIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it/KubernetesClientDiscoveryMultipleSelectiveNamespacesIT.java @@ -201,8 +201,8 @@ private static void manifests(Phase phase, boolean disableBlocking, boolean disa V1EnvVar debugLevel = new V1EnvVar().name("LOGGING_LEVEL_ORG_SPRINGFRAMEWORK_CLOUD_KUBERNETES_CLIENT_DISCOVERY") .value("DEBUG"); - V1EnvVar debugLevelForCommons = new V1EnvVar().name("LOGGING_LEVEL_ORG_SPRINGFRAMEWORK_CLOUD_KUBERNETES_COMMONS_DISCOVERY") - .value("DEBUG"); + V1EnvVar debugLevelForCommons = new V1EnvVar() + .name("LOGGING_LEVEL_ORG_SPRINGFRAMEWORK_CLOUD_KUBERNETES_COMMONS_DISCOVERY").value("DEBUG"); V1EnvVar selectiveNamespaceA = new V1EnvVar().name("SPRING_CLOUD_KUBERNETES_DISCOVERY_NAMESPACES_0") .value(NAMESPACE_A); From aa19f7d245ac9bd8e23f48a28c9403102716ec1d Mon Sep 17 00:00:00 2001 From: wind57 Date: Sun, 23 Apr 2023 22:04:55 +0300 Subject: [PATCH 18/70] fix tests --- .../KubernetesClientDiscoverySingleSelectiveNamespaceIT.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it/KubernetesClientDiscoverySingleSelectiveNamespaceIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it/KubernetesClientDiscoverySingleSelectiveNamespaceIT.java index a75d702ed9..b6b4d8d13a 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it/KubernetesClientDiscoverySingleSelectiveNamespaceIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it/KubernetesClientDiscoverySingleSelectiveNamespaceIT.java @@ -193,6 +193,10 @@ private static void manifests(Phase phase, boolean disableBlocking, boolean disa .orElse(List.of())); V1EnvVar debugLevel = new V1EnvVar().name("LOGGING_LEVEL_ORG_SPRINGFRAMEWORK_CLOUD_KUBERNETES_CLIENT_DISCOVERY") .value("DEBUG"); + + V1EnvVar debugLevelForCommons = new V1EnvVar() + .name("LOGGING_LEVEL_ORG_SPRINGFRAMEWORK_CLOUD_KUBERNETES_COMMONS_DISCOVERY").value("DEBUG"); + V1EnvVar selectiveNamespaceA = new V1EnvVar().name("SPRING_CLOUD_KUBERNETES_DISCOVERY_NAMESPACES_0") .value(NAMESPACE_A); if (disableReactive) { @@ -208,6 +212,7 @@ private static void manifests(Phase phase, boolean disableBlocking, boolean disa } envVars.add(debugLevel); + envVars.add(debugLevelForCommons); envVars.add(selectiveNamespaceA); deployment.getSpec().getTemplate().getSpec().getContainers().get(0).setEnv(envVars); From 9216ef5a5d0584e2e824eef61e004117f1de9104 Mon Sep 17 00:00:00 2001 From: wind57 Date: Mon, 17 Jul 2023 09:39:49 +0300 Subject: [PATCH 19/70] fix merge --- ...sClientDiscoverySelectiveNamespacesIT.java | 38 ++++++++----------- 1 file changed, 15 insertions(+), 23 deletions(-) diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it/KubernetesClientDiscoverySelectiveNamespacesIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it/KubernetesClientDiscoverySelectiveNamespacesIT.java index 7243cd29f4..355dfefbc1 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it/KubernetesClientDiscoverySelectiveNamespacesIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it/KubernetesClientDiscoverySelectiveNamespacesIT.java @@ -262,35 +262,27 @@ private static void manifests(Phase phase) { V1Service service = (V1Service) util.yaml("kubernetes-discovery-service.yaml"); V1Ingress ingress = (V1Ingress) util.yaml("kubernetes-discovery-ingress.yaml"); - List envVars = new ArrayList<>( - Optional.ofNullable(deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getEnv()) - .orElse(List.of())); - V1EnvVar debugLevel = new V1EnvVar().name("LOGGING_LEVEL_ORG_SPRINGFRAMEWORK_CLOUD_KUBERNETES_CLIENT_DISCOVERY") - .value("DEBUG"); - - V1EnvVar debugLevelForCommons = new V1EnvVar() - .name("LOGGING_LEVEL_ORG_SPRINGFRAMEWORK_CLOUD_KUBERNETES_COMMONS_DISCOVERY").value("DEBUG"); + if (phase.equals(Phase.DELETE)) { + util.deleteAndWait(NAMESPACE, deployment, service, ingress); + return; + } - V1EnvVar selectiveNamespaceA = new V1EnvVar().name("SPRING_CLOUD_KUBERNETES_DISCOVERY_NAMESPACES_0") + if (phase.equals(Phase.CREATE)) { + List envVars = new ArrayList<>( + Optional.ofNullable(deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getEnv()) + .orElse(List.of())); + V1EnvVar debugLevel = new V1EnvVar() + .name("LOGGING_LEVEL_ORG_SPRINGFRAMEWORK_CLOUD_KUBERNETES_CLIENT_DISCOVERY").value("DEBUG"); + V1EnvVar selectiveNamespaceA = new V1EnvVar().name("SPRING_CLOUD_KUBERNETES_DISCOVERY_NAMESPACES_0") .value(NAMESPACE_A); - if (disableReactive) { + V1EnvVar disableReactiveEnvVar = new V1EnvVar().name("SPRING_CLOUD_DISCOVERY_REACTIVE_ENABLED") .value("FALSE"); envVars.add(disableReactiveEnvVar); - } - - if (disableBlocking) { - V1EnvVar disableBlockingEnvVar = new V1EnvVar().name("SPRING_CLOUD_DISCOVERY_BLOCKING_ENABLED") - .value("FALSE"); - envVars.add(disableBlockingEnvVar); - } - envVars.add(debugLevel); - envVars.add(debugLevelForCommons); - envVars.add(selectiveNamespaceA); - deployment.getSpec().getTemplate().getSpec().getContainers().get(0).setEnv(envVars); - - if (phase.equals(Phase.CREATE)) { + envVars.add(debugLevel); + envVars.add(selectiveNamespaceA); + deployment.getSpec().getTemplate().getSpec().getContainers().get(0).setEnv(envVars); util.createAndWait(NAMESPACE, null, deployment, service, ingress, true); } } From e4a2dded57516b4da0b067acdc3fb3927188ee7f Mon Sep 17 00:00:00 2001 From: wind57 Date: Mon, 17 Jul 2023 12:29:01 +0300 Subject: [PATCH 20/70] fix test --- .../it/KubernetesClientDiscoverySelectiveNamespacesIT.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it/KubernetesClientDiscoverySelectiveNamespacesIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it/KubernetesClientDiscoverySelectiveNamespacesIT.java index 355dfefbc1..18c17240d8 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it/KubernetesClientDiscoverySelectiveNamespacesIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it/KubernetesClientDiscoverySelectiveNamespacesIT.java @@ -273,6 +273,10 @@ private static void manifests(Phase phase) { .orElse(List.of())); V1EnvVar debugLevel = new V1EnvVar() .name("LOGGING_LEVEL_ORG_SPRINGFRAMEWORK_CLOUD_KUBERNETES_CLIENT_DISCOVERY").value("DEBUG"); + + V1EnvVar debugLevelCommons = new V1EnvVar() + .name("LOGGING_LEVEL_ORG_SPRINGFRAMEWORK_CLOUD_KUBERNETES_COMMONS_DISCOVERY").value("DEBUG"); + V1EnvVar selectiveNamespaceA = new V1EnvVar().name("SPRING_CLOUD_KUBERNETES_DISCOVERY_NAMESPACES_0") .value(NAMESPACE_A); @@ -281,6 +285,7 @@ private static void manifests(Phase phase) { envVars.add(disableReactiveEnvVar); envVars.add(debugLevel); + envVars.add(debugLevelCommons); envVars.add(selectiveNamespaceA); deployment.getSpec().getTemplate().getSpec().getContainers().get(0).setEnv(envVars); util.createAndWait(NAMESPACE, null, deployment, service, ingress, true); From f3e06a9332a351920e9cd2ad9a9be1db17f18d36 Mon Sep 17 00:00:00 2001 From: wind57 Date: Tue, 22 Aug 2023 23:06:06 +0300 Subject: [PATCH 21/70] fix test --- .../KubernetesCommonsAutoConfigurationTests.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/KubernetesCommonsAutoConfigurationTests.java b/spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/KubernetesCommonsAutoConfigurationTests.java index b34ffb8a9f..7492e61223 100644 --- a/spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/KubernetesCommonsAutoConfigurationTests.java +++ b/spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/KubernetesCommonsAutoConfigurationTests.java @@ -17,13 +17,13 @@ package org.springframework.cloud.kubernetes.commons; import org.junit.jupiter.api.Test; +import org.mockito.Mockito; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.cloud.kubernetes.commons.config.ConfigUtils; import org.springframework.context.ConfigurableApplicationContext; -import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Bean; import static org.assertj.core.api.Assertions.assertThat; @@ -47,9 +47,15 @@ void beansAreCreated() { } @SpringBootApplication - @ComponentScan(basePackageClasses = ConfigUtils.class) static class App { + @Bean + public PodUtils podUtils() { + PodUtils podUtils = Mockito.mock(PodUtils.class); + Mockito.when(podUtils.currentPod()).thenReturn(Object::new); + return podUtils; + } + } } From a6b2ca8d1f4b6902f6b8543c2db9181e451909a5 Mon Sep 17 00:00:00 2001 From: wind57 Date: Wed, 20 Sep 2023 11:15:01 +0300 Subject: [PATCH 22/70] fix issue --- ...rnetesClientDiscoveryHealthITDelegate.java | 69 ++++++++++--------- .../it/DiscoveryClientFilterNamespaceIT.java | 7 +- 2 files changed, 40 insertions(+), 36 deletions(-) diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it/KubernetesClientDiscoveryHealthITDelegate.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it/KubernetesClientDiscoveryHealthITDelegate.java index ee03815f27..f11fb27899 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it/KubernetesClientDiscoveryHealthITDelegate.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it/KubernetesClientDiscoveryHealthITDelegate.java @@ -156,8 +156,8 @@ void testDefaultConfiguration(K3sContainer container) { String healthResult = healthClient.method(HttpMethod.GET).retrieve().bodyToMono(String.class) .retryWhen(retrySpec()).block(); - String infoResult = infoClient.method(HttpMethod.GET).retrieve().bodyToMono(String.class) - .retryWhen(retrySpec()).block(); + String infoResult = infoClient.method(HttpMethod.GET).retrieve().bodyToMono(String.class).retryWhen(retrySpec()) + .block(); Assertions.assertThat(BASIC_JSON_TESTER.from(healthResult)) .extractingJsonPathStringValue("$.components.discoveryComposite.status").isEqualTo("UP"); @@ -188,55 +188,56 @@ void testDefaultConfiguration(K3sContainer container) { } private void assertHealth(String healthResult) { - Assertions.assertThat(BASIC_JSON_TESTER.from(healthResult)).extractingJsonPathStringValue( - "$.components.kubernetes.status").isEqualTo("UP"); + Assertions.assertThat(BASIC_JSON_TESTER.from(healthResult)) + .extractingJsonPathStringValue("$.components.kubernetes.status").isEqualTo("UP"); - Assertions.assertThat(BASIC_JSON_TESTER.from(healthResult)).extractingJsonPathStringValue( - "$.components.kubernetes.details.hostIp").isNotEmpty(); + Assertions.assertThat(BASIC_JSON_TESTER.from(healthResult)) + .extractingJsonPathStringValue("$.components.kubernetes.details.hostIp").isNotEmpty(); - Assertions.assertThat(BASIC_JSON_TESTER.from(healthResult)).extractingJsonPathBooleanValue( - "$.components.kubernetes.details.inside").isEqualTo(true); + Assertions.assertThat(BASIC_JSON_TESTER.from(healthResult)) + .extractingJsonPathBooleanValue("$.components.kubernetes.details.inside").isEqualTo(true); - Assertions.assertThat(BASIC_JSON_TESTER.from(healthResult)).extractingJsonPathStringValue( - "$.components.kubernetes.details.labels.app").isEqualTo("spring-cloud-kubernetes-client-discovery-it"); + Assertions.assertThat(BASIC_JSON_TESTER.from(healthResult)) + .extractingJsonPathStringValue("$.components.kubernetes.details.labels.app") + .isEqualTo("spring-cloud-kubernetes-client-discovery-it"); - Assertions.assertThat(BASIC_JSON_TESTER.from(healthResult)).extractingJsonPathStringValue( - "$.components.kubernetes.details.namespace").isNotEmpty(); + Assertions.assertThat(BASIC_JSON_TESTER.from(healthResult)) + .extractingJsonPathStringValue("$.components.kubernetes.details.namespace").isNotEmpty(); - Assertions.assertThat(BASIC_JSON_TESTER.from(healthResult)).extractingJsonPathStringValue( - "$.components.kubernetes.details.nodeName").isNotEmpty(); + Assertions.assertThat(BASIC_JSON_TESTER.from(healthResult)) + .extractingJsonPathStringValue("$.components.kubernetes.details.nodeName").isNotEmpty(); - Assertions.assertThat(BASIC_JSON_TESTER.from(healthResult)).extractingJsonPathStringValue( - "$.components.kubernetes.details.podIp").isNotEmpty(); + Assertions.assertThat(BASIC_JSON_TESTER.from(healthResult)) + .extractingJsonPathStringValue("$.components.kubernetes.details.podIp").isNotEmpty(); - Assertions.assertThat(BASIC_JSON_TESTER.from(healthResult)).extractingJsonPathStringValue( - "$.components.kubernetes.details.podName").isNotEmpty(); + Assertions.assertThat(BASIC_JSON_TESTER.from(healthResult)) + .extractingJsonPathStringValue("$.components.kubernetes.details.podName").isNotEmpty(); - Assertions.assertThat(BASIC_JSON_TESTER.from(healthResult)).extractingJsonPathStringValue( - "$.components.kubernetes.details.serviceAccount").isNotEmpty(); + Assertions.assertThat(BASIC_JSON_TESTER.from(healthResult)) + .extractingJsonPathStringValue("$.components.kubernetes.details.serviceAccount").isNotEmpty(); } private void assertInfo(String infoResult) { - Assertions.assertThat(BASIC_JSON_TESTER.from(infoResult)).extractingJsonPathStringValue( - "$.kubernetes.hostIp").isNotEmpty(); + Assertions.assertThat(BASIC_JSON_TESTER.from(infoResult)).extractingJsonPathStringValue("$.kubernetes.hostIp") + .isNotEmpty(); - Assertions.assertThat(BASIC_JSON_TESTER.from(infoResult)).extractingJsonPathBooleanValue( - "$.kubernetes.inside").isEqualTo(true); + Assertions.assertThat(BASIC_JSON_TESTER.from(infoResult)).extractingJsonPathBooleanValue("$.kubernetes.inside") + .isEqualTo(true); - Assertions.assertThat(BASIC_JSON_TESTER.from(infoResult)).extractingJsonPathStringValue( - "$.kubernetes.namespace").isNotEmpty(); + Assertions.assertThat(BASIC_JSON_TESTER.from(infoResult)) + .extractingJsonPathStringValue("$.kubernetes.namespace").isNotEmpty(); - Assertions.assertThat(BASIC_JSON_TESTER.from(infoResult)).extractingJsonPathStringValue( - "$.kubernetes.nodeName").isNotEmpty(); + Assertions.assertThat(BASIC_JSON_TESTER.from(infoResult)).extractingJsonPathStringValue("$.kubernetes.nodeName") + .isNotEmpty(); - Assertions.assertThat(BASIC_JSON_TESTER.from(infoResult)).extractingJsonPathStringValue( - "$.kubernetes.podIp").isNotEmpty(); + Assertions.assertThat(BASIC_JSON_TESTER.from(infoResult)).extractingJsonPathStringValue("$.kubernetes.podIp") + .isNotEmpty(); - Assertions.assertThat(BASIC_JSON_TESTER.from(infoResult)).extractingJsonPathStringValue( - "$.kubernetes.podName").isNotEmpty(); + Assertions.assertThat(BASIC_JSON_TESTER.from(infoResult)).extractingJsonPathStringValue("$.kubernetes.podName") + .isNotEmpty(); - Assertions.assertThat(BASIC_JSON_TESTER.from(infoResult)).extractingJsonPathStringValue( - "$.kubernetes.serviceAccount").isNotEmpty(); + Assertions.assertThat(BASIC_JSON_TESTER.from(infoResult)) + .extractingJsonPathStringValue("$.kubernetes.serviceAccount").isNotEmpty(); } private WebClient.Builder builder() { diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-discoveryclient-it/src/test/java/org/springframework/cloud/kubernetes/discoveryclient/it/DiscoveryClientFilterNamespaceIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-discoveryclient-it/src/test/java/org/springframework/cloud/kubernetes/discoveryclient/it/DiscoveryClientFilterNamespaceIT.java index 65491ee126..3d42774cdc 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-discoveryclient-it/src/test/java/org/springframework/cloud/kubernetes/discoveryclient/it/DiscoveryClientFilterNamespaceIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-discoveryclient-it/src/test/java/org/springframework/cloud/kubernetes/discoveryclient/it/DiscoveryClientFilterNamespaceIT.java @@ -71,6 +71,8 @@ class DiscoveryClientFilterNamespaceIT { private static RbacAuthorizationV1Api rbacApi; + private static V1ClusterRoleBinding clusterRole; + @BeforeAll static void beforeAll() throws Exception { K3S.start(); @@ -83,18 +85,19 @@ static void beforeAll() throws Exception { util = new Util(K3S); rbacApi = new RbacAuthorizationV1Api(); + clusterRole = (V1ClusterRoleBinding) util + .yaml("namespace-filter/cluster-admin-serviceaccount-role.yaml"); util.createNamespace(NAMESPACE_LEFT); util.createNamespace(NAMESPACE_RIGHT); util.setUp(NAMESPACE); - V1ClusterRoleBinding clusterRole = (V1ClusterRoleBinding) util - .yaml("namespace-filter/cluster-admin-serviceaccount-role.yaml"); rbacApi.createClusterRoleBinding(clusterRole, null, null, null, null); discoveryServer(Phase.CREATE); } @AfterAll static void afterAll() throws Exception { + rbacApi.deleteClusterRoleBinding(clusterRole.getMetadata().getName(), null, null, null, null, null, null); Commons.cleanUp(DISCOVERY_SERVER_APP_NAME, K3S); Commons.cleanUp(SPRING_CLOUD_K8S_DISCOVERY_CLIENT_APP_NAME, K3S); discoveryServer(Phase.DELETE); From 3ed982ac5035dc2ebfea0b49d4d50e6353d8ad62 Mon Sep 17 00:00:00 2001 From: wind57 Date: Wed, 20 Sep 2023 12:42:06 +0300 Subject: [PATCH 23/70] fix issue --- .../it/DiscoveryClientFilterNamespaceIT.java | 9 +++++---- .../discoveryclient/it/DiscoveryClientIT.java | 12 +++++++++--- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-discoveryclient-it/src/test/java/org/springframework/cloud/kubernetes/discoveryclient/it/DiscoveryClientFilterNamespaceIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-discoveryclient-it/src/test/java/org/springframework/cloud/kubernetes/discoveryclient/it/DiscoveryClientFilterNamespaceIT.java index 3d42774cdc..fe10560904 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-discoveryclient-it/src/test/java/org/springframework/cloud/kubernetes/discoveryclient/it/DiscoveryClientFilterNamespaceIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-discoveryclient-it/src/test/java/org/springframework/cloud/kubernetes/discoveryclient/it/DiscoveryClientFilterNamespaceIT.java @@ -71,7 +71,7 @@ class DiscoveryClientFilterNamespaceIT { private static RbacAuthorizationV1Api rbacApi; - private static V1ClusterRoleBinding clusterRole; + private static V1ClusterRoleBinding clusterRoleBinding; @BeforeAll static void beforeAll() throws Exception { @@ -85,19 +85,20 @@ static void beforeAll() throws Exception { util = new Util(K3S); rbacApi = new RbacAuthorizationV1Api(); - clusterRole = (V1ClusterRoleBinding) util + clusterRoleBinding = (V1ClusterRoleBinding) util .yaml("namespace-filter/cluster-admin-serviceaccount-role.yaml"); util.createNamespace(NAMESPACE_LEFT); util.createNamespace(NAMESPACE_RIGHT); util.setUp(NAMESPACE); - rbacApi.createClusterRoleBinding(clusterRole, null, null, null, null); + rbacApi.createClusterRoleBinding(clusterRoleBinding, null, null, null, null); discoveryServer(Phase.CREATE); } @AfterAll static void afterAll() throws Exception { - rbacApi.deleteClusterRoleBinding(clusterRole.getMetadata().getName(), null, null, null, null, null, null); + rbacApi.deleteClusterRoleBinding(clusterRoleBinding.getMetadata().getName(), null, null, null, null, null, + null); Commons.cleanUp(DISCOVERY_SERVER_APP_NAME, K3S); Commons.cleanUp(SPRING_CLOUD_K8S_DISCOVERY_CLIENT_APP_NAME, K3S); discoveryServer(Phase.DELETE); diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-discoveryclient-it/src/test/java/org/springframework/cloud/kubernetes/discoveryclient/it/DiscoveryClientIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-discoveryclient-it/src/test/java/org/springframework/cloud/kubernetes/discoveryclient/it/DiscoveryClientIT.java index 7f4903717e..e3ca48a385 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-discoveryclient-it/src/test/java/org/springframework/cloud/kubernetes/discoveryclient/it/DiscoveryClientIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-discoveryclient-it/src/test/java/org/springframework/cloud/kubernetes/discoveryclient/it/DiscoveryClientIT.java @@ -113,6 +113,10 @@ class DiscoveryClientIT { private static Util util; + private static RbacAuthorizationV1Api rbacApi; + + private static V1ClusterRoleBinding clusterRoleBinding; + @BeforeAll static void beforeAll() throws Exception { K3S.start(); @@ -124,15 +128,15 @@ static void beforeAll() throws Exception { Commons.loadSpringCloudKubernetesImage(SPRING_CLOUD_K8S_DISCOVERY_CLIENT_APP_NAME, K3S); util = new Util(K3S); + rbacApi = new RbacAuthorizationV1Api(); util.setUp(NAMESPACE); util.createNamespace(NAMESPACE_LEFT); util.createNamespace(NAMESPACE_RIGHT); - RbacAuthorizationV1Api rbacApi = new RbacAuthorizationV1Api(); - V1ClusterRoleBinding clusterRole = (V1ClusterRoleBinding) util + clusterRoleBinding = (V1ClusterRoleBinding) util .yaml("namespace-filter/cluster-admin-serviceaccount-role.yaml"); - rbacApi.createClusterRoleBinding(clusterRole, null, null, null, null); + rbacApi.createClusterRoleBinding(clusterRoleBinding, null, null, null, null); util.wiremock(NAMESPACE_LEFT, "/wiremock-" + NAMESPACE_LEFT, Phase.CREATE, false); util.wiremock(NAMESPACE_RIGHT, "/wiremock-" + NAMESPACE_RIGHT, Phase.CREATE, false); @@ -143,6 +147,8 @@ static void beforeAll() throws Exception { @AfterAll static void afterAll() throws Exception { + rbacApi.deleteClusterRoleBinding(clusterRoleBinding.getMetadata().getName(), null, null, null, null, null, + null); Commons.cleanUp(DISCOVERY_SERVER_APP_NAME, K3S); Commons.cleanUp(SPRING_CLOUD_K8S_DISCOVERY_CLIENT_APP_NAME, K3S); From f1735746be980942df1b89f2d1513ea5f3b393aa Mon Sep 17 00:00:00 2001 From: wind57 Date: Thu, 21 Sep 2023 18:54:22 +0300 Subject: [PATCH 24/70] trigger From 7ab0d3d0b193f965b21396a4a4ac2866bb604fc6 Mon Sep 17 00:00:00 2001 From: wind57 Date: Thu, 21 Sep 2023 19:32:35 +0300 Subject: [PATCH 25/70] trigger From ab5796b27308868fa326de5b052219a12e6db2d1 Mon Sep 17 00:00:00 2001 From: wind57 Date: Tue, 26 Sep 2023 09:00:55 +0300 Subject: [PATCH 26/70] test --- .../action.yaml | 2 +- .../action.yaml | 2 +- .../save-controller-images/action.yaml | 15 -------------- .../save-integration-tests-images/action.yaml | 20 ------------------- 4 files changed, 2 insertions(+), 37 deletions(-) delete mode 100644 .github/workflows/composites/save-controller-images/action.yaml delete mode 100644 .github/workflows/composites/save-integration-tests-images/action.yaml diff --git a/.github/workflows/composites/run-and-save-test-times-when-cache-missing/action.yaml b/.github/workflows/composites/run-and-save-test-times-when-cache-missing/action.yaml index 39e79ebdd7..0cb4085b21 100644 --- a/.github/workflows/composites/run-and-save-test-times-when-cache-missing/action.yaml +++ b/.github/workflows/composites/run-and-save-test-times-when-cache-missing/action.yaml @@ -61,7 +61,7 @@ runs: ./mvnw -s .settings.xml \ -DtestsToRun=${TEST_ARG[@]} \ -e clean install \ - -U -P sonar -nsu --batch-mode \ + -P sonar -nsu --batch-mode \ -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \ -Dhttp.keepAlive=false \ -Dmaven.wagon.http.pool=false \ diff --git a/.github/workflows/composites/run-and-save-test-times-when-cache-present/action.yaml b/.github/workflows/composites/run-and-save-test-times-when-cache-present/action.yaml index ce8c81cff3..f658cfbf58 100644 --- a/.github/workflows/composites/run-and-save-test-times-when-cache-present/action.yaml +++ b/.github/workflows/composites/run-and-save-test-times-when-cache-present/action.yaml @@ -150,7 +150,7 @@ runs: ./mvnw -s .settings.xml \ -DtestsToRun=${tests_to_run_in_current_index} \ -e clean install \ - -U -P sonar -nsu --batch-mode \ + -P sonar -nsu --batch-mode \ -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \ -Dhttp.keepAlive=false \ -Dmaven.wagon.http.pool=false \ diff --git a/.github/workflows/composites/save-controller-images/action.yaml b/.github/workflows/composites/save-controller-images/action.yaml deleted file mode 100644 index 056b1b2adb..0000000000 --- a/.github/workflows/composites/save-controller-images/action.yaml +++ /dev/null @@ -1,15 +0,0 @@ -name: save controller docker images -description: save controller docker images -runs: - using: "composite" - steps: - - name: save controller docker images - shell: bash - run: | - mkdir -p /tmp/docker/images - TAG=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout) - cd spring-cloud-kubernetes-controllers - while read controller_image; do - docker save -o /tmp/docker/images/${controller_image}.tar docker.io/springcloud/${controller_image}:$TAG - done < <(mvn -Dexec.executable='echo' -Dexec.args='${project.artifactId}' exec:exec -q | grep -v 'spring-cloud-kubernetes-controllers') - cd .. diff --git a/.github/workflows/composites/save-integration-tests-images/action.yaml b/.github/workflows/composites/save-integration-tests-images/action.yaml deleted file mode 100644 index cbc92e55f7..0000000000 --- a/.github/workflows/composites/save-integration-tests-images/action.yaml +++ /dev/null @@ -1,20 +0,0 @@ -name: save integration tests docker images -description: save integration tests docker images -runs: - using: "composite" - steps: - - name: save integration tests docker images - shell: bash - run: | - mkdir -p /tmp/docker/images - TAG=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout) - cd spring-cloud-kubernetes-integration-tests - while read integ_test; do - docker save -o /tmp/docker/images/${integ_test}.tar docker.io/springcloud/${integ_test}:$TAG - done < <(mvn -Dexec.executable='echo' -Dexec.args='${project.artifactId}' exec:exec -q \ - | grep -v 'spring-cloud-kubernetes-integration-tests' \ - | grep -v 'spring-cloud-kubernetes-client-configmap-event-reload-multiple-apps' \ - | grep -v 'spring-cloud-kubernetes-client-configuration-watcher-configmap-test-app' \ - | grep -v 'spring-cloud-kubernetes-client-secrets-event-reload-multiple-apps' \ - | grep -v 'spring-cloud-kubernetes-client-configuration-watcher-secrets-test-app' ) - cd .. From 80c100c1ea084e761bbba334e06470faec3538e6 Mon Sep 17 00:00:00 2001 From: wind57 Date: Tue, 26 Sep 2023 09:27:38 +0300 Subject: [PATCH 27/70] placeholder commit From 4763bdc5bcb5541082c582fd1237d4696241d0ba Mon Sep 17 00:00:00 2001 From: wind57 Date: Tue, 26 Sep 2023 10:53:24 +0300 Subject: [PATCH 28/70] test --- .../spring-cloud-kubernetes-client-catalog-watcher/pom.xml | 1 + .../pom.xml | 1 + .../spring-cloud-kubernetes-client-discovery-it/pom.xml | 1 + .../pom.xml | 1 + .../spring-cloud-kubernetes-client-loadbalancer-it/pom.xml | 1 + .../pom.xml | 1 + .../spring-cloud-kubernetes-configuration-watcher-it/pom.xml | 1 + .../spring-cloud-kubernetes-discoveryclient-it/pom.xml | 1 + .../pom.xml | 1 + .../pom.xml | 1 + .../pom.xml | 1 + .../spring-cloud-kubernetes-fabric8-client-configmap/pom.xml | 1 + .../pom.xml | 1 + .../spring-cloud-kubernetes-fabric8-client-discovery/pom.xml | 1 + .../spring-cloud-kubernetes-fabric8-client-loadbalancer/pom.xml | 1 + .../pom.xml | 1 + .../spring-cloud-kubernetes-fabric8-istio-it/pom.xml | 1 + 17 files changed, 17 insertions(+) diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-catalog-watcher/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-catalog-watcher/pom.xml index 38f4e18e73..2b5afdca5d 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-catalog-watcher/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-catalog-watcher/pom.xml @@ -86,6 +86,7 @@ org.apache.maven.plugins maven-failsafe-plugin + 3.1.2 diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-configmap-event-reload-multiple-apps/spring-cloud-kubernetes-client-configuration-watcher-configmap-test-app/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-configmap-event-reload-multiple-apps/spring-cloud-kubernetes-client-configuration-watcher-configmap-test-app/pom.xml index 382886e789..530756302e 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-configmap-event-reload-multiple-apps/spring-cloud-kubernetes-client-configuration-watcher-configmap-test-app/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-configmap-event-reload-multiple-apps/spring-cloud-kubernetes-client-configuration-watcher-configmap-test-app/pom.xml @@ -55,6 +55,7 @@ org.apache.maven.plugins maven-failsafe-plugin + 3.1.2 diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/pom.xml index ec84212c8a..243f1a4d32 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/pom.xml @@ -96,6 +96,7 @@ org.apache.maven.plugins maven-failsafe-plugin + 3.1.2 diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-event-and-polling-reload/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-event-and-polling-reload/pom.xml index dfc5d03931..10a1503128 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-event-and-polling-reload/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-event-and-polling-reload/pom.xml @@ -95,6 +95,7 @@ org.apache.maven.plugins maven-failsafe-plugin + 3.1.2 diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-loadbalancer-it/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-loadbalancer-it/pom.xml index 61e6ba120f..1aea888da1 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-loadbalancer-it/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-loadbalancer-it/pom.xml @@ -91,6 +91,7 @@ org.apache.maven.plugins maven-failsafe-plugin + 3.1.2 diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-secrets-event-reload-multiple-apps/spring-cloud-kubernetes-client-configuration-watcher-secrets-test-app/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-secrets-event-reload-multiple-apps/spring-cloud-kubernetes-client-configuration-watcher-secrets-test-app/pom.xml index ba73ef90b8..38b3156899 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-secrets-event-reload-multiple-apps/spring-cloud-kubernetes-client-configuration-watcher-secrets-test-app/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-secrets-event-reload-multiple-apps/spring-cloud-kubernetes-client-configuration-watcher-secrets-test-app/pom.xml @@ -55,6 +55,7 @@ org.apache.maven.plugins maven-failsafe-plugin + 3.1.2 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 69d3aac1de..4179f2975c 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 @@ -111,6 +111,7 @@ org.apache.maven.plugins maven-failsafe-plugin + 3.1.2 diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-discoveryclient-it/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-discoveryclient-it/pom.xml index 74e485be7f..512716a58c 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-discoveryclient-it/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-discoveryclient-it/pom.xml @@ -92,6 +92,7 @@ org.apache.maven.plugins maven-failsafe-plugin + 3.1.2 diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/pom.xml index e30c96300f..0f93f700fb 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/pom.xml @@ -86,6 +86,7 @@ org.apache.maven.plugins maven-failsafe-plugin + 3.1.2 diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap-event-reload/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap-event-reload/pom.xml index a1ba8bb15b..bc22366d8b 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap-event-reload/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap-event-reload/pom.xml @@ -93,6 +93,7 @@ org.apache.maven.plugins maven-failsafe-plugin + 3.1.2 diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap-polling-reload/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap-polling-reload/pom.xml index c5b250af03..5add6f8edd 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap-polling-reload/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap-polling-reload/pom.xml @@ -96,6 +96,7 @@ org.apache.maven.plugins maven-failsafe-plugin + 3.1.2 diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap/pom.xml index f95d31e806..5d411470b7 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap/pom.xml @@ -86,6 +86,7 @@ org.apache.maven.plugins maven-failsafe-plugin + 3.1.2 diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery-with-bootstrap/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery-with-bootstrap/pom.xml index 0f5a4a4934..d0eb7669fd 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery-with-bootstrap/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery-with-bootstrap/pom.xml @@ -90,6 +90,7 @@ org.apache.maven.plugins maven-failsafe-plugin + 3.1.2 diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/pom.xml index dfe6a31ec6..bb1d63c5dc 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/pom.xml @@ -86,6 +86,7 @@ org.apache.maven.plugins maven-failsafe-plugin + 3.1.2 diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-loadbalancer/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-loadbalancer/pom.xml index 9362129cb0..1df946c6c0 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-loadbalancer/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-loadbalancer/pom.xml @@ -86,6 +86,7 @@ org.apache.maven.plugins maven-failsafe-plugin + 3.1.2 diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-secrets-event-reload/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-secrets-event-reload/pom.xml index 0778446710..1c071aa98f 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-secrets-event-reload/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-secrets-event-reload/pom.xml @@ -88,6 +88,7 @@ org.apache.maven.plugins maven-failsafe-plugin + 3.1.2 diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-istio-it/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-istio-it/pom.xml index c1d9fb67a5..3c047314dd 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-istio-it/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-istio-it/pom.xml @@ -86,6 +86,7 @@ org.apache.maven.plugins maven-failsafe-plugin + 3.1.2 From 970c875e3e4ceaf444e687a6be7be56bf548b183 Mon Sep 17 00:00:00 2001 From: wind57 Date: Tue, 26 Sep 2023 11:42:21 +0300 Subject: [PATCH 29/70] test --- .github/workflows/composites/clean-space/action.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/composites/clean-space/action.yaml b/.github/workflows/composites/clean-space/action.yaml index 69d61642fd..e110dc0c7e 100644 --- a/.github/workflows/composites/clean-space/action.yaml +++ b/.github/workflows/composites/clean-space/action.yaml @@ -7,6 +7,14 @@ runs: shell: bash run: | sudo apt-get update + + + # temporary workaround for an error in free disk space action + # https://github.com/jlumbroso/free-disk-space/issues/14 + - name: Update Package List and Remove Dotnet + shell: bash + run: | + sudo apt-get update - name: Free Disk Space uses: jlumbroso/free-disk-space@main From edcc9964527cf151de7c0f16346c679f8c4f33f4 Mon Sep 17 00:00:00 2001 From: wind57 Date: Tue, 26 Sep 2023 12:20:39 +0300 Subject: [PATCH 30/70] test --- .github/workflows/composites/clean-space/action.yaml | 8 -------- .github/workflows/maven.yaml | 10 +++++----- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/.github/workflows/composites/clean-space/action.yaml b/.github/workflows/composites/clean-space/action.yaml index e110dc0c7e..69d61642fd 100644 --- a/.github/workflows/composites/clean-space/action.yaml +++ b/.github/workflows/composites/clean-space/action.yaml @@ -7,14 +7,6 @@ runs: shell: bash run: | sudo apt-get update - - - # temporary workaround for an error in free disk space action - # https://github.com/jlumbroso/free-disk-space/issues/14 - - name: Update Package List and Remove Dotnet - shell: bash - run: | - sudo apt-get update - name: Free Disk Space uses: jlumbroso/free-disk-space@main diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml index 6264d4c008..eb0740edf4 100644 --- a/.github/workflows/maven.yaml +++ b/.github/workflows/maven.yaml @@ -8,7 +8,7 @@ on: jobs: build: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 env: # this might get set to true if there is an existing cache of test times # this happens in 'matrix-bounds-on-test-times-cache-hit' @@ -96,7 +96,7 @@ jobs: test_when_cache_present: needs: [ build ] - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 env: SEGMENT_DOWNLOAD_TIMEOUT_MINS: 30 # only run this one if there is a previous cache of test times @@ -145,7 +145,7 @@ jobs: test_when_cache_missing: needs: [ build ] - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 env: SEGMENT_DOWNLOAD_TIMEOUT_MINS: 30 timeout-minutes: 60 @@ -197,7 +197,7 @@ jobs: uses: ./.github/workflows/composites/run-and-save-test-times-when-cache-missing save_test_times_when_cache_missing: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 needs: [build, test_when_cache_missing ] steps: @@ -210,7 +210,7 @@ jobs: uses: ./.github/workflows/composites/test-times save_test_times_when_cache_present: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 needs: [ build, test_when_cache_present ] steps: From 82d5f2ff89af9e96324715d3e9a151fc6e3639d9 Mon Sep 17 00:00:00 2001 From: wind57 Date: Tue, 26 Sep 2023 12:52:54 +0300 Subject: [PATCH 31/70] test --- .github/workflows/composites/clean-space/action.yaml | 1 + .github/workflows/maven.yaml | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/composites/clean-space/action.yaml b/.github/workflows/composites/clean-space/action.yaml index 69d61642fd..e65d11f0c0 100644 --- a/.github/workflows/composites/clean-space/action.yaml +++ b/.github/workflows/composites/clean-space/action.yaml @@ -7,6 +7,7 @@ runs: shell: bash run: | sudo apt-get update + sudo apt-get remove google-cloud-sdk* - name: Free Disk Space uses: jlumbroso/free-disk-space@main diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml index eb0740edf4..6264d4c008 100644 --- a/.github/workflows/maven.yaml +++ b/.github/workflows/maven.yaml @@ -8,7 +8,7 @@ on: jobs: build: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest env: # this might get set to true if there is an existing cache of test times # this happens in 'matrix-bounds-on-test-times-cache-hit' @@ -96,7 +96,7 @@ jobs: test_when_cache_present: needs: [ build ] - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest env: SEGMENT_DOWNLOAD_TIMEOUT_MINS: 30 # only run this one if there is a previous cache of test times @@ -145,7 +145,7 @@ jobs: test_when_cache_missing: needs: [ build ] - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest env: SEGMENT_DOWNLOAD_TIMEOUT_MINS: 30 timeout-minutes: 60 @@ -197,7 +197,7 @@ jobs: uses: ./.github/workflows/composites/run-and-save-test-times-when-cache-missing save_test_times_when_cache_missing: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest needs: [build, test_when_cache_missing ] steps: @@ -210,7 +210,7 @@ jobs: uses: ./.github/workflows/composites/test-times save_test_times_when_cache_present: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest needs: [ build, test_when_cache_present ] steps: From 2b56337faa481f1e02bb2514095caa36a2fb5e96 Mon Sep 17 00:00:00 2001 From: wind57 Date: Tue, 26 Sep 2023 12:54:50 +0300 Subject: [PATCH 32/70] test --- .github/workflows/composites/clean-space/action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/composites/clean-space/action.yaml b/.github/workflows/composites/clean-space/action.yaml index e65d11f0c0..a61f9558e1 100644 --- a/.github/workflows/composites/clean-space/action.yaml +++ b/.github/workflows/composites/clean-space/action.yaml @@ -7,7 +7,7 @@ runs: shell: bash run: | sudo apt-get update - sudo apt-get remove google-cloud-sdk* + sudo apt-get purge google-cloud-sdk - name: Free Disk Space uses: jlumbroso/free-disk-space@main From dcbc5decdccdae860f15a75e89a4322475779359 Mon Sep 17 00:00:00 2001 From: wind57 Date: Tue, 26 Sep 2023 13:09:07 +0300 Subject: [PATCH 33/70] test --- .github/workflows/composites/clean-space/action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/composites/clean-space/action.yaml b/.github/workflows/composites/clean-space/action.yaml index a61f9558e1..4f70007353 100644 --- a/.github/workflows/composites/clean-space/action.yaml +++ b/.github/workflows/composites/clean-space/action.yaml @@ -7,7 +7,7 @@ runs: shell: bash run: | sudo apt-get update - sudo apt-get purge google-cloud-sdk + sudo apt-get remove google-cloud-sdk - name: Free Disk Space uses: jlumbroso/free-disk-space@main From d48d61ff3c48e6ea6706aa220971881b56942647 Mon Sep 17 00:00:00 2001 From: wind57 Date: Tue, 26 Sep 2023 13:17:16 +0300 Subject: [PATCH 34/70] test --- .github/workflows/composites/clean-space/action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/composites/clean-space/action.yaml b/.github/workflows/composites/clean-space/action.yaml index 4f70007353..b8e8b619a1 100644 --- a/.github/workflows/composites/clean-space/action.yaml +++ b/.github/workflows/composites/clean-space/action.yaml @@ -7,7 +7,7 @@ runs: shell: bash run: | sudo apt-get update - sudo apt-get remove google-cloud-sdk + sudo apt-get remove -y azure-cli google-cloud-sdk google-chrome-stable firefox powershell mono-devel libgl1-mesa-dri - name: Free Disk Space uses: jlumbroso/free-disk-space@main From db8d950892bf7400c7d55919a11564262d82b0a5 Mon Sep 17 00:00:00 2001 From: wind57 Date: Tue, 26 Sep 2023 13:20:29 +0300 Subject: [PATCH 35/70] test --- .github/workflows/composites/clean-space/action.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/composites/clean-space/action.yaml b/.github/workflows/composites/clean-space/action.yaml index b8e8b619a1..fd1f337aa7 100644 --- a/.github/workflows/composites/clean-space/action.yaml +++ b/.github/workflows/composites/clean-space/action.yaml @@ -3,11 +3,11 @@ description: clean space runs: using: "composite" steps: - - name: apt-update - shell: bash - run: | - sudo apt-get update - sudo apt-get remove -y azure-cli google-cloud-sdk google-chrome-stable firefox powershell mono-devel libgl1-mesa-dri +# - name: apt-update +# shell: bash +# run: | +# sudo apt-get update +# sudo apt-get remove -y azure-cli google-cloud-sdk google-chrome-stable firefox powershell mono-devel libgl1-mesa-dri - name: Free Disk Space uses: jlumbroso/free-disk-space@main From ae31faf5be485cb1177be65ce40a83670ec73392 Mon Sep 17 00:00:00 2001 From: wind57 Date: Tue, 26 Sep 2023 13:55:02 +0300 Subject: [PATCH 36/70] test --- .github/workflows/composites/clean-space/action.yaml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/composites/clean-space/action.yaml b/.github/workflows/composites/clean-space/action.yaml index fd1f337aa7..3b2761a64c 100644 --- a/.github/workflows/composites/clean-space/action.yaml +++ b/.github/workflows/composites/clean-space/action.yaml @@ -3,11 +3,9 @@ description: clean space runs: using: "composite" steps: -# - name: apt-update -# shell: bash -# run: | -# sudo apt-get update -# sudo apt-get remove -y azure-cli google-cloud-sdk google-chrome-stable firefox powershell mono-devel libgl1-mesa-dri + - name: gcloud + shell: bash + run: gcloud info - name: Free Disk Space uses: jlumbroso/free-disk-space@main From dfca45b9ef1a4618df5c7b2ab7bb0a6d8aaacc4a Mon Sep 17 00:00:00 2001 From: wind57 Date: Tue, 26 Sep 2023 14:08:20 +0300 Subject: [PATCH 37/70] test --- .github/workflows/composites/clean-space/action.yaml | 3 --- .github/workflows/maven.yaml | 3 --- 2 files changed, 6 deletions(-) diff --git a/.github/workflows/composites/clean-space/action.yaml b/.github/workflows/composites/clean-space/action.yaml index 3b2761a64c..f115de3a20 100644 --- a/.github/workflows/composites/clean-space/action.yaml +++ b/.github/workflows/composites/clean-space/action.yaml @@ -3,9 +3,6 @@ description: clean space runs: using: "composite" steps: - - name: gcloud - shell: bash - run: gcloud info - name: Free Disk Space uses: jlumbroso/free-disk-space@main diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml index 6264d4c008..4fcc70635b 100644 --- a/.github/workflows/maven.yaml +++ b/.github/workflows/maven.yaml @@ -29,9 +29,6 @@ jobs: - name: checkout project uses: actions/checkout@v2 - - name: clean space - uses: ./.github/workflows/composites/clean-space - - name: set env variables uses: ./.github/workflows/composites/env-variables From 34648ebd07b36a70d598ad3b61de9f629ac35c90 Mon Sep 17 00:00:00 2001 From: wind57 Date: Tue, 26 Sep 2023 14:19:09 +0300 Subject: [PATCH 38/70] placeholder commit From 1eacf6cbbe1235a37b912ad6ec6f3bed0d4a952a Mon Sep 17 00:00:00 2001 From: wind57 Date: Tue, 26 Sep 2023 14:27:40 +0300 Subject: [PATCH 39/70] test --- .github/workflows/composites/clean-space/action.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/composites/clean-space/action.yaml b/.github/workflows/composites/clean-space/action.yaml index f115de3a20..3b2761a64c 100644 --- a/.github/workflows/composites/clean-space/action.yaml +++ b/.github/workflows/composites/clean-space/action.yaml @@ -3,6 +3,9 @@ description: clean space runs: using: "composite" steps: + - name: gcloud + shell: bash + run: gcloud info - name: Free Disk Space uses: jlumbroso/free-disk-space@main From c77b86acc4a4febe8da63b5783f0b1eac657fb71 Mon Sep 17 00:00:00 2001 From: wind57 Date: Tue, 26 Sep 2023 14:39:06 +0300 Subject: [PATCH 40/70] test --- .github/workflows/composites/clean-space/action.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/composites/clean-space/action.yaml b/.github/workflows/composites/clean-space/action.yaml index 3b2761a64c..e1bb096bd5 100644 --- a/.github/workflows/composites/clean-space/action.yaml +++ b/.github/workflows/composites/clean-space/action.yaml @@ -5,7 +5,9 @@ runs: steps: - name: gcloud shell: bash - run: gcloud info + run: | + sudo apt-get update + gcloud info - name: Free Disk Space uses: jlumbroso/free-disk-space@main From 5c244f5edb3ed12776f97dd28046d417e7b6ebd5 Mon Sep 17 00:00:00 2001 From: wind57 Date: Tue, 26 Sep 2023 18:50:16 +0300 Subject: [PATCH 41/70] review comments --- spring-cloud-kubernetes-integration-tests/pom.xml | 11 +++++++++++ .../pom.xml | 1 - .../pom.xml | 1 - .../pom.xml | 1 - .../pom.xml | 1 - .../pom.xml | 1 - .../pom.xml | 1 - .../pom.xml | 1 - .../pom.xml | 1 - .../pom.xml | 1 - .../pom.xml | 1 - .../pom.xml | 1 - .../pom.xml | 1 - .../pom.xml | 1 - .../pom.xml | 1 - .../pom.xml | 1 - .../pom.xml | 1 - .../spring-cloud-kubernetes-fabric8-istio-it/pom.xml | 1 - 18 files changed, 11 insertions(+), 17 deletions(-) diff --git a/spring-cloud-kubernetes-integration-tests/pom.xml b/spring-cloud-kubernetes-integration-tests/pom.xml index ebd7479cf8..142af47a7c 100644 --- a/spring-cloud-kubernetes-integration-tests/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/pom.xml @@ -32,6 +32,17 @@ + + + + + org.apache.maven.plugins + maven-failsafe-plugin + 3.1.2 + + + + diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-catalog-watcher/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-catalog-watcher/pom.xml index 2b5afdca5d..38f4e18e73 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-catalog-watcher/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-catalog-watcher/pom.xml @@ -86,7 +86,6 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.1.2 diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-configmap-event-reload-multiple-apps/spring-cloud-kubernetes-client-configuration-watcher-configmap-test-app/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-configmap-event-reload-multiple-apps/spring-cloud-kubernetes-client-configuration-watcher-configmap-test-app/pom.xml index 530756302e..382886e789 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-configmap-event-reload-multiple-apps/spring-cloud-kubernetes-client-configuration-watcher-configmap-test-app/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-configmap-event-reload-multiple-apps/spring-cloud-kubernetes-client-configuration-watcher-configmap-test-app/pom.xml @@ -55,7 +55,6 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.1.2 diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/pom.xml index 243f1a4d32..ec84212c8a 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/pom.xml @@ -96,7 +96,6 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.1.2 diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-event-and-polling-reload/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-event-and-polling-reload/pom.xml index 10a1503128..dfc5d03931 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-event-and-polling-reload/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-event-and-polling-reload/pom.xml @@ -95,7 +95,6 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.1.2 diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-loadbalancer-it/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-loadbalancer-it/pom.xml index 1aea888da1..61e6ba120f 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-loadbalancer-it/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-loadbalancer-it/pom.xml @@ -91,7 +91,6 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.1.2 diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-secrets-event-reload-multiple-apps/spring-cloud-kubernetes-client-configuration-watcher-secrets-test-app/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-secrets-event-reload-multiple-apps/spring-cloud-kubernetes-client-configuration-watcher-secrets-test-app/pom.xml index 38b3156899..ba73ef90b8 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-secrets-event-reload-multiple-apps/spring-cloud-kubernetes-client-configuration-watcher-secrets-test-app/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-secrets-event-reload-multiple-apps/spring-cloud-kubernetes-client-configuration-watcher-secrets-test-app/pom.xml @@ -55,7 +55,6 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.1.2 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 4179f2975c..69d3aac1de 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 @@ -111,7 +111,6 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.1.2 diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-discoveryclient-it/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-discoveryclient-it/pom.xml index 512716a58c..74e485be7f 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-discoveryclient-it/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-discoveryclient-it/pom.xml @@ -92,7 +92,6 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.1.2 diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/pom.xml index 0f93f700fb..e30c96300f 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/pom.xml @@ -86,7 +86,6 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.1.2 diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap-event-reload/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap-event-reload/pom.xml index bc22366d8b..a1ba8bb15b 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap-event-reload/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap-event-reload/pom.xml @@ -93,7 +93,6 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.1.2 diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap-polling-reload/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap-polling-reload/pom.xml index 5add6f8edd..c5b250af03 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap-polling-reload/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap-polling-reload/pom.xml @@ -96,7 +96,6 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.1.2 diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap/pom.xml index 5d411470b7..f95d31e806 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap/pom.xml @@ -86,7 +86,6 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.1.2 diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery-with-bootstrap/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery-with-bootstrap/pom.xml index d0eb7669fd..0f5a4a4934 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery-with-bootstrap/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery-with-bootstrap/pom.xml @@ -90,7 +90,6 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.1.2 diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/pom.xml index bb1d63c5dc..dfe6a31ec6 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/pom.xml @@ -86,7 +86,6 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.1.2 diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-loadbalancer/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-loadbalancer/pom.xml index 1df946c6c0..9362129cb0 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-loadbalancer/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-loadbalancer/pom.xml @@ -86,7 +86,6 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.1.2 diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-secrets-event-reload/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-secrets-event-reload/pom.xml index 1c071aa98f..0778446710 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-secrets-event-reload/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-secrets-event-reload/pom.xml @@ -88,7 +88,6 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.1.2 diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-istio-it/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-istio-it/pom.xml index 3c047314dd..c1d9fb67a5 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-istio-it/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-istio-it/pom.xml @@ -86,7 +86,6 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.1.2 From 6810e8f6bcff9ea9ca42b1d8a4e07d759df3fed9 Mon Sep 17 00:00:00 2001 From: wind57 Date: Tue, 26 Sep 2023 19:37:56 +0300 Subject: [PATCH 42/70] test --- .github/workflows/composites/clean-space/action.yaml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/composites/clean-space/action.yaml b/.github/workflows/composites/clean-space/action.yaml index e1bb096bd5..f0e9488b01 100644 --- a/.github/workflows/composites/clean-space/action.yaml +++ b/.github/workflows/composites/clean-space/action.yaml @@ -7,7 +7,14 @@ runs: shell: bash run: | sudo apt-get update - gcloud info + sudo apt-get remove -y '^dotnet-.*' + sudo apt-get remove -y '^llvm-.*' + sudo apt-get remove -y 'php.*' + sudo apt-get remove -y '^mongodb-.*' + sudo apt-get remove -y '^mysql-.*' + sudo apt-get remove -y azure-cli google-cloud-sdk google-chrome-stable firefox powershell mono-devel libgl1-mesa-dri + sudo apt-get autoremove -y + sudo apt-get clean - name: Free Disk Space uses: jlumbroso/free-disk-space@main @@ -16,5 +23,5 @@ runs: android: true dotnet: true haskell: true - large-packages: true + large-packages: false swap-storage: true From dc62bbc6eade9231fca82df7b7f7735ba7f85335 Mon Sep 17 00:00:00 2001 From: wind57 Date: Tue, 26 Sep 2023 19:48:30 +0300 Subject: [PATCH 43/70] test --- .../composites/clean-space/action.yaml | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/composites/clean-space/action.yaml b/.github/workflows/composites/clean-space/action.yaml index f0e9488b01..5f76a9f56a 100644 --- a/.github/workflows/composites/clean-space/action.yaml +++ b/.github/workflows/composites/clean-space/action.yaml @@ -12,16 +12,16 @@ runs: sudo apt-get remove -y 'php.*' sudo apt-get remove -y '^mongodb-.*' sudo apt-get remove -y '^mysql-.*' - sudo apt-get remove -y azure-cli google-cloud-sdk google-chrome-stable firefox powershell mono-devel libgl1-mesa-dri + sudo apt-get remove -y azure-cli # google-cloud-sdk google-chrome-stable firefox powershell mono-devel libgl1-mesa-dri sudo apt-get autoremove -y sudo apt-get clean - - name: Free Disk Space - uses: jlumbroso/free-disk-space@main - with: - tool-cache: true - android: true - dotnet: true - haskell: true - large-packages: false - swap-storage: true +# - name: Free Disk Space +# uses: jlumbroso/free-disk-space@main +# with: +# tool-cache: true +# android: true +# dotnet: true +# haskell: true +# large-packages: false +# swap-storage: true From 5d5ea38c31d693dcb2836db9cca4484dde3a82ec Mon Sep 17 00:00:00 2001 From: wind57 Date: Tue, 26 Sep 2023 20:05:04 +0300 Subject: [PATCH 44/70] test --- .github/workflows/composites/clean-space/action.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/composites/clean-space/action.yaml b/.github/workflows/composites/clean-space/action.yaml index 5f76a9f56a..07affc2139 100644 --- a/.github/workflows/composites/clean-space/action.yaml +++ b/.github/workflows/composites/clean-space/action.yaml @@ -12,9 +12,10 @@ runs: sudo apt-get remove -y 'php.*' sudo apt-get remove -y '^mongodb-.*' sudo apt-get remove -y '^mysql-.*' - sudo apt-get remove -y azure-cli # google-cloud-sdk google-chrome-stable firefox powershell mono-devel libgl1-mesa-dri - sudo apt-get autoremove -y - sudo apt-get clean + sudo apt-get remove -y azure-cli # google-chrome-stable firefox powershell mono-devel libgl1-mesa-dri + sudo apt-get remove -y google-cloud-sdk + #sudo apt-get autoremove -y + #sudo apt-get clean # - name: Free Disk Space # uses: jlumbroso/free-disk-space@main From f31d7414544fa277fb6d3c362aa91aadf5c2468a Mon Sep 17 00:00:00 2001 From: wind57 Date: Tue, 26 Sep 2023 20:16:31 +0300 Subject: [PATCH 45/70] test --- .github/workflows/composites/clean-space/action.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/composites/clean-space/action.yaml b/.github/workflows/composites/clean-space/action.yaml index 07affc2139..2bf4004714 100644 --- a/.github/workflows/composites/clean-space/action.yaml +++ b/.github/workflows/composites/clean-space/action.yaml @@ -14,8 +14,8 @@ runs: sudo apt-get remove -y '^mysql-.*' sudo apt-get remove -y azure-cli # google-chrome-stable firefox powershell mono-devel libgl1-mesa-dri sudo apt-get remove -y google-cloud-sdk - #sudo apt-get autoremove -y - #sudo apt-get clean + sudo apt-get autoremove -y + sudo apt-get clean # - name: Free Disk Space # uses: jlumbroso/free-disk-space@main From 8de4b9c09390f9d952becc250ef4f4b68dc87bfa Mon Sep 17 00:00:00 2001 From: wind57 Date: Tue, 26 Sep 2023 20:24:27 +0300 Subject: [PATCH 46/70] test --- .../composites/clean-space/action.yaml | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/.github/workflows/composites/clean-space/action.yaml b/.github/workflows/composites/clean-space/action.yaml index 2bf4004714..1e33aa9f4f 100644 --- a/.github/workflows/composites/clean-space/action.yaml +++ b/.github/workflows/composites/clean-space/action.yaml @@ -3,6 +3,7 @@ description: clean space runs: using: "composite" steps: + - name: gcloud shell: bash run: | @@ -12,17 +13,15 @@ runs: sudo apt-get remove -y 'php.*' sudo apt-get remove -y '^mongodb-.*' sudo apt-get remove -y '^mysql-.*' - sudo apt-get remove -y azure-cli # google-chrome-stable firefox powershell mono-devel libgl1-mesa-dri - sudo apt-get remove -y google-cloud-sdk - sudo apt-get autoremove -y + sudo apt-get remove -y azure-cli google-chrome-stable firefox powershell mono-devel libgl1-mesa-dri sudo apt-get clean -# - name: Free Disk Space -# uses: jlumbroso/free-disk-space@main -# with: -# tool-cache: true -# android: true -# dotnet: true -# haskell: true -# large-packages: false -# swap-storage: true + - name: Free Disk Space + uses: jlumbroso/free-disk-space@main + with: + tool-cache: true + android: true + dotnet: true + haskell: true + large-packages: false + swap-storage: true From 7715ca5883f8968a4ef154c1b529c4ea128b67b5 Mon Sep 17 00:00:00 2001 From: wind57 Date: Tue, 26 Sep 2023 20:32:09 +0300 Subject: [PATCH 47/70] test --- .github/workflows/composites/clean-space/action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/composites/clean-space/action.yaml b/.github/workflows/composites/clean-space/action.yaml index 1e33aa9f4f..db87c9a28d 100644 --- a/.github/workflows/composites/clean-space/action.yaml +++ b/.github/workflows/composites/clean-space/action.yaml @@ -13,7 +13,7 @@ runs: sudo apt-get remove -y 'php.*' sudo apt-get remove -y '^mongodb-.*' sudo apt-get remove -y '^mysql-.*' - sudo apt-get remove -y azure-cli google-chrome-stable firefox powershell mono-devel libgl1-mesa-dri + sudo apt-get remove -y azure-cli google-cloud-sdk google-chrome-stable firefox powershell mono-devel libgl1-mesa-dri sudo apt-get clean - name: Free Disk Space From 40c45148a9da56eb0ef906a080c469180c52d958 Mon Sep 17 00:00:00 2001 From: wind57 Date: Tue, 26 Sep 2023 20:43:14 +0300 Subject: [PATCH 48/70] test --- .github/workflows/composites/clean-space/action.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/composites/clean-space/action.yaml b/.github/workflows/composites/clean-space/action.yaml index db87c9a28d..792bd071a5 100644 --- a/.github/workflows/composites/clean-space/action.yaml +++ b/.github/workflows/composites/clean-space/action.yaml @@ -4,6 +4,10 @@ runs: using: "composite" steps: + - name: remove google-cloud-sdk + shell: bash + run: sudo apt-get remove -y google-cloud-sdk + - name: gcloud shell: bash run: | @@ -13,7 +17,8 @@ runs: sudo apt-get remove -y 'php.*' sudo apt-get remove -y '^mongodb-.*' sudo apt-get remove -y '^mysql-.*' - sudo apt-get remove -y azure-cli google-cloud-sdk google-chrome-stable firefox powershell mono-devel libgl1-mesa-dri + sudo apt-get remove -y azure-cli google-chrome-stable firefox powershell mono-devel libgl1-mesa-dri + sudo apt-get autoremove -y sudo apt-get clean - name: Free Disk Space From 67d1cc4eef488235ef73123bc0e6fc5a85769712 Mon Sep 17 00:00:00 2001 From: wind57 Date: Tue, 26 Sep 2023 20:50:22 +0300 Subject: [PATCH 49/70] test --- .github/workflows/composites/clean-space/action.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/composites/clean-space/action.yaml b/.github/workflows/composites/clean-space/action.yaml index 792bd071a5..10c8985855 100644 --- a/.github/workflows/composites/clean-space/action.yaml +++ b/.github/workflows/composites/clean-space/action.yaml @@ -6,12 +6,13 @@ runs: - name: remove google-cloud-sdk shell: bash - run: sudo apt-get remove -y google-cloud-sdk + run: | + sudo apt-get update + sudo apt-get remove -y google-cloud-sdk - name: gcloud shell: bash run: | - sudo apt-get update sudo apt-get remove -y '^dotnet-.*' sudo apt-get remove -y '^llvm-.*' sudo apt-get remove -y 'php.*' From 622cc946a8b4d8ced507053e3528a2901df50328 Mon Sep 17 00:00:00 2001 From: wind57 Date: Tue, 26 Sep 2023 21:00:18 +0300 Subject: [PATCH 50/70] test --- .github/workflows/composites/clean-space/action.yaml | 1 + .github/workflows/maven.yaml | 3 +++ 2 files changed, 4 insertions(+) diff --git a/.github/workflows/composites/clean-space/action.yaml b/.github/workflows/composites/clean-space/action.yaml index 10c8985855..a0e78799a6 100644 --- a/.github/workflows/composites/clean-space/action.yaml +++ b/.github/workflows/composites/clean-space/action.yaml @@ -8,6 +8,7 @@ runs: shell: bash run: | sudo apt-get update + gcloud info sudo apt-get remove -y google-cloud-sdk - name: gcloud diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml index 4fcc70635b..6264d4c008 100644 --- a/.github/workflows/maven.yaml +++ b/.github/workflows/maven.yaml @@ -29,6 +29,9 @@ jobs: - name: checkout project uses: actions/checkout@v2 + - name: clean space + uses: ./.github/workflows/composites/clean-space + - name: set env variables uses: ./.github/workflows/composites/env-variables From 78734c14cb348d346f529a3238bc8afc0070fad3 Mon Sep 17 00:00:00 2001 From: wind57 Date: Tue, 26 Sep 2023 21:02:57 +0300 Subject: [PATCH 51/70] test --- .github/workflows/composites/clean-space/action.yaml | 2 +- .github/workflows/maven.yaml | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/composites/clean-space/action.yaml b/.github/workflows/composites/clean-space/action.yaml index a0e78799a6..23507eb189 100644 --- a/.github/workflows/composites/clean-space/action.yaml +++ b/.github/workflows/composites/clean-space/action.yaml @@ -11,7 +11,7 @@ runs: gcloud info sudo apt-get remove -y google-cloud-sdk - - name: gcloud + - name: same as 'large-packages' but without 'google-cloud-sdk' shell: bash run: | sudo apt-get remove -y '^dotnet-.*' diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml index 6264d4c008..4fcc70635b 100644 --- a/.github/workflows/maven.yaml +++ b/.github/workflows/maven.yaml @@ -29,9 +29,6 @@ jobs: - name: checkout project uses: actions/checkout@v2 - - name: clean space - uses: ./.github/workflows/composites/clean-space - - name: set env variables uses: ./.github/workflows/composites/env-variables From c2ad21e443aba983f7506eb185f17e838d28c20c Mon Sep 17 00:00:00 2001 From: wind57 Date: Tue, 26 Sep 2023 21:12:38 +0300 Subject: [PATCH 52/70] test --- .github/workflows/composites/clean-space/action.yaml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/workflows/composites/clean-space/action.yaml b/.github/workflows/composites/clean-space/action.yaml index 23507eb189..1e08c8f49b 100644 --- a/.github/workflows/composites/clean-space/action.yaml +++ b/.github/workflows/composites/clean-space/action.yaml @@ -4,13 +4,6 @@ runs: using: "composite" steps: - - name: remove google-cloud-sdk - shell: bash - run: | - sudo apt-get update - gcloud info - sudo apt-get remove -y google-cloud-sdk - - name: same as 'large-packages' but without 'google-cloud-sdk' shell: bash run: | From 1d853d206d1e049a9edea4956a9d02b870d8706f Mon Sep 17 00:00:00 2001 From: wind57 Date: Tue, 26 Sep 2023 21:15:51 +0300 Subject: [PATCH 53/70] test --- .github/workflows/composites/clean-space/action.yaml | 9 +++++++++ .github/workflows/maven.yaml | 3 +++ 2 files changed, 12 insertions(+) diff --git a/.github/workflows/composites/clean-space/action.yaml b/.github/workflows/composites/clean-space/action.yaml index 1e08c8f49b..ba3b646879 100644 --- a/.github/workflows/composites/clean-space/action.yaml +++ b/.github/workflows/composites/clean-space/action.yaml @@ -4,6 +4,15 @@ runs: using: "composite" steps: + - name: manually remove gcloud + shell: bash + run: | + gcloud_sdk_root=$(gcloud info --format='value(installation.sdk_root)') + gcloud_global_config=$(gcloud info --format='value(config.paths.global_config_dir)') + + sudo rm -fr $gcloud_sdk_root + sudo rm -fr $gcloud_global_config + - name: same as 'large-packages' but without 'google-cloud-sdk' shell: bash run: | diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml index 4fcc70635b..6264d4c008 100644 --- a/.github/workflows/maven.yaml +++ b/.github/workflows/maven.yaml @@ -29,6 +29,9 @@ jobs: - name: checkout project uses: actions/checkout@v2 + - name: clean space + uses: ./.github/workflows/composites/clean-space + - name: set env variables uses: ./.github/workflows/composites/env-variables From 5e985c5e3c50e05f6b16c83a5a5537875cd5471d Mon Sep 17 00:00:00 2001 From: wind57 Date: Tue, 26 Sep 2023 21:31:06 +0300 Subject: [PATCH 54/70] test --- .github/workflows/composites/clean-space/action.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/composites/clean-space/action.yaml b/.github/workflows/composites/clean-space/action.yaml index ba3b646879..588253a3e6 100644 --- a/.github/workflows/composites/clean-space/action.yaml +++ b/.github/workflows/composites/clean-space/action.yaml @@ -10,6 +10,9 @@ runs: gcloud_sdk_root=$(gcloud info --format='value(installation.sdk_root)') gcloud_global_config=$(gcloud info --format='value(config.paths.global_config_dir)') + echo "will remove directory : $gcloud_sdk_root" + echo "will remove directory : $gcloud_global_config" + sudo rm -fr $gcloud_sdk_root sudo rm -fr $gcloud_global_config From c982060ef0d1317fa9161b4e0e116f652ba43079 Mon Sep 17 00:00:00 2001 From: wind57 Date: Tue, 26 Sep 2023 21:38:38 +0300 Subject: [PATCH 55/70] test --- .github/workflows/maven.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml index 6264d4c008..4fcc70635b 100644 --- a/.github/workflows/maven.yaml +++ b/.github/workflows/maven.yaml @@ -29,9 +29,6 @@ jobs: - name: checkout project uses: actions/checkout@v2 - - name: clean space - uses: ./.github/workflows/composites/clean-space - - name: set env variables uses: ./.github/workflows/composites/env-variables From 8a42c1582d13c7768cac841818aff5753390b940 Mon Sep 17 00:00:00 2001 From: wind57 Date: Tue, 26 Sep 2023 22:20:46 +0300 Subject: [PATCH 56/70] fix build --- .github/workflows/composites/clean-space/action.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/composites/clean-space/action.yaml b/.github/workflows/composites/clean-space/action.yaml index 588253a3e6..2f9906ce2e 100644 --- a/.github/workflows/composites/clean-space/action.yaml +++ b/.github/workflows/composites/clean-space/action.yaml @@ -4,6 +4,9 @@ runs: using: "composite" steps: + ### this is supposed to be simpler, but it's a work-around for: + ### https://github.com/jlumbroso/free-disk-space/issues/14 + - name: manually remove gcloud shell: bash run: | From 6a07b131506b7ac03ade2a9fe11f690e1ca70bce Mon Sep 17 00:00:00 2001 From: wind57 Date: Tue, 26 Sep 2023 22:58:55 +0300 Subject: [PATCH 57/70] placeholder commit From e9077e285f78ad5c781754c45576ef431a9942a3 Mon Sep 17 00:00:00 2001 From: wind57 Date: Wed, 27 Sep 2023 07:32:32 +0300 Subject: [PATCH 58/70] review comments --- .../action.yaml | 2 +- .../action.yaml | 2 +- .../pom.xml | 27 ++++++++++++------- 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/.github/workflows/composites/run-and-save-test-times-when-cache-missing/action.yaml b/.github/workflows/composites/run-and-save-test-times-when-cache-missing/action.yaml index 0cb4085b21..b1d18fef80 100644 --- a/.github/workflows/composites/run-and-save-test-times-when-cache-missing/action.yaml +++ b/.github/workflows/composites/run-and-save-test-times-when-cache-missing/action.yaml @@ -61,7 +61,7 @@ runs: ./mvnw -s .settings.xml \ -DtestsToRun=${TEST_ARG[@]} \ -e clean install \ - -P sonar -nsu --batch-mode \ + -P 'sonar, run-on-github-actions' -nsu --batch-mode \ -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \ -Dhttp.keepAlive=false \ -Dmaven.wagon.http.pool=false \ diff --git a/.github/workflows/composites/run-and-save-test-times-when-cache-present/action.yaml b/.github/workflows/composites/run-and-save-test-times-when-cache-present/action.yaml index f658cfbf58..7130a907c9 100644 --- a/.github/workflows/composites/run-and-save-test-times-when-cache-present/action.yaml +++ b/.github/workflows/composites/run-and-save-test-times-when-cache-present/action.yaml @@ -150,7 +150,7 @@ runs: ./mvnw -s .settings.xml \ -DtestsToRun=${tests_to_run_in_current_index} \ -e clean install \ - -P sonar -nsu --batch-mode \ + -P 'sonar, run-on-github-actions' -nsu --batch-mode \ -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \ -Dhttp.keepAlive=false \ -Dmaven.wagon.http.pool=false \ diff --git a/spring-cloud-kubernetes-integration-tests/pom.xml b/spring-cloud-kubernetes-integration-tests/pom.xml index 142af47a7c..d1b0cbaf50 100644 --- a/spring-cloud-kubernetes-integration-tests/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/pom.xml @@ -33,18 +33,25 @@ - - - - org.apache.maven.plugins - maven-failsafe-plugin - 3.1.2 - - - - + + + run-on-github-actions + + + + + org.apache.maven.plugins + maven-failsafe-plugin + 3.1.2 + + + + + + + From 5a7695a53209e195dbc8d9ccf31ec74f2084fbc0 Mon Sep 17 00:00:00 2001 From: wind57 Date: Wed, 27 Sep 2023 14:00:54 +0300 Subject: [PATCH 59/70] merge --- .../kubernetes-leader-election-example/pom.xml | 4 ++-- spring-cloud-kubernetes-integration-tests/pom.xml | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/spring-cloud-kubernetes-examples/kubernetes-leader-election-example/pom.xml b/spring-cloud-kubernetes-examples/kubernetes-leader-election-example/pom.xml index d6bc61dbc0..e13b268c78 100644 --- a/spring-cloud-kubernetes-examples/kubernetes-leader-election-example/pom.xml +++ b/spring-cloud-kubernetes-examples/kubernetes-leader-election-example/pom.xml @@ -75,11 +75,11 @@ maven-surefire-plugin - 2.22.2 + 3.1.2 maven-failsafe-plugin - 2.22.2 + 3.1.2 diff --git a/spring-cloud-kubernetes-integration-tests/pom.xml b/spring-cloud-kubernetes-integration-tests/pom.xml index d1b0cbaf50..1dae169f19 100644 --- a/spring-cloud-kubernetes-integration-tests/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/pom.xml @@ -46,6 +46,12 @@ maven-failsafe-plugin 3.1.2 + + + org.apache.maven.plugins + maven-surefire-plugin + 3.1.2 + From e13bcd3209513dddd0fb2a72206f4d72478bb577 Mon Sep 17 00:00:00 2001 From: wind57 Date: Fri, 29 Sep 2023 09:33:32 +0300 Subject: [PATCH 60/70] fix --- .../composites/clean-space/action.yaml | 21 +------------------ 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/.github/workflows/composites/clean-space/action.yaml b/.github/workflows/composites/clean-space/action.yaml index cba74e0221..f115de3a20 100644 --- a/.github/workflows/composites/clean-space/action.yaml +++ b/.github/workflows/composites/clean-space/action.yaml @@ -4,25 +4,6 @@ runs: using: "composite" steps: - ### this is supposed to be simpler, but it's a work-around for: - ### https://github.com/jlumbroso/free-disk-space/issues/14 - - - name: manually remove gcloud - shell: bash - run: sudo apt-get remove google-cloud-cli - - - name: same as 'large-packages' but without 'google-cloud-sdk' - shell: bash - run: | - sudo apt-get remove -y '^dotnet-.*' - sudo apt-get remove -y '^llvm-.*' - sudo apt-get remove -y 'php.*' - sudo apt-get remove -y '^mongodb-.*' - sudo apt-get remove -y '^mysql-.*' - sudo apt-get remove -y azure-cli google-chrome-stable firefox powershell mono-devel libgl1-mesa-dri - sudo apt-get autoremove -y - sudo apt-get clean - - name: Free Disk Space uses: jlumbroso/free-disk-space@main with: @@ -30,5 +11,5 @@ runs: android: true dotnet: true haskell: true - large-packages: false + large-packages: true swap-storage: true From 0515920476866923c1b6bfb0a9cc4257490f0452 Mon Sep 17 00:00:00 2001 From: wind57 Date: Fri, 29 Sep 2023 12:18:07 +0300 Subject: [PATCH 61/70] fix --- .../composites/pre-test-actions/action.yaml | 2 +- .../action.yaml | 3 ++- .../action.yaml | 3 ++- pom.xml | 13 +++++++++-- .../pom.xml | 23 ------------------- 5 files changed, 16 insertions(+), 28 deletions(-) diff --git a/.github/workflows/composites/pre-test-actions/action.yaml b/.github/workflows/composites/pre-test-actions/action.yaml index 657c55e886..3fd401e81f 100644 --- a/.github/workflows/composites/pre-test-actions/action.yaml +++ b/.github/workflows/composites/pre-test-actions/action.yaml @@ -25,7 +25,7 @@ runs: - name: build project shell: bash run: | - ./mvnw clean install -Dskip.build.image=true -DskipITs -DskipTests -T1C -U -B -q + ./mvnw clean install -DCURRENT_INSTANCE=${CURRENT_INDEX} -Dskip.build.image=true -DskipITs -DskipTests -T1C -U -B -q - name: build controllers project uses: ./.github/workflows/composites/build-controllers-project diff --git a/.github/workflows/composites/run-and-save-test-times-when-cache-missing/action.yaml b/.github/workflows/composites/run-and-save-test-times-when-cache-missing/action.yaml index b1d18fef80..d262d89bbd 100644 --- a/.github/workflows/composites/run-and-save-test-times-when-cache-missing/action.yaml +++ b/.github/workflows/composites/run-and-save-test-times-when-cache-missing/action.yaml @@ -60,8 +60,9 @@ runs: ./mvnw -s .settings.xml \ -DtestsToRun=${TEST_ARG[@]} \ + -DCURRENT_INSTANCE=${CURRENT_INDEX} \ -e clean install \ - -P 'sonar, run-on-github-actions' -nsu --batch-mode \ + -P sonar -nsu --batch-mode \ -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \ -Dhttp.keepAlive=false \ -Dmaven.wagon.http.pool=false \ diff --git a/.github/workflows/composites/run-and-save-test-times-when-cache-present/action.yaml b/.github/workflows/composites/run-and-save-test-times-when-cache-present/action.yaml index 7130a907c9..ce2242c3fc 100644 --- a/.github/workflows/composites/run-and-save-test-times-when-cache-present/action.yaml +++ b/.github/workflows/composites/run-and-save-test-times-when-cache-present/action.yaml @@ -149,8 +149,9 @@ runs: ./mvnw -s .settings.xml \ -DtestsToRun=${tests_to_run_in_current_index} \ + -DCURRENT_INSTANCE=${CURRENT_INDEX} \ -e clean install \ - -P 'sonar, run-on-github-actions' -nsu --batch-mode \ + -P sonar -nsu --batch-mode \ -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \ -Dhttp.keepAlive=false \ -Dmaven.wagon.http.pool=false \ diff --git a/pom.xml b/pom.xml index 2f693f6818..199db284b2 100644 --- a/pom.xml +++ b/pom.xml @@ -62,6 +62,7 @@ + one 4.8.1 4.0.5-SNAPSHOT @@ -69,8 +70,6 @@ 4.0.1 4.0.5-SNAPSHOT - 3.1.0 - true true @@ -205,8 +204,18 @@ ${testsToRun} + ${project.build.directory}/surefire-reports/${CURRENT_INSTANCE} + + + + + org.apache.maven.plugins + maven-failsafe-plugin + + ${project.build.directory}/failsafe-reports/${CURRENT_INSTANCE} + org.apache.maven.plugins maven-checkstyle-plugin diff --git a/spring-cloud-kubernetes-integration-tests/pom.xml b/spring-cloud-kubernetes-integration-tests/pom.xml index 1dae169f19..03363f509a 100644 --- a/spring-cloud-kubernetes-integration-tests/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/pom.xml @@ -35,29 +35,6 @@ - - - run-on-github-actions - - - - - org.apache.maven.plugins - maven-failsafe-plugin - 3.1.2 - - - - org.apache.maven.plugins - maven-surefire-plugin - 3.1.2 - - - - - - - From 565679c21b8e39d15cd6208669e341d6184b65ab Mon Sep 17 00:00:00 2001 From: wind57 Date: Fri, 29 Sep 2023 12:24:12 +0300 Subject: [PATCH 62/70] test --- .../composites/build-controllers-project/action.yaml | 6 +++++- .github/workflows/composites/pre-test-actions/action.yaml | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/composites/build-controllers-project/action.yaml b/.github/workflows/composites/build-controllers-project/action.yaml index 307451c8f5..df34f3c443 100644 --- a/.github/workflows/composites/build-controllers-project/action.yaml +++ b/.github/workflows/composites/build-controllers-project/action.yaml @@ -7,5 +7,9 @@ runs: shell: bash run: | cd spring-cloud-kubernetes-controllers - .././mvnw -T 1C -U clean install + .././mvnw -DCURRENT_INSTANCE=${CURRENT_INDEX} -T 1C -U clean install cd .. + + - name: show target path + shell: bash + run: ls spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/target/surefire-reports diff --git a/.github/workflows/composites/pre-test-actions/action.yaml b/.github/workflows/composites/pre-test-actions/action.yaml index 3fd401e81f..657c55e886 100644 --- a/.github/workflows/composites/pre-test-actions/action.yaml +++ b/.github/workflows/composites/pre-test-actions/action.yaml @@ -25,7 +25,7 @@ runs: - name: build project shell: bash run: | - ./mvnw clean install -DCURRENT_INSTANCE=${CURRENT_INDEX} -Dskip.build.image=true -DskipITs -DskipTests -T1C -U -B -q + ./mvnw clean install -Dskip.build.image=true -DskipITs -DskipTests -T1C -U -B -q - name: build controllers project uses: ./.github/workflows/composites/build-controllers-project From 3a869235fd3a1df0ea440725b3bfaabb0c9d929f Mon Sep 17 00:00:00 2001 From: wind57 Date: Fri, 29 Sep 2023 15:27:10 +0300 Subject: [PATCH 63/70] test --- .../workflows/composites/build-controllers-project/action.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/composites/build-controllers-project/action.yaml b/.github/workflows/composites/build-controllers-project/action.yaml index df34f3c443..f9df2c519d 100644 --- a/.github/workflows/composites/build-controllers-project/action.yaml +++ b/.github/workflows/composites/build-controllers-project/action.yaml @@ -5,6 +5,8 @@ runs: steps: - name: build controllers project shell: bash + env: + CURRENT_INDEX: ${{ matrix.current_index }} run: | cd spring-cloud-kubernetes-controllers .././mvnw -DCURRENT_INSTANCE=${CURRENT_INDEX} -T 1C -U clean install From 03274168fa2133c0277350d84598264a5ccd0ec5 Mon Sep 17 00:00:00 2001 From: wind57 Date: Mon, 2 Oct 2023 15:49:34 +0300 Subject: [PATCH 64/70] review comments --- .../composites/build-controllers-project/action.yaml | 4 ---- pom.xml | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/composites/build-controllers-project/action.yaml b/.github/workflows/composites/build-controllers-project/action.yaml index f9df2c519d..dff8da1648 100644 --- a/.github/workflows/composites/build-controllers-project/action.yaml +++ b/.github/workflows/composites/build-controllers-project/action.yaml @@ -11,7 +11,3 @@ runs: cd spring-cloud-kubernetes-controllers .././mvnw -DCURRENT_INSTANCE=${CURRENT_INDEX} -T 1C -U clean install cd .. - - - name: show target path - shell: bash - run: ls spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/target/surefire-reports diff --git a/pom.xml b/pom.xml index 199db284b2..271e4616b0 100644 --- a/pom.xml +++ b/pom.xml @@ -62,6 +62,10 @@ + + + + one 4.8.1 From df2d07e8979cca4c6b9f631f835c06f860559ae5 Mon Sep 17 00:00:00 2001 From: wind57 Date: Fri, 13 Oct 2023 21:47:22 +0300 Subject: [PATCH 65/70] fix --- .github/workflows/maven.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml index 4fcc70635b..fd2779105d 100644 --- a/.github/workflows/maven.yaml +++ b/.github/workflows/maven.yaml @@ -98,7 +98,7 @@ jobs: SEGMENT_DOWNLOAD_TIMEOUT_MINS: 30 # only run this one if there is a previous cache of test times if: needs.build.outputs.test_times_cache_present == 'true' - timeout-minutes: 60 + timeout-minutes: 120 strategy: fail-fast: true @@ -145,7 +145,7 @@ jobs: runs-on: ubuntu-latest env: SEGMENT_DOWNLOAD_TIMEOUT_MINS: 30 - timeout-minutes: 60 + timeout-minutes: 120 # only run this one if there is no previous cache of test times if: needs.build.outputs.test_times_cache_present == 'false' From b85aa2bd4dd03059e533f00006508fc27efdf87f Mon Sep 17 00:00:00 2001 From: wind57 Date: Sat, 14 Oct 2023 12:58:32 +0300 Subject: [PATCH 66/70] trigger From ba2d75ac26bf52bf8e4ad8322f22b7978e1604e1 Mon Sep 17 00:00:00 2001 From: wind57 Date: Sat, 14 Oct 2023 21:53:44 +0200 Subject: [PATCH 67/70] trigger From c29d467f558b682e6e607d4de8cc8b75f2c53854 Mon Sep 17 00:00:00 2001 From: wind57 Date: Tue, 21 Nov 2023 22:46:32 +0200 Subject: [PATCH 68/70] merge main --- ...etesInformerDiscoveryClientAutoConfiguration.java | 2 +- .../KubernetesDiscoveryClientAutoConfiguration.java | 3 ++- ...bernetesClientDiscoverySelectiveNamespacesIT.java | 12 ++++++------ 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/spring-cloud-kubernetes-client-discovery/src/main/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesInformerDiscoveryClientAutoConfiguration.java b/spring-cloud-kubernetes-client-discovery/src/main/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesInformerDiscoveryClientAutoConfiguration.java index a2c612e55c..3384fa6457 100644 --- a/spring-cloud-kubernetes-client-discovery/src/main/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesInformerDiscoveryClientAutoConfiguration.java +++ b/spring-cloud-kubernetes-client-discovery/src/main/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesInformerDiscoveryClientAutoConfiguration.java @@ -31,8 +31,8 @@ import org.springframework.cloud.client.discovery.simple.SimpleDiscoveryClientAutoConfiguration; import org.springframework.cloud.kubernetes.client.KubernetesClientAutoConfiguration; import org.springframework.cloud.kubernetes.commons.KubernetesNamespaceProvider; -import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryClientHealthConfiguration; import org.springframework.cloud.kubernetes.commons.discovery.ConditionalOnSpringCloudKubernetesBlockingDiscovery; +import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryClientHealthConfiguration; import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryProperties; import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryPropertiesAutoConfiguration; import org.springframework.context.annotation.Bean; diff --git a/spring-cloud-kubernetes-fabric8-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/discovery/KubernetesDiscoveryClientAutoConfiguration.java b/spring-cloud-kubernetes-fabric8-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/discovery/KubernetesDiscoveryClientAutoConfiguration.java index ff77fc7902..5c45b55a4b 100644 --- a/spring-cloud-kubernetes-fabric8-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/discovery/KubernetesDiscoveryClientAutoConfiguration.java +++ b/spring-cloud-kubernetes-fabric8-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/discovery/KubernetesDiscoveryClientAutoConfiguration.java @@ -24,8 +24,8 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.cloud.client.CommonsClientAutoConfiguration; import org.springframework.cloud.client.discovery.simple.SimpleDiscoveryClientAutoConfiguration; -import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryClientHealthConfiguration; import org.springframework.cloud.kubernetes.commons.discovery.ConditionalOnSpringCloudKubernetesBlockingDiscovery; +import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryClientHealthConfiguration; import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryProperties; import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryPropertiesAutoConfiguration; import org.springframework.cloud.kubernetes.commons.discovery.ServicePortSecureResolver; @@ -67,4 +67,5 @@ public KubernetesDiscoveryClient kubernetesDiscoveryClient(KubernetesClient clie return new KubernetesDiscoveryClient(client, properties, kubernetesClientServicesFunction, null, new ServicePortSecureResolver(properties)); } + } diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/java/org/springframework/cloud/kubernetes/k8s/client/discovery/KubernetesClientDiscoverySelectiveNamespacesIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/java/org/springframework/cloud/kubernetes/k8s/client/discovery/KubernetesClientDiscoverySelectiveNamespacesIT.java index 3effa5b6dc..ec8dedfdee 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/java/org/springframework/cloud/kubernetes/k8s/client/discovery/KubernetesClientDiscoverySelectiveNamespacesIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/java/org/springframework/cloud/kubernetes/k8s/client/discovery/KubernetesClientDiscoverySelectiveNamespacesIT.java @@ -253,19 +253,19 @@ private static void manifests(Phase phase) { if (phase.equals(Phase.CREATE)) { List envVars = new ArrayList<>( - Optional.ofNullable(deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getEnv()) - .orElse(List.of())); + Optional.ofNullable(deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getEnv()) + .orElse(List.of())); V1EnvVar debugLevel = new V1EnvVar() - .name("LOGGING_LEVEL_ORG_SPRINGFRAMEWORK_CLOUD_KUBERNETES_CLIENT_DISCOVERY").value("DEBUG"); + .name("LOGGING_LEVEL_ORG_SPRINGFRAMEWORK_CLOUD_KUBERNETES_CLIENT_DISCOVERY").value("DEBUG"); V1EnvVar debugLevelCommons = new V1EnvVar() - .name("LOGGING_LEVEL_ORG_SPRINGFRAMEWORK_CLOUD_KUBERNETES_COMMONS_DISCOVERY").value("DEBUG"); + .name("LOGGING_LEVEL_ORG_SPRINGFRAMEWORK_CLOUD_KUBERNETES_COMMONS_DISCOVERY").value("DEBUG"); V1EnvVar selectiveNamespaceA = new V1EnvVar().name("SPRING_CLOUD_KUBERNETES_DISCOVERY_NAMESPACES_0") - .value(NAMESPACE_A); + .value(NAMESPACE_A); V1EnvVar disableReactiveEnvVar = new V1EnvVar().name("SPRING_CLOUD_DISCOVERY_REACTIVE_ENABLED") - .value("FALSE"); + .value("FALSE"); envVars.add(disableReactiveEnvVar); envVars.add(debugLevel); From 6078fd18d8d9853c5cbf32ab58fd03b492eceb52 Mon Sep 17 00:00:00 2001 From: wind57 Date: Tue, 21 Nov 2023 22:48:31 +0200 Subject: [PATCH 69/70] merge main --- .../KubernetesDiscoveryClientAutoConfiguration.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/spring-cloud-kubernetes-fabric8-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/discovery/KubernetesDiscoveryClientAutoConfiguration.java b/spring-cloud-kubernetes-fabric8-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/discovery/KubernetesDiscoveryClientAutoConfiguration.java index 5c45b55a4b..6f0dc70c7e 100644 --- a/spring-cloud-kubernetes-fabric8-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/discovery/KubernetesDiscoveryClientAutoConfiguration.java +++ b/spring-cloud-kubernetes-fabric8-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/discovery/KubernetesDiscoveryClientAutoConfiguration.java @@ -17,7 +17,6 @@ package org.springframework.cloud.kubernetes.fabric8.discovery; import io.fabric8.kubernetes.client.KubernetesClient; -import org.apache.commons.logging.LogFactory; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.AutoConfigureBefore; @@ -34,7 +33,6 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.core.env.Environment; -import org.springframework.core.log.LogAccessor; /** * Auto configuration for discovery clients. @@ -49,9 +47,6 @@ @Import(KubernetesDiscoveryClientHealthConfiguration.class) public class KubernetesDiscoveryClientAutoConfiguration { - private static final LogAccessor LOG = new LogAccessor( - LogFactory.getLog(KubernetesDiscoveryClientAutoConfiguration.class)); - @Bean @ConditionalOnMissingBean public KubernetesClientServicesFunction servicesFunction(KubernetesDiscoveryProperties properties, From b8457d237e627478a297d847461104cb1210f778 Mon Sep 17 00:00:00 2001 From: wind57 Date: Wed, 13 Mar 2024 21:35:35 +0200 Subject: [PATCH 70/70] placeholder commit