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

Formatting changes

Browse Source
This commit is contained in:
Ryan Baxter
2021-02-09 11:01:03 -05:00
parent 7bb4d67002
commit 15502e1c6a
3 changed files with 37 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/KubernetesConfigTestBase.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.cloud.kubernetes.config;
package org.springframework.cloud.kubernetes.fabric8.config;
import io.fabric8.kubernetes.client.KubernetesClient;
import io.fabric8.kubernetes.client.server.mock.KubernetesServer;
@@ -25,7 +25,8 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.cloud.autoconfigure.RefreshAutoConfiguration;
import org.springframework.cloud.kubernetes.config.reload.ConfigReloadAutoConfiguration;
import org.springframework.cloud.bootstrap.BootstrapConfiguration;
import org.springframework.cloud.kubernetes.fabric8.config.reload.ConfigReloadAutoConfiguration;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -48,8 +49,7 @@ public class KubernetesConfigTestBase {
context = new SpringApplicationBuilder(PropertyPlaceholderAutoConfiguration.class,
KubernetesClientTestConfiguration.class, BootstrapConfiguration.class,
ConfigReloadAutoConfiguration.class, RefreshAutoConfiguration.class)
.web(org.springframework.boot.WebApplicationType.NONE)
.properties(env).run();
.web(org.springframework.boot.WebApplicationType.NONE).properties(env).run();
}
@After

