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

Merge remote-tracking branch 'origin/1.1.x'

Browse Source
This commit is contained in:
Ryan Baxter
2021-02-09 11:00:15 -05:00
parent e9227255d6 4b49394e0a
commit 7bb4d67002
8 changed files with 62 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -63,6 +63,7 @@ hs_err_pid*
# IntelliJ
/out/
.DS_Store
# mpeltonen/sbt-idea plugin
.idea_modules/

4
spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/PodUtils.java
View File

@@ -26,8 +26,8 @@ import java.util.function.Supplier;
public interface PodUtils<T> {
/**
* @return A supplier of the currentPod Pod. The supplier will hold the currentPod pod
* if inside Kubernetes or false, otherwise.
* @return A supplier of the currentPod {@link Pod}. The supplier will hold the
* currentPod {@link Pod} if inside Kubernetes or false, otherwise.
*/
Supplier<T> currentPod();

2
spring-cloud-kubernetes-dependencies/pom.xml
View File

@@ -35,7 +35,7 @@
<arquillian.version>1.6.0.Final</arquillian.version>
<arquillian-cube.version>1.15.2</arquillian-cube.version>
<hoverfly.version>0.13.0</hoverfly.version>
<kubernetes-client.version>4.10.3</kubernetes-client.version>
<kubernetes-client.version>4.13.2</kubernetes-client.version>
<kubernetes-java-client.version>10.0.0</kubernetes-java-client.version>
<istio-client.version>1.5.5</istio-client.version>
<mockwebserver.version>0.1.2</mockwebserver.version>

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

@@ -1,5 +1,5 @@
/*
* Copyright 2013-2019 the original author or authors.
* Copyright 2012-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.cloud.kubernetes.fabric8.config;
package org.springframework.cloud.kubernetes.config;
import io.fabric8.kubernetes.client.KubernetesClient;
import io.fabric8.kubernetes.client.server.mock.KubernetesServer;
@@ -25,8 +25,7 @@ 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.bootstrap.BootstrapConfiguration;
import org.springframework.cloud.kubernetes.fabric8.config.reload.ConfigReloadAutoConfiguration;
import org.springframework.cloud.kubernetes.config.reload.ConfigReloadAutoConfiguration;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -49,7 +48,8 @@ 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.fabric8.config.reload;
package org.springframework.cloud.kubernetes.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.fabric8.config.KubernetesConfigTestBase;
import org.springframework.cloud.kubernetes.config.KubernetesConfigTestBase;
import static org.assertj.core.api.Assertions.assertThat;
@@ -46,72 +46,91 @@ 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",
"spring.cloud.kubernetes.reload.mode=polling");
assertThat(this.getContext().containsBean("configMapPropertySourceLocator")).isTrue();
assertThat(this.getContext().containsBean("secretsPropertySourceLocator")).isTrue();
assertThat(this.getContext().containsBean("configMapPropertyChangePollingWatcher")).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("propertyChangeWatcher")).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",
"spring.cloud.kubernetes.reload.mode=polling");
assertThat(this.getContext().containsBean("configMapPropertySourceLocator")).isTrue();
assertThat(this.getContext().containsBean("secretsPropertySourceLocator")).isFalse();
assertThat(this.getContext().containsBean("configMapPropertyChangePollingWatcher")).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("propertyChangeWatcher")).isTrue();
}
@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();
}

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

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

3
spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/KubernetesDiscoveryClientFilterMetadataTest.java
View File

@@ -36,7 +36,6 @@ import io.fabric8.kubernetes.api.model.ServicePort;
import io.fabric8.kubernetes.api.model.ServicePortBuilder;
import io.fabric8.kubernetes.client.KubernetesClient;
import io.fabric8.kubernetes.client.Watch;
import io.fabric8.kubernetes.client.Watcher;
import io.fabric8.kubernetes.client.dsl.FilterWatchListDeletable;
import io.fabric8.kubernetes.client.dsl.MixedOperation;
import io.fabric8.kubernetes.client.dsl.Resource;
@@ -87,7 +86,7 @@ public class KubernetesDiscoveryClientFilterMetadataTest {
private Resource<Endpoints, DoneableEndpoints> endpointsResource;
@Mock
FilterWatchListDeletable<Endpoints, EndpointsList, Boolean, Watch, Watcher<Endpoints>> filter;
FilterWatchListDeletable<Endpoints, EndpointsList, Boolean, Watch> filter;
@InjectMocks
private KubernetesDiscoveryClient underTest;

3
spring-cloud-kubernetes-fabric8-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/fabric8/loadbalancer/KubernetesServiceListSupplierTests.java
View File

@@ -24,7 +24,6 @@ import io.fabric8.kubernetes.api.model.ServiceBuilder;
import io.fabric8.kubernetes.api.model.ServiceList;
import io.fabric8.kubernetes.client.KubernetesClient;
import io.fabric8.kubernetes.client.Watch;
import io.fabric8.kubernetes.client.Watcher;
import io.fabric8.kubernetes.client.dsl.FilterWatchListMultiDeletable;
import io.fabric8.kubernetes.client.dsl.MixedOperation;
import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation;
@@ -66,7 +65,7 @@ class KubernetesServiceListSupplierTests {
ServiceResource<Service, DoneableService> serviceResource;
@Mock
FilterWatchListMultiDeletable<Service, ServiceList, Boolean, Watch, Watcher<Service>> multiDeletable;
FilterWatchListMultiDeletable<Service, ServiceList, Boolean, Watch> multiDeletable;
@Test
void testPositiveMatch() {