From 87f67440f6d2c05e79b76a9328945d1e9acbe65b Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 30 Jun 2022 15:20:02 +0000 Subject: [PATCH 1/4] Bumping versions --- docs/src/main/asciidoc/_configprops.adoc | 96 ++++++++++++------------ 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/docs/src/main/asciidoc/_configprops.adoc b/docs/src/main/asciidoc/_configprops.adoc index 1d56f633..721f142a 100644 --- a/docs/src/main/asciidoc/_configprops.adoc +++ b/docs/src/main/asciidoc/_configprops.adoc @@ -2,7 +2,7 @@ |Name | Default | Description |spring.cloud.kubernetes.client.api-version | | -|spring.cloud.kubernetes.client.apiVersion | `v1` | Kubernetes API Version +|spring.cloud.kubernetes.client.apiVersion | `+++v1+++` | Kubernetes API Version |spring.cloud.kubernetes.client.ca-cert-data | | |spring.cloud.kubernetes.client.ca-cert-file | | |spring.cloud.kubernetes.client.caCertData | | Kubernetes API CACertData @@ -15,19 +15,19 @@ |spring.cloud.kubernetes.client.client-key-passphrase | | |spring.cloud.kubernetes.client.clientCertData | | Kubernetes API ClientCertData |spring.cloud.kubernetes.client.clientCertFile | | Kubernetes API ClientCertFile -|spring.cloud.kubernetes.client.clientKeyAlgo | `RSA` | Kubernetes API ClientKeyAlgo +|spring.cloud.kubernetes.client.clientKeyAlgo | `+++RSA+++` | Kubernetes API ClientKeyAlgo |spring.cloud.kubernetes.client.clientKeyData | | Kubernetes API ClientKeyData |spring.cloud.kubernetes.client.clientKeyFile | | Kubernetes API ClientKeyFile -|spring.cloud.kubernetes.client.clientKeyPassphrase | `changeit` | Kubernetes API ClientKeyPassphrase +|spring.cloud.kubernetes.client.clientKeyPassphrase | `+++changeit+++` | Kubernetes API ClientKeyPassphrase |spring.cloud.kubernetes.client.connection-timeout | | -|spring.cloud.kubernetes.client.connectionTimeout | `10s` | Connection timeout +|spring.cloud.kubernetes.client.connectionTimeout | `+++10s+++` | Connection timeout |spring.cloud.kubernetes.client.http-proxy | | |spring.cloud.kubernetes.client.https-proxy | | |spring.cloud.kubernetes.client.logging-interval | | -|spring.cloud.kubernetes.client.loggingInterval | `20s` | Logging interval +|spring.cloud.kubernetes.client.loggingInterval | `+++20s+++` | Logging interval |spring.cloud.kubernetes.client.master-url | | -|spring.cloud.kubernetes.client.masterUrl | `https://kubernetes.default.svc` | Kubernetes API Master Node URL -|spring.cloud.kubernetes.client.namespace | `true` | Kubernetes Namespace +|spring.cloud.kubernetes.client.masterUrl | `+++https://kubernetes.default.svc+++` | Kubernetes API Master Node URL +|spring.cloud.kubernetes.client.namespace | `+++true+++` | Kubernetes Namespace |spring.cloud.kubernetes.client.no-proxy | | |spring.cloud.kubernetes.client.oauth-token | | |spring.cloud.kubernetes.client.oauthToken | | Kubernetes API Oauth Token @@ -35,74 +35,74 @@ |spring.cloud.kubernetes.client.proxy-password | | |spring.cloud.kubernetes.client.proxy-username | | |spring.cloud.kubernetes.client.request-timeout | | -|spring.cloud.kubernetes.client.requestTimeout | `10s` | Request timeout +|spring.cloud.kubernetes.client.requestTimeout | `+++10s+++` | Request timeout |spring.cloud.kubernetes.client.rolling-timeout | | -|spring.cloud.kubernetes.client.rollingTimeout | `900s` | Rolling timeout -|spring.cloud.kubernetes.client.service-account-namespace-path | `/var/run/secrets/kubernetes.io/serviceaccount/namespace` | +|spring.cloud.kubernetes.client.rollingTimeout | `+++900s+++` | Rolling timeout +|spring.cloud.kubernetes.client.service-account-namespace-path | `+++/var/run/secrets/kubernetes.io/serviceaccount/namespace+++` | |spring.cloud.kubernetes.client.trust-certs | | -|spring.cloud.kubernetes.client.trustCerts | `false` | Kubernetes API Trust Certificates -|spring.cloud.kubernetes.client.user-agent | `Spring-Cloud-Kubernetes-Application` | +|spring.cloud.kubernetes.client.trustCerts | `+++false+++` | Kubernetes API Trust Certificates +|spring.cloud.kubernetes.client.user-agent | `+++Spring-Cloud-Kubernetes-Application+++` | |spring.cloud.kubernetes.client.username | | Kubernetes API Username |spring.cloud.kubernetes.client.watch-reconnect-interval | | |spring.cloud.kubernetes.client.watch-reconnect-limit | | -|spring.cloud.kubernetes.client.watchReconnectInterval | `1s` | Reconnect Interval -|spring.cloud.kubernetes.client.watchReconnectLimit | `-1` | Reconnect Interval limit retries -|spring.cloud.kubernetes.config.enable-api | `true` | -|spring.cloud.kubernetes.config.enabled | `true` | Enable the ConfigMap property source locator. -|spring.cloud.kubernetes.config.fail-fast | `false` | -|spring.cloud.kubernetes.config.include-profile-specific-sources | `true` | +|spring.cloud.kubernetes.client.watchReconnectInterval | `+++1s+++` | Reconnect Interval +|spring.cloud.kubernetes.client.watchReconnectLimit | `+++-1+++` | Reconnect Interval limit retries +|spring.cloud.kubernetes.config.enable-api | `+++true+++` | +|spring.cloud.kubernetes.config.enabled | `+++true+++` | Enable the ConfigMap property source locator. +|spring.cloud.kubernetes.config.fail-fast | `+++false+++` | +|spring.cloud.kubernetes.config.include-profile-specific-sources | `+++true+++` | |spring.cloud.kubernetes.config.name | | |spring.cloud.kubernetes.config.namespace | | |spring.cloud.kubernetes.config.paths | | |spring.cloud.kubernetes.config.retry | | |spring.cloud.kubernetes.config.sources | | -|spring.cloud.kubernetes.config.use-name-as-prefix | `false` | -|spring.cloud.kubernetes.discovery.all-namespaces | `false` | If discovering all namespaces. -|spring.cloud.kubernetes.discovery.cache-loading-timeout-seconds | `60` | Timeout for initializing discovery cache, will abort the application if exceeded. -|spring.cloud.kubernetes.discovery.enabled | `true` | If Kubernetes Discovery is enabled. +|spring.cloud.kubernetes.config.use-name-as-prefix | `+++false+++` | +|spring.cloud.kubernetes.discovery.all-namespaces | `+++false+++` | If discovering all namespaces. +|spring.cloud.kubernetes.discovery.cache-loading-timeout-seconds | `+++60+++` | Timeout for initializing discovery cache, will abort the application if exceeded. +|spring.cloud.kubernetes.discovery.enabled | `+++true+++` | If Kubernetes Discovery is enabled. |spring.cloud.kubernetes.discovery.filter | | SpEL expression to filter services AFTER they have been retrieved from the Kubernetes API server. -|spring.cloud.kubernetes.discovery.include-not-ready-addresses | `false` | If endpoint addresses not marked 'ready' by the k8s api server should be discovered. +|spring.cloud.kubernetes.discovery.include-not-ready-addresses | `+++false+++` | If endpoint addresses not marked 'ready' by the k8s api server should be discovered. |spring.cloud.kubernetes.discovery.known-secure-ports | | Set the port numbers that are considered secure and use HTTPS. -|spring.cloud.kubernetes.discovery.metadata.add-annotations | `true` | When set, the Kubernetes annotations of the services will be included as metadata of the returned ServiceInstance. -|spring.cloud.kubernetes.discovery.metadata.add-labels | `true` | When set, the Kubernetes labels of the services will be included as metadata of the returned ServiceInstance. -|spring.cloud.kubernetes.discovery.metadata.add-ports | `true` | When set, any named Kubernetes service ports will be included as metadata of the returned ServiceInstance. +|spring.cloud.kubernetes.discovery.metadata.add-annotations | `+++true+++` | When set, the Kubernetes annotations of the services will be included as metadata of the returned ServiceInstance. +|spring.cloud.kubernetes.discovery.metadata.add-labels | `+++true+++` | When set, the Kubernetes labels of the services will be included as metadata of the returned ServiceInstance. +|spring.cloud.kubernetes.discovery.metadata.add-ports | `+++true+++` | When set, any named Kubernetes service ports will be included as metadata of the returned ServiceInstance. |spring.cloud.kubernetes.discovery.metadata.annotations-prefix | | When addAnnotations is set, then this will be used as a prefix to the key names in the metadata map. |spring.cloud.kubernetes.discovery.metadata.labels-prefix | | When addLabels is set, then this will be used as a prefix to the key names in the metadata map. -|spring.cloud.kubernetes.discovery.metadata.ports-prefix | `port.` | When addPorts is set, then this will be used as a prefix to the key names in the metadata map. +|spring.cloud.kubernetes.discovery.metadata.ports-prefix | `+++port.+++` | When addPorts is set, then this will be used as a prefix to the key names in the metadata map. |spring.cloud.kubernetes.discovery.order | | |spring.cloud.kubernetes.discovery.primary-port-name | | If set then the port with a given name is used as primary when multiple ports are defined for a service. |spring.cloud.kubernetes.discovery.service-labels | | If set, then only the services matching these labels will be fetched from the Kubernetes API server. -|spring.cloud.kubernetes.discovery.wait-cache-ready | `true` | -|spring.cloud.kubernetes.enabled | `true` | Whether to enable Kubernetes integration. -|spring.cloud.kubernetes.leader.auto-startup | `true` | Should leader election be started automatically on startup. Default: true -|spring.cloud.kubernetes.leader.config-map-name | `leaders` | Kubernetes ConfigMap where leaders information will be stored. Default: leaders -|spring.cloud.kubernetes.leader.enabled | `true` | Should leader election be enabled. Default: true -|spring.cloud.kubernetes.leader.leader-id-prefix | `leader.id.` | Leader id property prefix for the ConfigMap. Default: leader.id. +|spring.cloud.kubernetes.discovery.wait-cache-ready | `+++true+++` | +|spring.cloud.kubernetes.enabled | `+++true+++` | Whether to enable Kubernetes integration. +|spring.cloud.kubernetes.leader.auto-startup | `+++true+++` | Should leader election be started automatically on startup. Default: true +|spring.cloud.kubernetes.leader.config-map-name | `+++leaders+++` | Kubernetes ConfigMap where leaders information will be stored. Default: leaders +|spring.cloud.kubernetes.leader.enabled | `+++true+++` | Should leader election be enabled. Default: true +|spring.cloud.kubernetes.leader.leader-id-prefix | `+++leader.id.+++` | Leader id property prefix for the ConfigMap. Default: leader.id. |spring.cloud.kubernetes.leader.namespace | | Kubernetes namespace where the leaders ConfigMap and candidates are located. -|spring.cloud.kubernetes.leader.publish-failed-events | `false` | Enable/disable publishing events in case leadership acquisition fails. Default: false +|spring.cloud.kubernetes.leader.publish-failed-events | `+++false+++` | Enable/disable publishing events in case leadership acquisition fails. Default: false |spring.cloud.kubernetes.leader.role | | Role for which leadership this candidate will compete. -|spring.cloud.kubernetes.leader.update-period | `60000ms` | Leadership status check period. Default: 60s -|spring.cloud.kubernetes.loadbalancer.cluster-domain | `cluster.local` | cluster domain. -|spring.cloud.kubernetes.loadbalancer.enabled | `true` | Load balancer enabled,default true. +|spring.cloud.kubernetes.leader.update-period | `+++60000ms+++` | Leadership status check period. Default: 60s +|spring.cloud.kubernetes.loadbalancer.cluster-domain | `+++cluster.local+++` | cluster domain. +|spring.cloud.kubernetes.loadbalancer.enabled | `+++true+++` | Load balancer enabled,default true. |spring.cloud.kubernetes.loadbalancer.mode | | {@link KubernetesLoadBalancerMode} setting load balancer server list with ip of pod or service name. default value is POD. -|spring.cloud.kubernetes.loadbalancer.port-name | `http` | service port name. -|spring.cloud.kubernetes.reload.enabled | `false` | Enables the Kubernetes configuration reload on change. -|spring.cloud.kubernetes.reload.max-wait-for-restart | `2s` | If Restart or Shutdown strategies are used, Spring Cloud Kubernetes waits a random amount of time before restarting. This is done in order to avoid having all instances of the same application restart at the same time. This property configures the maximum of amount of wait time from the moment the signal is received that a restart is needed until the moment the restart is actually triggered +|spring.cloud.kubernetes.loadbalancer.port-name | `+++http+++` | service port name. +|spring.cloud.kubernetes.reload.enabled | `+++false+++` | Enables the Kubernetes configuration reload on change. +|spring.cloud.kubernetes.reload.max-wait-for-restart | `+++2s+++` | If Restart or Shutdown strategies are used, Spring Cloud Kubernetes waits a random amount of time before restarting. This is done in order to avoid having all instances of the same application restart at the same time. This property configures the maximum of amount of wait time from the moment the signal is received that a restart is needed until the moment the restart is actually triggered |spring.cloud.kubernetes.reload.mode | | Sets the detection mode for Kubernetes configuration reload. -|spring.cloud.kubernetes.reload.monitoring-config-maps | `true` | Enables monitoring on config maps to detect changes. -|spring.cloud.kubernetes.reload.monitoring-secrets | `false` | Enables monitoring on secrets to detect changes. -|spring.cloud.kubernetes.reload.period | `15000ms` | Sets the polling period to use when the detection mode is POLLING. +|spring.cloud.kubernetes.reload.monitoring-config-maps | `+++true+++` | Enables monitoring on config maps to detect changes. +|spring.cloud.kubernetes.reload.monitoring-secrets | `+++false+++` | Enables monitoring on secrets to detect changes. +|spring.cloud.kubernetes.reload.period | `+++15000ms+++` | Sets the polling period to use when the detection mode is POLLING. |spring.cloud.kubernetes.reload.strategy | | Sets the reload strategy for Kubernetes configuration reload on change. -|spring.cloud.kubernetes.secrets.enable-api | `false` | -|spring.cloud.kubernetes.secrets.enabled | `true` | Enable the Secrets property source locator. -|spring.cloud.kubernetes.secrets.fail-fast | `false` | -|spring.cloud.kubernetes.secrets.include-profile-specific-sources | `true` | +|spring.cloud.kubernetes.secrets.enable-api | `+++false+++` | +|spring.cloud.kubernetes.secrets.enabled | `+++true+++` | Enable the Secrets property source locator. +|spring.cloud.kubernetes.secrets.fail-fast | `+++false+++` | +|spring.cloud.kubernetes.secrets.include-profile-specific-sources | `+++true+++` | |spring.cloud.kubernetes.secrets.labels | | |spring.cloud.kubernetes.secrets.name | | |spring.cloud.kubernetes.secrets.namespace | | |spring.cloud.kubernetes.secrets.paths | | |spring.cloud.kubernetes.secrets.retry | | |spring.cloud.kubernetes.secrets.sources | | -|spring.cloud.kubernetes.secrets.use-name-as-prefix | `false` | +|spring.cloud.kubernetes.secrets.use-name-as-prefix | `+++false+++` | |=== \ No newline at end of file From 74258a8bac24d740dce15fece882f7065268390b Mon Sep 17 00:00:00 2001 From: erabii Date: Tue, 5 Jul 2022 22:58:57 +0300 Subject: [PATCH 2/4] fix (#1040) --- ...ubernetesClientBootstrapConfiguration.java | 3 -- ...etesClientRetryBootstrapConfiguration.java | 3 -- ...etesClientBootstrapConfigurationTests.java | 47 ++----------------- ...MapIncludeProfileSpecificSourcesTests.java | 2 +- ...netesClientConfigMapNameAsPrefixTests.java | 3 +- ...figMapPropertySourceLocatorRetryTests.java | 11 ++--- ...ecretsPropertySourceLocatorRetryTests.java | 11 ++--- ...ientConfigReloadAutoConfigurationTest.java | 12 ++--- .../config/Fabric8BootstrapConfiguration.java | 3 -- .../Fabric8RetryBootstrapConfiguration.java | 3 -- ...ithIncludeProfileSpecificSourcesTests.java | 3 +- .../config/ConfigMapWithPrefixTests.java | 3 +- .../config/ConfigMapsFromFilePathsTests.java | 3 +- .../fabric8/config/ConfigMapsMixedTests.java | 3 +- .../fabric8/config/ConfigMapsTests.java | 3 +- ...ConfigMapsWithActiveProfilesNameTests.java | 2 +- .../ConfigMapsWithProfileExpressionTests.java | 2 +- ...gMapsWithProfilesNoActiveProfileTests.java | 2 +- .../config/ConfigMapsWithProfilesTests.java | 2 +- .../ConfigMapsWithoutProfilesTests.java | 2 +- .../kubernetes/fabric8/config/CoreTest.java | 2 +- .../Fabric8BootstrapConfigurationTests.java | 44 ++--------------- ...figMapPropertySourceLocatorRetryTests.java | 11 ++--- ...ecretsPropertySourceLocatorRetryTests.java | 11 ++--- .../Fabric8SecretsPropertySourceTest.java | 3 +- .../KubernetesConfigConfigurationTest.java | 11 ++--- .../config/MultipleConfigMapsTests.java | 2 +- .../fabric8/config/MultipleSecretsTests.java | 2 +- .../ConfigReloadAutoConfigurationTest.java | 4 +- .../SecretsWithLabelsTests.java | 3 +- 30 files changed, 57 insertions(+), 159 deletions(-) diff --git a/spring-cloud-kubernetes-client-config/src/main/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientBootstrapConfiguration.java b/spring-cloud-kubernetes-client-config/src/main/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientBootstrapConfiguration.java index 93018d0d..d5b00a07 100644 --- a/spring-cloud-kubernetes-client-config/src/main/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientBootstrapConfiguration.java +++ b/spring-cloud-kubernetes-client-config/src/main/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientBootstrapConfiguration.java @@ -19,8 +19,6 @@ package org.springframework.cloud.kubernetes.client.config; import io.kubernetes.client.openapi.apis.CoreV1Api; import org.springframework.boot.autoconfigure.AutoConfigureAfter; -import org.springframework.boot.autoconfigure.condition.ConditionalOnCloudPlatform; -import org.springframework.boot.cloud.CloudPlatform; import org.springframework.cloud.kubernetes.client.KubernetesClientAutoConfiguration; import org.springframework.cloud.kubernetes.commons.ConditionalOnKubernetesConfigEnabled; import org.springframework.cloud.kubernetes.commons.ConditionalOnKubernetesEnabled; @@ -43,7 +41,6 @@ import org.springframework.context.annotation.Import; @ConditionalOnKubernetesEnabled @AutoConfigureAfter(KubernetesBootstrapConfiguration.class) @Import({ KubernetesCommonsAutoConfiguration.class, KubernetesClientAutoConfiguration.class }) -@ConditionalOnCloudPlatform(CloudPlatform.KUBERNETES) public class KubernetesClientBootstrapConfiguration { @Bean diff --git a/spring-cloud-kubernetes-client-config/src/main/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientRetryBootstrapConfiguration.java b/spring-cloud-kubernetes-client-config/src/main/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientRetryBootstrapConfiguration.java index 0dff4e67..6e038735 100644 --- a/spring-cloud-kubernetes-client-config/src/main/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientRetryBootstrapConfiguration.java +++ b/spring-cloud-kubernetes-client-config/src/main/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientRetryBootstrapConfiguration.java @@ -20,8 +20,6 @@ import io.kubernetes.client.openapi.apis.CoreV1Api; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.AutoConfigureBefore; -import org.springframework.boot.autoconfigure.condition.ConditionalOnCloudPlatform; -import org.springframework.boot.cloud.CloudPlatform; import org.springframework.cloud.kubernetes.client.KubernetesClientAutoConfiguration; import org.springframework.cloud.kubernetes.commons.ConditionalOnKubernetesEnabled; import org.springframework.cloud.kubernetes.commons.KubernetesCommonsAutoConfiguration; @@ -44,7 +42,6 @@ import org.springframework.context.annotation.Import; @AutoConfigureAfter(KubernetesBootstrapConfiguration.class) @AutoConfigureBefore(KubernetesClientBootstrapConfiguration.class) @Import({ KubernetesCommonsAutoConfiguration.class, KubernetesClientAutoConfiguration.class }) -@ConditionalOnCloudPlatform(CloudPlatform.KUBERNETES) @ConditionalOnKubernetesConfigOrSecretsRetryEnabled public class KubernetesClientRetryBootstrapConfiguration { diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientBootstrapConfigurationTests.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientBootstrapConfigurationTests.java index 5d7b0810..8b037658 100644 --- a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientBootstrapConfigurationTests.java +++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientBootstrapConfigurationTests.java @@ -55,7 +55,7 @@ public class KubernetesClientBootstrapConfigurationTests { @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = Application.class, properties = { "spring.cloud.kubernetes.secrets.enabled=true", - "spring.cloud.kubernetes.client.namespace=default", "spring.main.cloud-platform=KUBERNETES" }) + "spring.cloud.kubernetes.client.namespace=default" }) @Nested class KubernetesEnabledOnPurpose { @@ -71,8 +71,7 @@ public class KubernetesClientBootstrapConfigurationTests { } @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = Application.class, - properties = { "spring.cloud.kubernetes.client.namespace=default", - "spring.main.cloud-platform=KUBERNETES" }) + properties = { "spring.cloud.kubernetes.client.namespace=default" }) @Nested class KubernetesEnabled { @@ -88,7 +87,7 @@ public class KubernetesClientBootstrapConfigurationTests { } @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = Application.class, - properties = { "spring.cloud.kubernetes.config.enabled=false", "spring.main.cloud-platform=KUBERNETES" }) + properties = { "spring.cloud.kubernetes.config.enabled=false" }) @Nested class KubernetesEnabledConfigDisabled { @@ -105,7 +104,7 @@ public class KubernetesClientBootstrapConfigurationTests { @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = Application.class, properties = { "spring.cloud.kubernetes.secrets.enabled=false", - "spring.cloud.kubernetes.client.namespace=default", "spring.main.cloud-platform=KUBERNETES" }) + "spring.cloud.kubernetes.client.namespace=default" }) @Nested class KubernetesEnabledSecretsDisabled { @@ -122,7 +121,7 @@ public class KubernetesClientBootstrapConfigurationTests { @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = Application.class, properties = { "spring.cloud.kubernetes.secrets.enabled=false", - "spring.cloud.kubernetes.config.enabled=false", "spring.main.cloud-platform=KUBERNETES" }) + "spring.cloud.kubernetes.config.enabled=false" }) @Nested class KubernetesEnabledSecretsAndConfigDisabled { @@ -137,40 +136,4 @@ public class KubernetesClientBootstrapConfigurationTests { } - // tests that @ConditionalOnCloudPlatform(CloudPlatform.KUBERNETES) has the desired - // effect, meaning when it is enabled, both property sources are present - @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = Application.class, - properties = { "spring.main.cloud-platform=KUBERNETES", "spring.cloud.kubernetes.client.namespace=abc" }) - @Nested - class KubernetesClientBootstrapConfigurationInsideK8s { - - @Autowired - ConfigurableApplicationContext context; - - @Test - public void bothPresent() { - assertThat(context.getBeanNamesForType(KubernetesClientConfigMapPropertySourceLocator.class)).hasSize(1); - assertThat(context.getBeanNamesForType(KubernetesClientSecretsPropertySourceLocator.class)).hasSize(1); - } - - } - - // tests that @ConditionalOnCloudPlatform(CloudPlatform.KUBERNETES) has the desired - // effect, meaning when it is disabled, no property source bean is present - @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = Application.class, - properties = { "kubernetes.informer.enabled=false" }) - @Nested - class KubernetesClientBootstrapConfigurationNotInsideK8s { - - @Autowired - ConfigurableApplicationContext context; - - @Test - public void bothMissing() { - assertThat(context.getBeanNamesForType(KubernetesClientConfigMapPropertySourceLocator.class)).hasSize(0); - assertThat(context.getBeanNamesForType(KubernetesClientSecretsPropertySourceLocator.class)).hasSize(0); - } - - } - } diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigMapIncludeProfileSpecificSourcesTests.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigMapIncludeProfileSpecificSourcesTests.java index a1fb50f1..12c1d26d 100644 --- a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigMapIncludeProfileSpecificSourcesTests.java +++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigMapIncludeProfileSpecificSourcesTests.java @@ -40,7 +40,7 @@ import org.springframework.test.web.reactive.server.WebTestClient; @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = IncludeProfileSpecificSourcesApp.class, properties = { "spring.cloud.bootstrap.name=include-profile-specific-sources", - "include.profile.specific.sources=true", "spring.main.cloud-platform=KUBERNETES" }) + "include.profile.specific.sources=true" }) @AutoConfigureWebTestClient @ActiveProfiles("dev") class KubernetesClientConfigMapIncludeProfileSpecificSourcesTests { diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigMapNameAsPrefixTests.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigMapNameAsPrefixTests.java index 77ffd97f..8ad5656e 100644 --- a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigMapNameAsPrefixTests.java +++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigMapNameAsPrefixTests.java @@ -37,8 +37,7 @@ import org.springframework.test.web.reactive.server.WebTestClient; */ @ExtendWith(SpringExtension.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = WithPrefixApp.class, - properties = { "spring.cloud.bootstrap.name=config-map-name-as-prefix", "config.map.name.as.prefix.stub=true", - "spring.main.cloud-platform=KUBERNETES" }) + properties = { "spring.cloud.bootstrap.name=config-map-name-as-prefix", "config.map.name.as.prefix.stub=true" }) @AutoConfigureWebTestClient public class KubernetesClientConfigMapNameAsPrefixTests { diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigMapPropertySourceLocatorRetryTests.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigMapPropertySourceLocatorRetryTests.java index 4a792317..75eef237 100644 --- a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigMapPropertySourceLocatorRetryTests.java +++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigMapPropertySourceLocatorRetryTests.java @@ -120,7 +120,7 @@ public class KubernetesClientConfigMapPropertySourceLocatorRetryTests { @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE, properties = { "spring.cloud.kubernetes.client.namespace=default", "spring.cloud.kubernetes.config.fail-fast=true", - "spring.cloud.kubernetes.config.retry.max-attempts=5", "spring.main.cloud-platform=KUBERNETES" }, + "spring.cloud.kubernetes.config.retry.max-attempts=5" }, classes = App.class) class ConfigRetryEnabled { @@ -202,7 +202,7 @@ public class KubernetesClientConfigMapPropertySourceLocatorRetryTests { @Nested @SpringBootTest( webEnvironment = SpringBootTest.WebEnvironment.NONE, properties = { - "spring.cloud.kubernetes.client.namespace=default", "spring.main.cloud-platform=KUBERNETES" }, + "spring.cloud.kubernetes.client.namespace=default" }, classes = App.class) class ConfigFailFastDisabled { @@ -227,7 +227,7 @@ public class KubernetesClientConfigMapPropertySourceLocatorRetryTests { properties = { "spring.cloud.kubernetes.client.namespace=default", "spring.cloud.kubernetes.config.fail-fast=true", "spring.cloud.kubernetes.config.retry.enabled=false", - "spring.cloud.kubernetes.secrets.fail-fast=true", "spring.main.cloud-platform=KUBERNETES" }, + "spring.cloud.kubernetes.secrets.fail-fast=true" }, classes = App.class) class ConfigRetryDisabledButSecretsRetryEnabled { @@ -264,7 +264,7 @@ public class KubernetesClientConfigMapPropertySourceLocatorRetryTests { @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE, properties = { "spring.cloud.kubernetes.client.namespace=default", "spring.cloud.kubernetes.config.fail-fast=true", - "spring.cloud.kubernetes.config.retry.enabled=false", "spring.main.cloud-platform=KUBERNETES" }, + "spring.cloud.kubernetes.config.retry.enabled=false" }, classes = App.class) class ConfigFailFastEnabledButRetryDisabled { @@ -321,8 +321,7 @@ public class KubernetesClientConfigMapPropertySourceLocatorRetryTests { @Test public void doesNotContainRetryableConfigMapPropertySourceLocator() throws Exception { stubFor(get(API).willReturn(aResponse().withStatus(500).withBody("Internal Server Error"))); - setup("debug=true", "spring.main.cloud-platform=KUBERNETES", - "spring.cloud.kubernetes.test.enable-retry=true"); + setup("debug=true", "spring.cloud.kubernetes.test.enable-retry=true"); assertThat(context.containsBean("retryableConfigMapPropertySourceLocator")).isFalse(); } diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientSecretsPropertySourceLocatorRetryTests.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientSecretsPropertySourceLocatorRetryTests.java index 02629b96..bcd355e0 100644 --- a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientSecretsPropertySourceLocatorRetryTests.java +++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientSecretsPropertySourceLocatorRetryTests.java @@ -120,7 +120,7 @@ public class KubernetesClientSecretsPropertySourceLocatorRetryTests { @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE, properties = { "spring.cloud.kubernetes.client.namespace=default", "spring.cloud.kubernetes.secrets.fail-fast=true", "spring.cloud.kubernetes.secrets.retry.max-attempts=5", "spring.cloud.kubernetes.secrets.name=my-secret", - "spring.cloud.kubernetes.secrets.enable-api=true", "spring.main.cloud-platform=KUBERNETES" }, + "spring.cloud.kubernetes.secrets.enable-api=true" }, classes = App.class) class SecretsRetryEnabled { @@ -202,8 +202,7 @@ public class KubernetesClientSecretsPropertySourceLocatorRetryTests { @Nested @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE, properties = { "spring.cloud.kubernetes.client.namespace=default", - "spring.cloud.kubernetes.secrets.name=my-secret", "spring.cloud.kubernetes.secrets.enable-api=true", - "spring.main.cloud-platform=KUBERNETES" }, + "spring.cloud.kubernetes.secrets.name=my-secret", "spring.cloud.kubernetes.secrets.enable-api=true" }, classes = App.class) class SecretsFailFastDisabled { @@ -229,7 +228,7 @@ public class KubernetesClientSecretsPropertySourceLocatorRetryTests { "spring.cloud.kubernetes.secrets.fail-fast=true", "spring.cloud.kubernetes.secrets.retry.enabled=false", "spring.cloud.kubernetes.config.fail-fast=true", "spring.cloud.kubernetes.secrets.name=my-secret", - "spring.cloud.kubernetes.secrets.enable-api=true", "spring.main.cloud-platform=KUBERNETES" }, + "spring.cloud.kubernetes.secrets.enable-api=true" }, classes = App.class) class SecretsRetryDisabledButConfigRetryEnabled { @@ -266,7 +265,7 @@ public class KubernetesClientSecretsPropertySourceLocatorRetryTests { @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE, properties = { "spring.cloud.kubernetes.client.namespace=default", "spring.cloud.kubernetes.secrets.fail-fast=true", "spring.cloud.kubernetes.secrets.retry.enabled=false", "spring.cloud.kubernetes.secrets.name=my-secret", - "spring.cloud.kubernetes.secrets.enable-api=true", "spring.main.cloud-platform=KUBERNETES" }, + "spring.cloud.kubernetes.secrets.enable-api=true" }, classes = App.class) class SecretsFailFastEnabledButRetryDisabled { @@ -323,7 +322,7 @@ public class KubernetesClientSecretsPropertySourceLocatorRetryTests { @Test public void doesNotContainRetryableSecretsPropertySourceLocator() throws Exception { stubFor(get(API).willReturn(aResponse().withStatus(500).withBody("Internal Server Error"))); - setup("debug=true", "spring.main.cloud-platform=KUBERNETES", + setup("debug=true", "spring.cloud.kubernetes.test.enable-retry=true", "spring.cloud.kubernetes.secrets.name=my-secret", "spring.cloud.kubernetes.secrets.enable-api=true"); assertThat(context.containsBean("retryableSecretsPropertySourceLocator")).isFalse(); diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload/KubernetesClientConfigReloadAutoConfigurationTest.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload/KubernetesClientConfigReloadAutoConfigurationTest.java index 3bf99275..eda9d236 100644 --- a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload/KubernetesClientConfigReloadAutoConfigurationTest.java +++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload/KubernetesClientConfigReloadAutoConfigurationTest.java @@ -152,8 +152,7 @@ public class KubernetesClientConfigReloadAutoConfigurationTest { @Test public void kubernetesReloadEnabledWithPolling() throws Exception { - setup("spring.cloud.kubernetes.reload.enabled=true", "spring.cloud.kubernetes.reload.mode=polling", - "spring.main.cloud-platform=KUBERNETES"); + setup("spring.cloud.kubernetes.reload.enabled=true", "spring.cloud.kubernetes.reload.mode=polling"); assertThat(context.containsBean("configMapPropertySourceLocator")).isTrue(); assertThat(context.containsBean("secretsPropertySourceLocator")).isTrue(); assertThat(context.containsBean("configMapPropertyChangePollingWatcher")).isTrue(); @@ -164,8 +163,7 @@ public class KubernetesClientConfigReloadAutoConfigurationTest { @Test public void kubernetesReloadEnabledWithEvent() throws Exception { - setup("spring.cloud.kubernetes.reload.enabled=true", "spring.cloud.kubernetes.reload.mode=event", - "spring.main.cloud-platform=KUBERNETES"); + setup("spring.cloud.kubernetes.reload.enabled=true", "spring.cloud.kubernetes.reload.mode=event"); assertThat(context.containsBean("configMapPropertyChangePollingWatcher")).isFalse(); assertThat(context.containsBean("secretsPropertyChangePollingWatcher")).isFalse(); assertThat(context.containsBean("configMapPropertyChangeEventWatcher")).isTrue(); @@ -176,21 +174,21 @@ public class KubernetesClientConfigReloadAutoConfigurationTest { @Test public void kubernetesConfigAndSecretEnabledByDefault() throws Exception { - setup("spring.main.cloud-platform=KUBERNETES"); + setup(); assertThat(context.containsBean("configMapPropertySourceLocator")).isTrue(); assertThat(context.containsBean("secretsPropertySourceLocator")).isTrue(); } @Test public void kubernetesConfigEnabledButSecretDisabled() throws Exception { - setup("spring.cloud.kubernetes.secrets.enabled=false", "spring.main.cloud-platform=KUBERNETES"); + setup("spring.cloud.kubernetes.secrets.enabled=false"); assertThat(context.containsBean("configMapPropertySourceLocator")).isTrue(); assertThat(context.containsBean("secretsPropertySourceLocator")).isFalse(); } @Test public void kubernetesSecretsEnabledButConfigDisabled() throws Exception { - setup("spring.cloud.kubernetes.config.enabled=false", "spring.main.cloud-platform=KUBERNETES"); + setup("spring.cloud.kubernetes.config.enabled=false"); assertThat(context.containsBean("configMapPropertySourceLocator")).isFalse(); assertThat(context.containsBean("secretsPropertySourceLocator")).isTrue(); } diff --git a/spring-cloud-kubernetes-fabric8-config/src/main/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8BootstrapConfiguration.java b/spring-cloud-kubernetes-fabric8-config/src/main/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8BootstrapConfiguration.java index b10b5797..d457036c 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/main/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8BootstrapConfiguration.java +++ b/spring-cloud-kubernetes-fabric8-config/src/main/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8BootstrapConfiguration.java @@ -22,8 +22,6 @@ import io.fabric8.kubernetes.client.KubernetesClient; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; -import org.springframework.boot.autoconfigure.condition.ConditionalOnCloudPlatform; -import org.springframework.boot.cloud.CloudPlatform; import org.springframework.cloud.kubernetes.commons.ConditionalOnKubernetesConfigEnabled; import org.springframework.cloud.kubernetes.commons.ConditionalOnKubernetesEnabled; import org.springframework.cloud.kubernetes.commons.ConditionalOnKubernetesSecretsEnabled; @@ -50,7 +48,6 @@ import org.springframework.core.env.Environment; @Import({ KubernetesCommonsAutoConfiguration.class, Fabric8AutoConfiguration.class }) @ConditionalOnClass({ ConfigMap.class, Secret.class }) @AutoConfigureAfter(KubernetesBootstrapConfiguration.class) -@ConditionalOnCloudPlatform(CloudPlatform.KUBERNETES) public class Fabric8BootstrapConfiguration { @Bean diff --git a/spring-cloud-kubernetes-fabric8-config/src/main/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8RetryBootstrapConfiguration.java b/spring-cloud-kubernetes-fabric8-config/src/main/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8RetryBootstrapConfiguration.java index 5e2009d1..2e2dd376 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/main/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8RetryBootstrapConfiguration.java +++ b/spring-cloud-kubernetes-fabric8-config/src/main/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8RetryBootstrapConfiguration.java @@ -23,8 +23,6 @@ import io.fabric8.kubernetes.client.KubernetesClient; 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.cloud.CloudPlatform; import org.springframework.cloud.kubernetes.commons.ConditionalOnKubernetesEnabled; import org.springframework.cloud.kubernetes.commons.KubernetesCommonsAutoConfiguration; import org.springframework.cloud.kubernetes.commons.KubernetesNamespaceProvider; @@ -48,7 +46,6 @@ import org.springframework.context.annotation.Import; @Import({ KubernetesCommonsAutoConfiguration.class, Fabric8AutoConfiguration.class }) @ConditionalOnClass({ ConfigMap.class, Secret.class }) @AutoConfigureAfter(KubernetesBootstrapConfiguration.class) -@ConditionalOnCloudPlatform(CloudPlatform.KUBERNETES) @ConditionalOnKubernetesConfigOrSecretsRetryEnabled public class Fabric8RetryBootstrapConfiguration { diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapWithIncludeProfileSpecificSourcesTests.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapWithIncludeProfileSpecificSourcesTests.java index 8a1b7aa6..a6b87fce 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapWithIncludeProfileSpecificSourcesTests.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapWithIncludeProfileSpecificSourcesTests.java @@ -42,8 +42,7 @@ import org.springframework.test.web.reactive.server.WebTestClient; @ExtendWith(SpringExtension.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = IncludeProfileSpecificSourcesApp.class, - properties = { "spring.cloud.bootstrap.name=include-profile-specific-sources", - "spring.main.cloud-platform=KUBERNETES" }) + properties = { "spring.cloud.bootstrap.name=include-profile-specific-sources" }) @AutoConfigureWebTestClient @EnableKubernetesMockClient(crud = true, https = false) @ActiveProfiles("dev") diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapWithPrefixTests.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapWithPrefixTests.java index 86d86987..2a360f5d 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapWithPrefixTests.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapWithPrefixTests.java @@ -40,8 +40,7 @@ import org.springframework.test.web.reactive.server.WebTestClient; */ @ExtendWith(SpringExtension.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = WithPrefixApp.class, - properties = { "spring.cloud.bootstrap.name=config-map-name-as-prefix", - "spring.main.cloud-platform=KUBERNETES" }) + properties = { "spring.cloud.bootstrap.name=config-map-name-as-prefix"}) @AutoConfigureWebTestClient @EnableKubernetesMockClient(crud = true, https = false) class ConfigMapWithPrefixTests { diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsFromFilePathsTests.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsFromFilePathsTests.java index afb245c3..ff9cb4e5 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsFromFilePathsTests.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsFromFilePathsTests.java @@ -42,8 +42,7 @@ import static org.assertj.core.util.Lists.newArrayList; "spring.cloud.kubernetes.config.enableApi=false", "spring.cloud.kubernetes.config.paths=" + ConfigMapsFromFilePathsTests.FIRST_FILE_NAME_FULL_PATH + "," + ConfigMapsFromFilePathsTests.SECOND_FILE_NAME_FULL_PATH + "," - + ConfigMapsFromFilePathsTests.FIRST_FILE_NAME_DUPLICATED_FULL_PATH, - "spring.main.cloud-platform=KUBERNETES" }) + + ConfigMapsFromFilePathsTests.FIRST_FILE_NAME_DUPLICATED_FULL_PATH }) @EnableKubernetesMockClient(crud = true, https = false) public class ConfigMapsFromFilePathsTests { diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsMixedTests.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsMixedTests.java index 11ec267d..32532029 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsMixedTests.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsMixedTests.java @@ -43,8 +43,7 @@ import static org.assertj.core.util.Lists.newArrayList; @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = App.class, properties = { "spring.application.name=" + ConfigMapsMixedTests.APPLICATION_NAME, "spring.cloud.kubernetes.config.enableApi=true", - "spring.cloud.kubernetes.config.paths=" + ConfigMapsMixedTests.FILE_NAME_FULL_PATH, - "spring.main.cloud-platform=KUBERNETES" }) + "spring.cloud.kubernetes.config.paths=" + ConfigMapsMixedTests.FILE_NAME_FULL_PATH }) @EnableKubernetesMockClient(crud = true, https = false) public class ConfigMapsMixedTests { diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsTests.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsTests.java index e40ad1a0..3863d689 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsTests.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsTests.java @@ -41,8 +41,7 @@ import static org.assertj.core.api.Assertions.assertThat; */ @ExtendWith(SpringExtension.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = App.class, - properties = { "spring.application.name=configmap-example", "spring.cloud.kubernetes.reload.enabled=false", - "spring.main.cloud-platform=KUBERNETES" }) + properties = { "spring.application.name=configmap-example", "spring.cloud.kubernetes.reload.enabled=false"}) @AutoConfigureWebTestClient @EnableKubernetesMockClient(crud = true, https = false) public class ConfigMapsTests { diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsWithActiveProfilesNameTests.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsWithActiveProfilesNameTests.java index b5b1716f..785def06 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsWithActiveProfilesNameTests.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsWithActiveProfilesNameTests.java @@ -43,7 +43,7 @@ import static org.springframework.cloud.kubernetes.fabric8.config.ConfigMapTestU @ExtendWith(SpringExtension.class) @SpringBootTest(webEnvironment = RANDOM_PORT, classes = App.class, properties = { "spring.application.name=configmap-with-active-profile-name-example", - "spring.cloud.kubernetes.reload.enabled=false", "spring.main.cloud-platform=KUBERNETES" }) + "spring.cloud.kubernetes.reload.enabled=false" }) @ActiveProfiles("development") @AutoConfigureWebTestClient @EnableKubernetesMockClient(crud = true, https = false) diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsWithProfileExpressionTests.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsWithProfileExpressionTests.java index 46d7c525..5d790e7b 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsWithProfileExpressionTests.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsWithProfileExpressionTests.java @@ -41,7 +41,7 @@ import org.springframework.test.web.reactive.server.WebTestClient; @ExtendWith(SpringExtension.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = App.class, properties = { "spring.application.name=configmap-with-profile-example", - "spring.cloud.kubernetes.reload.enabled=false", "spring.main.cloud-platform=KUBERNETES" }) + "spring.cloud.kubernetes.reload.enabled=false" }) @ActiveProfiles({ "production", "us-east" }) @AutoConfigureWebTestClient @EnableKubernetesMockClient(crud = true, https = false) diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsWithProfilesNoActiveProfileTests.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsWithProfilesNoActiveProfileTests.java index e81a6fa0..9cd411b1 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsWithProfilesNoActiveProfileTests.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsWithProfilesNoActiveProfileTests.java @@ -41,7 +41,7 @@ import static org.springframework.cloud.kubernetes.fabric8.config.ConfigMapTestU @ExtendWith(SpringExtension.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = App.class, properties = { "spring.application.name=configmap-with-profile-no-active-profiles-example", - "spring.cloud.kubernetes.reload.enabled=false", "spring.main.cloud-platform=KUBERNETES" }) + "spring.cloud.kubernetes.reload.enabled=false" }) @AutoConfigureWebTestClient @EnableKubernetesMockClient(crud = true, https = false) public class ConfigMapsWithProfilesNoActiveProfileTests { diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsWithProfilesTests.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsWithProfilesTests.java index 0ac709d3..e2efaa4f 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsWithProfilesTests.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsWithProfilesTests.java @@ -40,7 +40,7 @@ import org.springframework.test.web.reactive.server.WebTestClient; @ExtendWith(SpringExtension.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = App.class, properties = { "spring.application.name=configmap-with-profile-example", - "spring.cloud.kubernetes.reload.enabled=false", "spring.main.cloud-platform=KUBERNETES" }) + "spring.cloud.kubernetes.reload.enabled=false" }) @ActiveProfiles("development") @AutoConfigureWebTestClient @EnableKubernetesMockClient(crud = true, https = false) diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsWithoutProfilesTests.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsWithoutProfilesTests.java index 3c26bb93..433ef83c 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsWithoutProfilesTests.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsWithoutProfilesTests.java @@ -37,7 +37,7 @@ import org.springframework.test.web.reactive.server.WebTestClient; @ExtendWith(SpringExtension.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = App.class, properties = { "spring.application.name=configmap-without-profile-example", - "spring.cloud.kubernetes.reload.enabled=false", "spring.main.cloud-platform=KUBERNETES" }) + "spring.cloud.kubernetes.reload.enabled=false" }) @ActiveProfiles("development") @AutoConfigureWebTestClient @EnableKubernetesMockClient(crud = true, https = false) diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/CoreTest.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/CoreTest.java index 677c4bc4..9cb9e824 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/CoreTest.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/CoreTest.java @@ -39,7 +39,7 @@ import static org.assertj.core.api.Assertions.assertThat; @SpringBootTest(classes = TestApplication.class, properties = { "spring.application.name=testapp", "spring.cloud.kubernetes.client.namespace=testns", "spring.cloud.kubernetes.client.trustCerts=true", "spring.cloud.kubernetes.config.namespace=testns", - "spring.cloud.kubernetes.secrets.enableApi=true", "spring.main.cloud-platform=KUBERNETES" }) + "spring.cloud.kubernetes.secrets.enableApi=true" }) @EnableKubernetesMockClient(crud = true, https = false) public class CoreTest { diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8BootstrapConfigurationTests.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8BootstrapConfigurationTests.java index 4a29a325..6d87403c 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8BootstrapConfigurationTests.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8BootstrapConfigurationTests.java @@ -48,7 +48,7 @@ public class Fabric8BootstrapConfigurationTests { @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = Application.class, properties = { "spring.cloud.kubernetes.secrets.enabled=true", - "spring.cloud.kubernetes.client.namespace=default", "spring.main.cloud-platform=KUBERNETES" }) + "spring.cloud.kubernetes.client.namespace=default" }) @Nested class KubernetesEnabledOnPurpose { @@ -64,8 +64,7 @@ public class Fabric8BootstrapConfigurationTests { } @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = Application.class, - properties = { "spring.cloud.kubernetes.client.namespace=default", - "spring.main.cloud-platform=KUBERNETES" }) + properties = { "spring.cloud.kubernetes.client.namespace=default" }) @Nested class KubernetesEnabled { @@ -81,7 +80,7 @@ public class Fabric8BootstrapConfigurationTests { } @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = Application.class, - properties = { "spring.cloud.kubernetes.config.enabled=false", "spring.main.cloud-platform=KUBERNETES" }) + properties = { "spring.cloud.kubernetes.config.enabled=false" }) @Nested class KubernetesEnabledConfigDisabled { @@ -98,7 +97,7 @@ public class Fabric8BootstrapConfigurationTests { @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = Application.class, properties = { "spring.cloud.kubernetes.secrets.enabled=false", - "spring.cloud.kubernetes.client.namespace=default", "spring.main.cloud-platform=KUBERNETES" }) + "spring.cloud.kubernetes.client.namespace=default" }) @Nested class KubernetesEnabledSecretsDisabled { @@ -130,39 +129,4 @@ public class Fabric8BootstrapConfigurationTests { } - // tests that @ConditionalOnCloudPlatform(CloudPlatform.KUBERNETES) has the desired - // effect, meaning when it is enabled, both property sources are present - @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = Application.class, - properties = { "spring.main.cloud-platform=KUBERNETES", "spring.cloud.kubernetes.client.namespace=abc" }) - @Nested - class Fabric8BootstrapConfigurationInsideK8s { - - @Autowired - ConfigurableApplicationContext context; - - @Test - public void bothPresent() { - assertThat(context.getBeanNamesForType(Fabric8ConfigMapPropertySourceLocator.class)).hasSize(1); - assertThat(context.getBeanNamesForType(Fabric8SecretsPropertySourceLocator.class)).hasSize(1); - } - - } - - // tests that @ConditionalOnCloudPlatform(CloudPlatform.KUBERNETES) has the desired - // effect, meaning when it is disabled, no property source bean is present - @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = Application.class) - @Nested - class Fabric8BootstrapConfigurationNotInsideK8s { - - @Autowired - ConfigurableApplicationContext context; - - @Test - public void bothMissing() { - assertThat(context.getBeanNamesForType(Fabric8ConfigMapPropertySourceLocator.class)).hasSize(0); - assertThat(context.getBeanNamesForType(Fabric8SecretsPropertySourceLocator.class)).hasSize(0); - } - - } - } diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8ConfigMapPropertySourceLocatorRetryTests.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8ConfigMapPropertySourceLocatorRetryTests.java index 1a650274..d009d4b6 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8ConfigMapPropertySourceLocatorRetryTests.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8ConfigMapPropertySourceLocatorRetryTests.java @@ -84,7 +84,7 @@ public class Fabric8ConfigMapPropertySourceLocatorRetryTests { @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE, properties = { "spring.cloud.kubernetes.client.namespace=default", "spring.cloud.kubernetes.config.fail-fast=true", - "spring.cloud.kubernetes.config.retry.max-attempts=5", "spring.main.cloud-platform=KUBERNETES" }, + "spring.cloud.kubernetes.config.retry.max-attempts=5" }, classes = Application.class) @EnableKubernetesMockClient class ConfigRetryEnabled { @@ -153,7 +153,7 @@ public class Fabric8ConfigMapPropertySourceLocatorRetryTests { @Nested @SpringBootTest( webEnvironment = SpringBootTest.WebEnvironment.NONE, properties = { - "spring.cloud.kubernetes.client.namespace=default", "spring.main.cloud-platform=KUBERNETES" }, + "spring.cloud.kubernetes.client.namespace=default" }, classes = Application.class) @EnableKubernetesMockClient class ConfigFailFastDisabled { @@ -178,7 +178,7 @@ public class Fabric8ConfigMapPropertySourceLocatorRetryTests { properties = { "spring.cloud.kubernetes.client.namespace=default", "spring.cloud.kubernetes.config.fail-fast=true", "spring.cloud.kubernetes.config.retry.enabled=false", - "spring.cloud.kubernetes.secrets.fail-fast=true", "spring.main.cloud-platform=KUBERNETES" }, + "spring.cloud.kubernetes.secrets.fail-fast=true" }, classes = Application.class) @EnableKubernetesMockClient class ConfigRetryDisabledButSecretsRetryEnabled { @@ -216,7 +216,7 @@ public class Fabric8ConfigMapPropertySourceLocatorRetryTests { @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE, properties = { "spring.cloud.kubernetes.client.namespace=default", "spring.cloud.kubernetes.config.fail-fast=true", - "spring.cloud.kubernetes.config.retry.enabled=false", "spring.main.cloud-platform=KUBERNETES" }, + "spring.cloud.kubernetes.config.retry.enabled=false" }, classes = Application.class) @EnableKubernetesMockClient class ConfigFailFastEnabledButRetryDisabled { @@ -274,8 +274,7 @@ public class Fabric8ConfigMapPropertySourceLocatorRetryTests { @Test public void doesNotContainRetryableConfigMapPropertySourceLocator() throws Exception { mockServer.expect().withPath(API).andReturn(500, "Internal Server Error").once(); - setup("debug=true", "spring.main.cloud-platform=KUBERNETES", - "spring.cloud.kubernetes.test.enable-retry=true"); + setup("debug=true", "spring.cloud.kubernetes.test.enable-retry=true"); assertThat(context.containsBean("retryableConfigMapPropertySourceLocator")).isFalse(); } diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8SecretsPropertySourceLocatorRetryTests.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8SecretsPropertySourceLocatorRetryTests.java index b840da4f..abe707bc 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8SecretsPropertySourceLocatorRetryTests.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8SecretsPropertySourceLocatorRetryTests.java @@ -91,7 +91,7 @@ public class Fabric8SecretsPropertySourceLocatorRetryTests { @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE, properties = { "spring.cloud.kubernetes.client.namespace=default", "spring.cloud.kubernetes.secrets.fail-fast=true", "spring.cloud.kubernetes.secrets.retry.max-attempts=5", "spring.cloud.kubernetes.secrets.name=my-secret", - "spring.cloud.kubernetes.secrets.enable-api=true", "spring.main.cloud-platform=KUBERNETES" }, + "spring.cloud.kubernetes.secrets.enable-api=true" }, classes = Application.class) @EnableKubernetesMockClient class SecretsRetryEnabled { @@ -162,8 +162,7 @@ public class Fabric8SecretsPropertySourceLocatorRetryTests { @Nested @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE, properties = { "spring.cloud.kubernetes.client.namespace=default", - "spring.cloud.kubernetes.secrets.name=my-secret", "spring.cloud.kubernetes.secrets.enable-api=true", - "spring.main.cloud-platform=KUBERNETES" }, + "spring.cloud.kubernetes.secrets.name=my-secret", "spring.cloud.kubernetes.secrets.enable-api=true" }, classes = Application.class) @EnableKubernetesMockClient class SecretsFailFastDisabled { @@ -189,7 +188,7 @@ public class Fabric8SecretsPropertySourceLocatorRetryTests { "spring.cloud.kubernetes.secrets.fail-fast=true", "spring.cloud.kubernetes.secrets.retry.enabled=false", "spring.cloud.kubernetes.config.fail-fast=true", "spring.cloud.kubernetes.secrets.name=my-secret", - "spring.cloud.kubernetes.secrets.enable-api=true", "spring.main.cloud-platform=KUBERNETES" }, + "spring.cloud.kubernetes.secrets.enable-api=true" }, classes = Application.class) @EnableKubernetesMockClient class SecretsRetryDisabledButConfigRetryEnabled { @@ -227,7 +226,7 @@ public class Fabric8SecretsPropertySourceLocatorRetryTests { @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE, properties = { "spring.cloud.kubernetes.client.namespace=default", "spring.cloud.kubernetes.secrets.fail-fast=true", "spring.cloud.kubernetes.secrets.retry.enabled=false", "spring.cloud.kubernetes.secrets.name=my-secret", - "spring.cloud.kubernetes.secrets.enable-api=true", "spring.main.cloud-platform=KUBERNETES" }, + "spring.cloud.kubernetes.secrets.enable-api=true" }, classes = Application.class) @EnableKubernetesMockClient class SecretsFailFastEnabledButRetryDisabled { @@ -285,7 +284,7 @@ public class Fabric8SecretsPropertySourceLocatorRetryTests { @Test public void doesNotContainRetryableSecretsPropertySourceLocator() throws Exception { mockServer.expect().withPath(API).andReturn(500, "Internal Server Error").once(); - setup("debug=true", "spring.main.cloud-platform=KUBERNETES", + setup("debug=true", "spring.cloud.kubernetes.test.enable-retry=true", "spring.cloud.kubernetes.secrets.name=my-secret", "spring.cloud.kubernetes.secrets.enable-api=true"); assertThat(context.containsBean("retryableSecretsPropertySourceLocator")).isFalse(); diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8SecretsPropertySourceTest.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8SecretsPropertySourceTest.java index d6816bc5..4f53bcba 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8SecretsPropertySourceTest.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8SecretsPropertySourceTest.java @@ -39,8 +39,7 @@ import static java.util.Collections.singletonMap; import static org.assertj.core.api.Assertions.assertThat; @ExtendWith(SpringExtension.class) -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = App.class, - properties = "spring.main.cloud-platform=KUBERNETES") +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = App.class) @TestPropertySource("classpath:/application-secrets.properties") @EnableKubernetesMockClient(crud = true, https = false) class Fabric8SecretsPropertySourceTest { diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/KubernetesConfigConfigurationTest.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/KubernetesConfigConfigurationTest.java index 9276ccef..7c9532e2 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/KubernetesConfigConfigurationTest.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/KubernetesConfigConfigurationTest.java @@ -43,7 +43,7 @@ public class KubernetesConfigConfigurationTest extends KubernetesConfigTestBase @Test public void kubernetesWhenKubernetesDefaultEnabled() { setup(KubernetesClientTestConfiguration.class, "spring.cloud.kubernetes.enabled=true", - "spring.cloud.kubernetes.client.namespace=default", "spring.main.cloud-platform=KUBERNETES"); + "spring.cloud.kubernetes.client.namespace=default"); assertThat(getContext().containsBean("configMapPropertySourceLocator")).isTrue(); assertThat(getContext().containsBean("secretsPropertySourceLocator")).isTrue(); } @@ -66,8 +66,7 @@ public class KubernetesConfigConfigurationTest extends KubernetesConfigTestBase @Test public void kubernetesWhenKubernetesConfigEnabledButSecretDisabled() { setup(KubernetesClientTestConfiguration.class, "spring.cloud.kubernetes.config.enabled=true", - "spring.cloud.kubernetes.secrets.enabled=false", "spring.cloud.kubernetes.client.namespace=default", - "spring.main.cloud-platform=KUBERNETES"); + "spring.cloud.kubernetes.secrets.enabled=false", "spring.cloud.kubernetes.client.namespace=default"); assertThat(getContext().containsBean("configMapPropertySourceLocator")).isTrue(); assertThat(getContext().containsBean("secretsPropertySourceLocator")).isFalse(); } @@ -75,7 +74,7 @@ public class KubernetesConfigConfigurationTest extends KubernetesConfigTestBase @Test public void kubernetesWhenKubernetesConfigDisabledButSecretEnabled() { setup(KubernetesClientTestConfiguration.class, "spring.cloud.kubernetes.config.enabled=false", - "spring.cloud.kubernetes.secrets.enabled=true", "spring.main.cloud-platform=KUBERNETES"); + "spring.cloud.kubernetes.secrets.enabled=true"); assertThat(getContext().containsBean("configMapPropertySourceLocator")).isFalse(); assertThat(getContext().containsBean("secretsPropertySourceLocator")).isTrue(); } @@ -83,8 +82,7 @@ public class KubernetesConfigConfigurationTest extends KubernetesConfigTestBase @Test public void kubernetesConfigWhenKubernetesEnabledAndKubernetesConfigEnabled() { setup(KubernetesClientTestConfiguration.class, "spring.cloud.kubernetes.config.enabled=true", - "spring.cloud.kubernetes.secrets.enabled=true", "spring.cloud.kubernetes.client.namespace=default", - "spring.main.cloud-platform=KUBERNETES"); + "spring.cloud.kubernetes.secrets.enabled=true", "spring.cloud.kubernetes.client.namespace=default"); assertThat(getContext().containsBean("configMapPropertySourceLocator")).isTrue(); assertThat(getContext().containsBean("secretsPropertySourceLocator")).isTrue(); } @@ -106,5 +104,4 @@ public class KubernetesConfigConfigurationTest extends KubernetesConfigTestBase } } - } diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/MultipleConfigMapsTests.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/MultipleConfigMapsTests.java index 6b54f403..7c8e74fb 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/MultipleConfigMapsTests.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/MultipleConfigMapsTests.java @@ -39,7 +39,7 @@ import org.springframework.test.web.reactive.server.WebTestClient; */ @ExtendWith(SpringExtension.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = ExampleApp.class, - properties = { "spring.cloud.bootstrap.name=multiplecms", "spring.main.cloud-platform=KUBERNETES" }) + properties = { "spring.cloud.bootstrap.name=multiplecms" }) @AutoConfigureWebTestClient @EnableKubernetesMockClient(crud = true, https = false) public class MultipleConfigMapsTests { diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/MultipleSecretsTests.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/MultipleSecretsTests.java index 7e254bcc..81621cbc 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/MultipleSecretsTests.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/MultipleSecretsTests.java @@ -41,7 +41,7 @@ import org.springframework.test.web.reactive.server.WebTestClient; */ @ExtendWith(SpringExtension.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = MultiSecretsApp.class, - properties = { "spring.cloud.bootstrap.name=multiple-secrets", "spring.main.cloud-platform=KUBERNETES" }) + properties = { "spring.cloud.bootstrap.name=multiple-secrets" }) @AutoConfigureWebTestClient @EnableKubernetesMockClient(crud = true, https = false) public class MultipleSecretsTests { diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload/ConfigReloadAutoConfigurationTest.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload/ConfigReloadAutoConfigurationTest.java index a26dc713..6ff76724 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload/ConfigReloadAutoConfigurationTest.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload/ConfigReloadAutoConfigurationTest.java @@ -99,7 +99,7 @@ public class ConfigReloadAutoConfigurationTest extends KubernetesConfigTestBase public void kubernetesReloadEnabled() { setup(KubernetesClientTestConfiguration.class, "spring.cloud.kubernetes.enabled=true", "spring.cloud.kubernetes.config.enabled=true", "spring.cloud.kubernetes.secrets.enabled=true", - "spring.cloud.kubernetes.reload.enabled=true", "spring.main.cloud-platform=KUBERNETES"); + "spring.cloud.kubernetes.reload.enabled=true"); assertThat(this.getContext().containsBean("configMapPropertySourceLocator")).isTrue(); assertThat(this.getContext().containsBean("secretsPropertySourceLocator")).isTrue(); assertThat(this.getContext().containsBean("configMapPropertyChangeEventWatcher")).isTrue(); @@ -110,7 +110,7 @@ public class ConfigReloadAutoConfigurationTest extends KubernetesConfigTestBase public void kubernetesReloadEnabledButSecretDisabled() { setup(KubernetesClientTestConfiguration.class, "spring.cloud.kubernetes.enabled=true", "spring.cloud.kubernetes.config.enabled=true", "spring.cloud.kubernetes.secrets.enabled=false", - "spring.cloud.kubernetes.reload.enabled=true", "spring.main.cloud-platform=KUBERNETES"); + "spring.cloud.kubernetes.reload.enabled=true"); assertThat(this.getContext().containsBean("configMapPropertySourceLocator")).isTrue(); assertThat(this.getContext().containsBean("secretsPropertySourceLocator")).isFalse(); assertThat(this.getContext().containsBean("configMapPropertyChangeEventWatcher")).isTrue(); diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/secrets_with_labels/SecretsWithLabelsTests.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/secrets_with_labels/SecretsWithLabelsTests.java index 61adb1b4..d22d9af8 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/secrets_with_labels/SecretsWithLabelsTests.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/secrets_with_labels/SecretsWithLabelsTests.java @@ -37,8 +37,7 @@ import org.springframework.test.web.reactive.server.WebTestClient; * @author wind57 */ @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = SecretsWithLabelsApp.class, - properties = { "spring.cloud.bootstrap.name=secret-with-labels-config", - "spring.main.cloud-platform=KUBERNETES" }) + properties = { "spring.cloud.bootstrap.name=secret-with-labels-config"}) @EnableKubernetesMockClient(crud = true, https = false) class SecretsWithLabelsTests { From 3be261c53ebd87dae2ae06943482266b98bc0fd9 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 7 Jul 2022 15:18:57 +0000 Subject: [PATCH 3/4] Bumping versions --- ...figMapPropertySourceLocatorRetryTests.java | 14 ++++------- ...ecretsPropertySourceLocatorRetryTests.java | 23 ++++++++----------- .../config/ConfigMapWithPrefixTests.java | 2 +- .../fabric8/config/ConfigMapsTests.java | 2 +- .../ConfigMapsWithProfileExpressionTests.java | 5 ++-- .../config/ConfigMapsWithProfilesTests.java | 5 ++-- .../ConfigMapsWithoutProfilesTests.java | 5 ++-- ...figMapPropertySourceLocatorRetryTests.java | 14 ++++------- ...ecretsPropertySourceLocatorRetryTests.java | 23 ++++++++----------- .../KubernetesConfigConfigurationTest.java | 1 + .../SecretsWithLabelsTests.java | 2 +- 11 files changed, 40 insertions(+), 56 deletions(-) diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigMapPropertySourceLocatorRetryTests.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigMapPropertySourceLocatorRetryTests.java index 75eef237..13f99ed3 100644 --- a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigMapPropertySourceLocatorRetryTests.java +++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigMapPropertySourceLocatorRetryTests.java @@ -200,10 +200,8 @@ public class KubernetesClientConfigMapPropertySourceLocatorRetryTests { } @Nested - @SpringBootTest( - webEnvironment = SpringBootTest.WebEnvironment.NONE, properties = { - "spring.cloud.kubernetes.client.namespace=default" }, - classes = App.class) + @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE, + properties = { "spring.cloud.kubernetes.client.namespace=default" }, classes = App.class) class ConfigFailFastDisabled { @SpyBean @@ -223,11 +221,9 @@ public class KubernetesClientConfigMapPropertySourceLocatorRetryTests { } @Nested - @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE, - properties = { "spring.cloud.kubernetes.client.namespace=default", - "spring.cloud.kubernetes.config.fail-fast=true", - "spring.cloud.kubernetes.config.retry.enabled=false", - "spring.cloud.kubernetes.secrets.fail-fast=true" }, + @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE, properties = { + "spring.cloud.kubernetes.client.namespace=default", "spring.cloud.kubernetes.config.fail-fast=true", + "spring.cloud.kubernetes.config.retry.enabled=false", "spring.cloud.kubernetes.secrets.fail-fast=true" }, classes = App.class) class ConfigRetryDisabledButSecretsRetryEnabled { diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientSecretsPropertySourceLocatorRetryTests.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientSecretsPropertySourceLocatorRetryTests.java index bcd355e0..71c71514 100644 --- a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientSecretsPropertySourceLocatorRetryTests.java +++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientSecretsPropertySourceLocatorRetryTests.java @@ -120,8 +120,7 @@ public class KubernetesClientSecretsPropertySourceLocatorRetryTests { @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE, properties = { "spring.cloud.kubernetes.client.namespace=default", "spring.cloud.kubernetes.secrets.fail-fast=true", "spring.cloud.kubernetes.secrets.retry.max-attempts=5", "spring.cloud.kubernetes.secrets.name=my-secret", - "spring.cloud.kubernetes.secrets.enable-api=true" }, - classes = App.class) + "spring.cloud.kubernetes.secrets.enable-api=true" }, classes = App.class) class SecretsRetryEnabled { @SpyBean @@ -202,7 +201,8 @@ public class KubernetesClientSecretsPropertySourceLocatorRetryTests { @Nested @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE, properties = { "spring.cloud.kubernetes.client.namespace=default", - "spring.cloud.kubernetes.secrets.name=my-secret", "spring.cloud.kubernetes.secrets.enable-api=true" }, + "spring.cloud.kubernetes.secrets.name=my-secret", + "spring.cloud.kubernetes.secrets.enable-api=true" }, classes = App.class) class SecretsFailFastDisabled { @@ -223,12 +223,10 @@ public class KubernetesClientSecretsPropertySourceLocatorRetryTests { } @Nested - @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE, - properties = { "spring.cloud.kubernetes.client.namespace=default", - "spring.cloud.kubernetes.secrets.fail-fast=true", - "spring.cloud.kubernetes.secrets.retry.enabled=false", - "spring.cloud.kubernetes.config.fail-fast=true", "spring.cloud.kubernetes.secrets.name=my-secret", - "spring.cloud.kubernetes.secrets.enable-api=true" }, + @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE, properties = { + "spring.cloud.kubernetes.client.namespace=default", "spring.cloud.kubernetes.secrets.fail-fast=true", + "spring.cloud.kubernetes.secrets.retry.enabled=false", "spring.cloud.kubernetes.config.fail-fast=true", + "spring.cloud.kubernetes.secrets.name=my-secret", "spring.cloud.kubernetes.secrets.enable-api=true" }, classes = App.class) class SecretsRetryDisabledButConfigRetryEnabled { @@ -265,8 +263,7 @@ public class KubernetesClientSecretsPropertySourceLocatorRetryTests { @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE, properties = { "spring.cloud.kubernetes.client.namespace=default", "spring.cloud.kubernetes.secrets.fail-fast=true", "spring.cloud.kubernetes.secrets.retry.enabled=false", "spring.cloud.kubernetes.secrets.name=my-secret", - "spring.cloud.kubernetes.secrets.enable-api=true" }, - classes = App.class) + "spring.cloud.kubernetes.secrets.enable-api=true" }, classes = App.class) class SecretsFailFastEnabledButRetryDisabled { @SpyBean @@ -322,8 +319,8 @@ public class KubernetesClientSecretsPropertySourceLocatorRetryTests { @Test public void doesNotContainRetryableSecretsPropertySourceLocator() throws Exception { stubFor(get(API).willReturn(aResponse().withStatus(500).withBody("Internal Server Error"))); - setup("debug=true", - "spring.cloud.kubernetes.test.enable-retry=true", "spring.cloud.kubernetes.secrets.name=my-secret", + setup("debug=true", "spring.cloud.kubernetes.test.enable-retry=true", + "spring.cloud.kubernetes.secrets.name=my-secret", "spring.cloud.kubernetes.secrets.enable-api=true"); assertThat(context.containsBean("retryableSecretsPropertySourceLocator")).isFalse(); } diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapWithPrefixTests.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapWithPrefixTests.java index 2a360f5d..beb4551b 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapWithPrefixTests.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapWithPrefixTests.java @@ -40,7 +40,7 @@ import org.springframework.test.web.reactive.server.WebTestClient; */ @ExtendWith(SpringExtension.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = WithPrefixApp.class, - properties = { "spring.cloud.bootstrap.name=config-map-name-as-prefix"}) + properties = { "spring.cloud.bootstrap.name=config-map-name-as-prefix" }) @AutoConfigureWebTestClient @EnableKubernetesMockClient(crud = true, https = false) class ConfigMapWithPrefixTests { diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsTests.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsTests.java index 3863d689..17347ed5 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsTests.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsTests.java @@ -41,7 +41,7 @@ import static org.assertj.core.api.Assertions.assertThat; */ @ExtendWith(SpringExtension.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = App.class, - properties = { "spring.application.name=configmap-example", "spring.cloud.kubernetes.reload.enabled=false"}) + properties = { "spring.application.name=configmap-example", "spring.cloud.kubernetes.reload.enabled=false" }) @AutoConfigureWebTestClient @EnableKubernetesMockClient(crud = true, https = false) public class ConfigMapsTests { diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsWithProfileExpressionTests.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsWithProfileExpressionTests.java index 5d790e7b..35e99927 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsWithProfileExpressionTests.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsWithProfileExpressionTests.java @@ -39,9 +39,8 @@ import org.springframework.test.web.reactive.server.WebTestClient; */ @ExtendWith(SpringExtension.class) -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = App.class, - properties = { "spring.application.name=configmap-with-profile-example", - "spring.cloud.kubernetes.reload.enabled=false" }) +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = App.class, properties = { + "spring.application.name=configmap-with-profile-example", "spring.cloud.kubernetes.reload.enabled=false" }) @ActiveProfiles({ "production", "us-east" }) @AutoConfigureWebTestClient @EnableKubernetesMockClient(crud = true, https = false) diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsWithProfilesTests.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsWithProfilesTests.java index e2efaa4f..bbf4838c 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsWithProfilesTests.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsWithProfilesTests.java @@ -38,9 +38,8 @@ import org.springframework.test.web.reactive.server.WebTestClient; * @author Charles Moulliard */ @ExtendWith(SpringExtension.class) -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = App.class, - properties = { "spring.application.name=configmap-with-profile-example", - "spring.cloud.kubernetes.reload.enabled=false" }) +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = App.class, properties = { + "spring.application.name=configmap-with-profile-example", "spring.cloud.kubernetes.reload.enabled=false" }) @ActiveProfiles("development") @AutoConfigureWebTestClient @EnableKubernetesMockClient(crud = true, https = false) diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsWithoutProfilesTests.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsWithoutProfilesTests.java index 433ef83c..8742575a 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsWithoutProfilesTests.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsWithoutProfilesTests.java @@ -35,9 +35,8 @@ import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.test.web.reactive.server.WebTestClient; @ExtendWith(SpringExtension.class) -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = App.class, - properties = { "spring.application.name=configmap-without-profile-example", - "spring.cloud.kubernetes.reload.enabled=false" }) +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = App.class, properties = { + "spring.application.name=configmap-without-profile-example", "spring.cloud.kubernetes.reload.enabled=false" }) @ActiveProfiles("development") @AutoConfigureWebTestClient @EnableKubernetesMockClient(crud = true, https = false) diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8ConfigMapPropertySourceLocatorRetryTests.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8ConfigMapPropertySourceLocatorRetryTests.java index d009d4b6..2ae6d1ef 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8ConfigMapPropertySourceLocatorRetryTests.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8ConfigMapPropertySourceLocatorRetryTests.java @@ -151,10 +151,8 @@ public class Fabric8ConfigMapPropertySourceLocatorRetryTests { } @Nested - @SpringBootTest( - webEnvironment = SpringBootTest.WebEnvironment.NONE, properties = { - "spring.cloud.kubernetes.client.namespace=default" }, - classes = Application.class) + @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE, + properties = { "spring.cloud.kubernetes.client.namespace=default" }, classes = Application.class) @EnableKubernetesMockClient class ConfigFailFastDisabled { @@ -174,11 +172,9 @@ public class Fabric8ConfigMapPropertySourceLocatorRetryTests { } @Nested - @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE, - properties = { "spring.cloud.kubernetes.client.namespace=default", - "spring.cloud.kubernetes.config.fail-fast=true", - "spring.cloud.kubernetes.config.retry.enabled=false", - "spring.cloud.kubernetes.secrets.fail-fast=true" }, + @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE, properties = { + "spring.cloud.kubernetes.client.namespace=default", "spring.cloud.kubernetes.config.fail-fast=true", + "spring.cloud.kubernetes.config.retry.enabled=false", "spring.cloud.kubernetes.secrets.fail-fast=true" }, classes = Application.class) @EnableKubernetesMockClient class ConfigRetryDisabledButSecretsRetryEnabled { diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8SecretsPropertySourceLocatorRetryTests.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8SecretsPropertySourceLocatorRetryTests.java index abe707bc..158ec63f 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8SecretsPropertySourceLocatorRetryTests.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8SecretsPropertySourceLocatorRetryTests.java @@ -91,8 +91,7 @@ public class Fabric8SecretsPropertySourceLocatorRetryTests { @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE, properties = { "spring.cloud.kubernetes.client.namespace=default", "spring.cloud.kubernetes.secrets.fail-fast=true", "spring.cloud.kubernetes.secrets.retry.max-attempts=5", "spring.cloud.kubernetes.secrets.name=my-secret", - "spring.cloud.kubernetes.secrets.enable-api=true" }, - classes = Application.class) + "spring.cloud.kubernetes.secrets.enable-api=true" }, classes = Application.class) @EnableKubernetesMockClient class SecretsRetryEnabled { @@ -162,7 +161,8 @@ public class Fabric8SecretsPropertySourceLocatorRetryTests { @Nested @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE, properties = { "spring.cloud.kubernetes.client.namespace=default", - "spring.cloud.kubernetes.secrets.name=my-secret", "spring.cloud.kubernetes.secrets.enable-api=true" }, + "spring.cloud.kubernetes.secrets.name=my-secret", + "spring.cloud.kubernetes.secrets.enable-api=true" }, classes = Application.class) @EnableKubernetesMockClient class SecretsFailFastDisabled { @@ -183,12 +183,10 @@ public class Fabric8SecretsPropertySourceLocatorRetryTests { } @Nested - @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE, - properties = { "spring.cloud.kubernetes.client.namespace=default", - "spring.cloud.kubernetes.secrets.fail-fast=true", - "spring.cloud.kubernetes.secrets.retry.enabled=false", - "spring.cloud.kubernetes.config.fail-fast=true", "spring.cloud.kubernetes.secrets.name=my-secret", - "spring.cloud.kubernetes.secrets.enable-api=true" }, + @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE, properties = { + "spring.cloud.kubernetes.client.namespace=default", "spring.cloud.kubernetes.secrets.fail-fast=true", + "spring.cloud.kubernetes.secrets.retry.enabled=false", "spring.cloud.kubernetes.config.fail-fast=true", + "spring.cloud.kubernetes.secrets.name=my-secret", "spring.cloud.kubernetes.secrets.enable-api=true" }, classes = Application.class) @EnableKubernetesMockClient class SecretsRetryDisabledButConfigRetryEnabled { @@ -226,8 +224,7 @@ public class Fabric8SecretsPropertySourceLocatorRetryTests { @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE, properties = { "spring.cloud.kubernetes.client.namespace=default", "spring.cloud.kubernetes.secrets.fail-fast=true", "spring.cloud.kubernetes.secrets.retry.enabled=false", "spring.cloud.kubernetes.secrets.name=my-secret", - "spring.cloud.kubernetes.secrets.enable-api=true" }, - classes = Application.class) + "spring.cloud.kubernetes.secrets.enable-api=true" }, classes = Application.class) @EnableKubernetesMockClient class SecretsFailFastEnabledButRetryDisabled { @@ -284,8 +281,8 @@ public class Fabric8SecretsPropertySourceLocatorRetryTests { @Test public void doesNotContainRetryableSecretsPropertySourceLocator() throws Exception { mockServer.expect().withPath(API).andReturn(500, "Internal Server Error").once(); - setup("debug=true", - "spring.cloud.kubernetes.test.enable-retry=true", "spring.cloud.kubernetes.secrets.name=my-secret", + setup("debug=true", "spring.cloud.kubernetes.test.enable-retry=true", + "spring.cloud.kubernetes.secrets.name=my-secret", "spring.cloud.kubernetes.secrets.enable-api=true"); assertThat(context.containsBean("retryableSecretsPropertySourceLocator")).isFalse(); } diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/KubernetesConfigConfigurationTest.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/KubernetesConfigConfigurationTest.java index 7c9532e2..0a05aa7b 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/KubernetesConfigConfigurationTest.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/KubernetesConfigConfigurationTest.java @@ -104,4 +104,5 @@ public class KubernetesConfigConfigurationTest extends KubernetesConfigTestBase } } + } diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/secrets_with_labels/SecretsWithLabelsTests.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/secrets_with_labels/SecretsWithLabelsTests.java index d22d9af8..69d416a1 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/secrets_with_labels/SecretsWithLabelsTests.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/secrets_with_labels/SecretsWithLabelsTests.java @@ -37,7 +37,7 @@ import org.springframework.test.web.reactive.server.WebTestClient; * @author wind57 */ @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = SecretsWithLabelsApp.class, - properties = { "spring.cloud.bootstrap.name=secret-with-labels-config"}) + properties = { "spring.cloud.bootstrap.name=secret-with-labels-config" }) @EnableKubernetesMockClient(crud = true, https = false) class SecretsWithLabelsTests { From 17b61c22d32d51b7c554060f179a1447630414a4 Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Tue, 16 Aug 2022 15:14:35 -0400 Subject: [PATCH 4/4] Catch and log any exceptions thrown within the executor service --- .../watcher/ConfigMapWatcherChangeDetector.java | 10 ++++++++-- .../watcher/SecretsWatcherChangeDetector.java | 10 ++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/main/java/org/springframework/cloud/kubernetes/configuration/watcher/ConfigMapWatcherChangeDetector.java b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/main/java/org/springframework/cloud/kubernetes/configuration/watcher/ConfigMapWatcherChangeDetector.java index 02d6ffb0..8c9a9f73 100644 --- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/main/java/org/springframework/cloud/kubernetes/configuration/watcher/ConfigMapWatcherChangeDetector.java +++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/main/java/org/springframework/cloud/kubernetes/configuration/watcher/ConfigMapWatcherChangeDetector.java @@ -64,8 +64,14 @@ public abstract class ConfigMapWatcherChangeDetector extends EventBasedConfigMap + configMap.getMetadata().getName() + " to be published in " + k8SConfigurationProperties.getRefreshDelay().toMillis() + " milliseconds"); } - executorService.schedule(() -> triggerRefresh(configMap).subscribe(), - k8SConfigurationProperties.getRefreshDelay().toMillis(), TimeUnit.MILLISECONDS); + executorService.schedule(() -> { + try { + triggerRefresh(configMap).subscribe(); + } + catch (Throwable t) { + log.warn("Error when refreshing ConfigMap " + configMap.getMetadata().getName(), t); + } + }, k8SConfigurationProperties.getRefreshDelay().toMillis(), TimeUnit.MILLISECONDS); } else { if (log.isDebugEnabled()) { diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/main/java/org/springframework/cloud/kubernetes/configuration/watcher/SecretsWatcherChangeDetector.java b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/main/java/org/springframework/cloud/kubernetes/configuration/watcher/SecretsWatcherChangeDetector.java index e81adba5..031da2d3 100644 --- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/main/java/org/springframework/cloud/kubernetes/configuration/watcher/SecretsWatcherChangeDetector.java +++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/main/java/org/springframework/cloud/kubernetes/configuration/watcher/SecretsWatcherChangeDetector.java @@ -74,8 +74,14 @@ public abstract class SecretsWatcherChangeDetector extends EventBasedSecretsChan + " to be published in " + k8SConfigurationProperties.getRefreshDelay().toMillis() + " milliseconds"); } - executorService.schedule(() -> triggerRefresh(secret).subscribe(), - k8SConfigurationProperties.getRefreshDelay().toMillis(), TimeUnit.MILLISECONDS); + executorService.schedule(() -> { + try { + triggerRefresh(secret).subscribe(); + } + catch (Throwable t) { + log.warn("Error when refreshing ConfigMap " + secret.getMetadata().getName(), t); + } + }, k8SConfigurationProperties.getRefreshDelay().toMillis(), TimeUnit.MILLISECONDS); } else { if (log.isDebugEnabled()) {