81
spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload/ConfigReloadAutoConfigurationTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.cloud.kubernetes.config.reload;
package org.springframework.cloud.kubernetes.fabric8.config.reload;
import java.util.HashMap;
@@ -24,7 +24,7 @@ import io.fabric8.kubernetes.client.KubernetesClient;
import org.junit.BeforeClass;
import org.junit.Test;
import org.springframework.cloud.kubernetes.config.KubernetesConfigTestBase;
import org.springframework.cloud.kubernetes.fabric8.config.KubernetesConfigTestBase;
import static org.assertj.core.api.Assertions.assertThat;
@@ -46,91 +46,72 @@ public class ConfigReloadAutoConfigurationTest extends KubernetesConfigTestBase
KubernetesClient mockClient = getContext().getBean(KubernetesClient.class);
// Configure the kubernetes master url to point to the mock server
System.setProperty(Config.KUBERNETES_MASTER_SYSTEM_PROPERTY,
mockClient.getConfiguration().getMasterUrl());
System.setProperty(Config.KUBERNETES_MASTER_SYSTEM_PROPERTY, mockClient.getConfiguration().getMasterUrl());
System.setProperty(Config.KUBERNETES_TRUST_CERT_SYSTEM_PROPERTY, "true");
System.setProperty(Config.KUBERNETES_AUTH_TRYKUBECONFIG_SYSTEM_PROPERTY, "false");
System.setProperty(Config.KUBERNETES_AUTH_TRYSERVICEACCOUNT_SYSTEM_PROPERTY,
"false");
System.setProperty(Config.KUBERNETES_AUTH_TRYSERVICEACCOUNT_SYSTEM_PROPERTY, "false");
System.setProperty(Config.KUBERNETES_NAMESPACE_SYSTEM_PROPERTY, "test");
System.setProperty(Config.KUBERNETES_HTTP2_DISABLE, "true");
HashMap<String, String> data = new HashMap<>();
data.put("bean.greeting", "Hello ConfigMap, %s!");
server.expect().withPath("/api/v1/namespaces/test/configmaps/" + APPLICATION_NAME)
.andReturn(200, new ConfigMapBuilder().withNewMetadata()
.withName(APPLICATION_NAME).endMetadata().addToData(data).build())
.andReturn(200, new ConfigMapBuilder().withNewMetadata().withName(APPLICATION_NAME).endMetadata()
.addToData(data).build())
.always();
server.expect()
.withPath("/api/v1/namespaces/spring/configmaps/" + APPLICATION_NAME)
.andReturn(200, new ConfigMapBuilder().withNewMetadata()
.withName(APPLICATION_NAME).endMetadata().addToData(data).build())
server.expect().withPath("/api/v1/namespaces/spring/configmaps/" + APPLICATION_NAME)
.andReturn(200, new ConfigMapBuilder().withNewMetadata().withName(APPLICATION_NAME).endMetadata()
.addToData(data).build())
.always();
}
@Test
public void kubernetesConfigReloadDisabled() throws Exception {
setup("spring.cloud.kubernetes.reload.enabled=false");
assertThat(this.getContext().containsBean("configurationChangeDetector"))
.isFalse();
assertThat(this.getContext().containsBean("configurationUpdateStrategy"))
.isFalse();
assertThat(this.getContext().containsBean("configurationChangeDetector")).isFalse();
assertThat(this.getContext().containsBean("configurationUpdateStrategy")).isFalse();
}
@Test
public void kubernetesConfigReloadWhenKubernetesConfigDisabled() throws Exception {
setup("spring.cloud.kubernetes.config.enabled=false");
assertThat(this.getContext().containsBean("configurationChangeDetector"))
.isFalse();
assertThat(this.getContext().containsBean("configurationUpdateStrategy"))
.isFalse();
assertThat(this.getContext().containsBean("configurationChangeDetector")).isFalse();
assertThat(this.getContext().containsBean("configurationUpdateStrategy")).isFalse();
}
@Test
public void kubernetesConfigReloadWhenKubernetesDisabled() throws Exception {
setup("spring.cloud.kubernetes.enabled=false");
assertThat(this.getContext().containsBean("configurationChangeDetector"))
.isFalse();
assertThat(this.getContext().containsBean("configurationUpdateStrategy"))
.isFalse();
assertThat(this.getContext().containsBean("configurationChangeDetector")).isFalse();
assertThat(this.getContext().containsBean("configurationUpdateStrategy")).isFalse();
}
@Test
public void kubernetesReloadEnabled() throws Exception {
setup("spring.cloud.kubernetes.enabled=true",
"spring.cloud.kubernetes.config.enabled=true",
"spring.cloud.kubernetes.secrets.enabled=true",
"spring.cloud.kubernetes.reload.enabled=true");
assertThat(this.getContext().containsBean("configMapPropertySourceLocator"))
.isTrue();
assertThat(this.getContext().containsBean("secretsPropertySourceLocator"))
.isTrue();
assertThat(this.getContext().containsBean("propertyChangeWatcher")).isTrue();
setup("spring.cloud.kubernetes.enabled=true", "spring.cloud.kubernetes.config.enabled=true",
"spring.cloud.kubernetes.secrets.enabled=true", "spring.cloud.kubernetes.reload.enabled=true");
assertThat(this.getContext().containsBean("configMapPropertySourceLocator")).isTrue();
assertThat(this.getContext().containsBean("secretsPropertySourceLocator")).isTrue();
assertThat(this.getContext().containsBean("configMapPropertyChangeEventWatcher")).isTrue();
assertThat(this.getContext().containsBean("secretsPropertyChangeEventWatcher")).isTrue();
}
@Test
public void kubernetesReloadEnabledButSecretDisabled() throws Exception {
setup("spring.cloud.kubernetes.enabled=true",
"spring.cloud.kubernetes.config.enabled=true",
"spring.cloud.kubernetes.secrets.enabled=false",
"spring.cloud.kubernetes.reload.enabled=true");
assertThat(this.getContext().containsBean("configMapPropertySourceLocator"))
.isTrue();
assertThat(this.getContext().containsBean("secretsPropertySourceLocator"))
.isFalse();
assertThat(this.getContext().containsBean("propertyChangeWatcher")).isTrue();
setup("spring.cloud.kubernetes.enabled=true", "spring.cloud.kubernetes.config.enabled=true",
"spring.cloud.kubernetes.secrets.enabled=false", "spring.cloud.kubernetes.reload.enabled=true");
assertThat(this.getContext().containsBean("configMapPropertySourceLocator")).isTrue();
assertThat(this.getContext().containsBean("secretsPropertySourceLocator")).isFalse();
assertThat(this.getContext().containsBean("configMapPropertyChangeEventWatcher")).isTrue();
assertThat(this.getContext().containsBean("secretsPropertyChangeEventWatcher")).isFalse();
}
@Test
public void kubernetesReloadEnabledButSecretAndConfigDisabled() throws Exception {
setup("spring.cloud.kubernetes.enabled=true",
"spring.cloud.kubernetes.config.enabled=false",
"spring.cloud.kubernetes.secrets.enabled=false",
"spring.cloud.kubernetes.reload.enabled=true");
assertThat(this.getContext().containsBean("configMapPropertySourceLocator"))
.isFalse();
assertThat(this.getContext().containsBean("secretsPropertySourceLocator"))
.isFalse();
setup("spring.cloud.kubernetes.enabled=true", "spring.cloud.kubernetes.config.enabled=false",
"spring.cloud.kubernetes.secrets.enabled=false", "spring.cloud.kubernetes.reload.enabled=true");
assertThat(this.getContext().containsBean("configMapPropertySourceLocator")).isFalse();
assertThat(this.getContext().containsBean("secretsPropertySourceLocator")).isFalse();
assertThat(this.getContext().containsBean("propertyChangeWatcher")).isFalse();
}

4
spring-cloud-kubernetes-fabric8-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/discovery/KubernetesClientServicesFunction.java
View File

@@ -42,7 +42,7 @@ import io.fabric8.kubernetes.client.dsl.FilterWatchListDeletable;
*
* @author Georgios Andrianakis
*/
public interface KubernetesClientServicesFunction extends
Function<KubernetesClient, FilterWatchListDeletable<Service, ServiceList, Boolean, Watch>> {
public interface KubernetesClientServicesFunction
extends Function<KubernetesClient, FilterWatchListDeletable<Service, ServiceList, Boolean, Watch>> {
}