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

Upgrade to Fabric8 6.7.2 (#1373)

Browse Source 
Co-authored-by: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com>
This commit is contained in:
Ryan Baxter
2023-06-22 08:17:29 -04:00
committed by GitHub
parent a40c5be7b4
commit 668c04d69c
28 changed files with 106 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/KubernetesClientProperties.java
View File

@@ -33,7 +33,7 @@ public record KubernetesClientProperties(Boolean trustCerts, String masterUrl, S
String caCertFile, String caCertData, String clientCertFile, String clientCertData, String clientKeyFile,
String clientKeyData, String clientKeyAlgo, String clientKeyPassphrase, String username, String password,
Duration watchReconnectInterval, Duration watchReconnectLimit, Duration connectionTimeout,
Duration requestTimeout, Duration rollingTimeout, Duration loggingInterval, String httpProxy, String httpsProxy,
Duration requestTimeout, @Deprecated(forRemoval = true) Duration rollingTimeout, Duration loggingInterval, String httpProxy, String httpsProxy,
String proxyUsername, String proxyPassword, String oauthToken, String[] noProxy,
@DefaultValue(SERVICE_ACCOUNT_NAMESPACE_PATH) String serviceAccountNamespacePath,
@DefaultValue(DEFAULT_USER_AGENT) String userAgent) {

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

@@ -33,7 +33,7 @@
<description>Spring Cloud Kubernetes Dependencies</description>
<properties>
<hoverfly.version>0.13.0</hoverfly.version>
<kubernetes-fabric8-client.version>6.2.0</kubernetes-fabric8-client.version>
<kubernetes-fabric8-client.version>6.7.2</kubernetes-fabric8-client.version>
<kubernetes-native-client.version>17.0.2</kubernetes-native-client.version>
<wiremock.version>2.26.3</wiremock.version>
<commons.collections4.version>4.4</commons.collections4.version>

7
spring-cloud-kubernetes-fabric8-autoconfig/src/main/java/org/springframework/cloud/kubernetes/fabric8/Fabric8AutoConfiguration.java
View File

@@ -86,14 +86,15 @@ public class Fabric8AutoConfiguration {
orDurationInt(kubernetesClientProperties.connectionTimeout(), base.getConnectionTimeout()))
.withRequestTimeout(
orDurationInt(kubernetesClientProperties.requestTimeout(), base.getRequestTimeout()))
.withRollingTimeout(
orDurationLong(kubernetesClientProperties.rollingTimeout(), base.getRollingTimeout()))
.withTrustCerts(or(kubernetesClientProperties.trustCerts(), base.isTrustCerts()))
.withHttpProxy(or(kubernetesClientProperties.httpProxy(), base.getHttpProxy()))
.withHttpsProxy(or(kubernetesClientProperties.httpsProxy(), base.getHttpsProxy()))
.withProxyUsername(or(kubernetesClientProperties.proxyUsername(), base.getProxyUsername()))
.withProxyPassword(or(kubernetesClientProperties.proxyPassword(), base.getProxyPassword()))
.withNoProxy(or(kubernetesClientProperties.noProxy(), base.getNoProxy()));
.withNoProxy(or(kubernetesClientProperties.noProxy(), base.getNoProxy()))
// Disable the built-in retry functionality since Spring Cloud Kubernetes provides it
// See https://github.com/fabric8io/kubernetes-client/issues/4863
.withRequestRetryBackoffLimit(0);
String userAgent = or(base.getUserAgent(), KubernetesClientProperties.DEFAULT_USER_AGENT);
if (!kubernetesClientProperties.userAgent().equals(KubernetesClientProperties.DEFAULT_USER_AGENT)) {

2
spring-cloud-kubernetes-fabric8-autoconfig/src/test/java/org/springframework/cloud/kubernetes/fabric8/Fabric8UserAgentDefaultConfigurationTests.java
View File

@@ -37,7 +37,7 @@ class Fabric8UserAgentDefaultConfigurationTests {
@Test
void testUserAgent() {
String userAgent = client.getConfiguration().getUserAgent();
assertThat(userAgent).isEqualTo("fabric8-kubernetes-client/6.2.0");
assertThat(userAgent).isEqualTo("fabric8-kubernetes-client/6.7.2");
}
}

2
spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8ConfigMapPropertySourceLocatorTests.java
View File

@@ -57,7 +57,7 @@ class Fabric8ConfigMapPropertySourceLocatorTests {
configMapConfigProperties, new KubernetesNamespaceProvider(new MockEnvironment()));
assertThatThrownBy(() -> locator.locate(new MockEnvironment())).isInstanceOf(IllegalStateException.class)
.hasMessageContaining("api/v1/namespaces/default/configmaps. Message: Internal Server Error.");
.hasMessageContaining("api/v1/namespaces/default/configmaps. Message: Not Found.");
}
@Test

2
spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8ConfigMapPropertySourceTests.java
View File

@@ -57,7 +57,7 @@ class Fabric8ConfigMapPropertySourceTests {
NormalizedSource source = new NamedConfigMapNormalizedSource(name, namespace, true, DEFAULT, true);
Fabric8ConfigContext context = new Fabric8ConfigContext(mockClient, source, "default", new MockEnvironment());
assertThatThrownBy(() -> new Fabric8ConfigMapPropertySource(context)).isInstanceOf(IllegalStateException.class)
.hasMessageContaining("v1/namespaces/default/configmaps. Message: Internal Server Error.");
.hasMessageContaining("v1/namespaces/default/configmaps. Message: Not Found.");
}
@Test

2
spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8SecretsPropertySourceLocatorTests.java
View File

@@ -57,7 +57,7 @@ class Fabric8SecretsPropertySourceLocatorTests {
configMapConfigProperties, new KubernetesNamespaceProvider(new MockEnvironment()));
assertThatThrownBy(() -> locator.locate(new MockEnvironment())).isInstanceOf(IllegalStateException.class)
.hasMessageContaining("v1/namespaces/default/secrets. Message: Internal Server Error.");
.hasMessageContaining("v1/namespaces/default/secrets. Message: Not Found.");
}
@Test

2
spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8SecretsPropertySourceMockTests.java
View File

@@ -69,7 +69,7 @@ class Fabric8SecretsPropertySourceMockTests {
mockServer.expect().withPath(path).andReturn(500, "Internal Server Error").once();
assertThatThrownBy(() -> new Fabric8SecretsPropertySource(context)).isInstanceOf(IllegalStateException.class)
.hasMessageContaining("api/v1/namespaces/default/secrets. Message: Internal Server Error.");
.hasMessageContaining("api/v1/namespaces/default/secrets. Message: Not Found.");
}
@Test

8
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/fabric8/catalog/watch/Fabric8CatalogWatchIT.java
View File

@@ -202,10 +202,10 @@ class Fabric8CatalogWatchIT {
InputStream ingressStream = util.inputStream("app/watcher-ingress.yaml");
Deployment deployment = useEndpointSlices
? client.apps().deployments().load(endpointSlicesDeploymentStream).get()
: client.apps().deployments().load(endpointsDeploymentStream).get();
Service service = client.services().load(serviceStream).get();
Ingress ingress = client.network().v1().ingresses().load(ingressStream).get();
? client.apps().deployments().load(endpointSlicesDeploymentStream).item()
: client.apps().deployments().load(endpointsDeploymentStream).item();
Service service = client.services().load(serviceStream).item();
Ingress ingress = client.network().v1().ingresses().load(ingressStream).item();
if (phase.equals(Phase.CREATE)) {
util.createAndWait(Fabric8CatalogWatchIT.NAMESPACE, null, deployment, service, ingress, true);

8
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/fabric8/catalog/watch/Fabric8CatalogWatchWithNamespacesIT.java
View File

@@ -219,8 +219,8 @@ class Fabric8CatalogWatchWithNamespacesIT {
InputStream ingressStream = util.inputStream("app/watcher-ingress.yaml");
Deployment deployment = useEndpointSlices
? client.apps().deployments().load(endpointSlicesDeploymentStream).get()
: client.apps().deployments().load(endpointsDeploymentStream).get();
? client.apps().deployments().load(endpointSlicesDeploymentStream).item()
: client.apps().deployments().load(endpointsDeploymentStream).item();
List<EnvVar> envVars = new ArrayList<>(
deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getEnv());
@@ -233,8 +233,8 @@ class Fabric8CatalogWatchWithNamespacesIT {
deployment.getSpec().getTemplate().getSpec().getContainers().get(0).setEnv(envVars);
Service service = client.services().load(serviceStream).get();
Ingress ingress = client.network().v1().ingresses().load(ingressStream).get();
Service service = client.services().load(serviceStream).item();
Ingress ingress = client.network().v1().ingresses().load(ingressStream).item();
if (phase.equals(Phase.CREATE)) {
util.createAndWait(Fabric8CatalogWatchWithNamespacesIT.NAMESPACE_DEFAULT, null, deployment, service,

12
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap-event-reload/src/test/java/org/springframework/cloud/kubernetes/fabric8/configmap/event/reload/ConfigMapEventReloadIT.java
View File

@@ -295,7 +295,7 @@ class ConfigMapEventReloadIT {
InputStream rightConfigMapStream = util.inputStream("right-configmap.yaml");
InputStream rightWithLabelConfigMapStream = util.inputStream("right-configmap-with-label.yaml");
Deployment deployment = client.apps().deployments().load(deploymentStream).get();
Deployment deployment = client.apps().deployments().load(deploymentStream).item();
List<EnvVar> envVars = new ArrayList<>(
deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getEnv());
@@ -312,11 +312,11 @@ class ConfigMapEventReloadIT {
deployment.getSpec().getTemplate().getSpec().getContainers().get(0).setEnv(envVars);
Service service = client.services().load(serviceStream).get();
Ingress ingress = client.network().v1().ingresses().load(ingressStream).get();
ConfigMap leftConfigMap = client.configMaps().load(leftConfigMapStream).get();
ConfigMap rightConfigMap = client.configMaps().load(rightConfigMapStream).get();
ConfigMap rightWithLabelConfigMap = client.configMaps().load(rightWithLabelConfigMapStream).get();
Service service = client.services().load(serviceStream).item();
Ingress ingress = client.network().v1().ingresses().load(ingressStream).item();
ConfigMap leftConfigMap = client.configMaps().load(leftConfigMapStream).item();
ConfigMap rightConfigMap = client.configMaps().load(rightConfigMapStream).item();
ConfigMap rightWithLabelConfigMap = client.configMaps().load(rightWithLabelConfigMapStream).item();
if (phase.equals(Phase.CREATE)) {
util.createAndWait("left", leftConfigMap, null);

8
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap-event-reload/src/test/java/org/springframework/cloud/kubernetes/fabric8/configmap/event/reload/DataChangesInConfigMapReloadIT.java
View File

@@ -154,7 +154,7 @@ class DataChangesInConfigMapReloadIT {
InputStream ingressStream = util.inputStream("ingress.yaml");
InputStream configmapAsStream = util.inputStream("left-configmap.yaml");
Deployment deployment = client.apps().deployments().load(deploymentStream).get();
Deployment deployment = client.apps().deployments().load(deploymentStream).item();
List<EnvVar> envVars = new ArrayList<>(
deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getEnv());
@@ -172,9 +172,9 @@ class DataChangesInConfigMapReloadIT {
envVars.add(secretsDisabledEnvVar);
deployment.getSpec().getTemplate().getSpec().getContainers().get(0).setEnv(envVars);
Service service = client.services().load(serviceStream).get();
Ingress ingress = client.network().v1().ingresses().load(ingressStream).get();
ConfigMap configMap = client.configMaps().load(configmapAsStream).get();
Service service = client.services().load(serviceStream).item();
Ingress ingress = client.network().v1().ingresses().load(ingressStream).item();
ConfigMap configMap = client.configMaps().load(configmapAsStream).item();
if (phase.equals(Phase.CREATE)) {
util.createAndWait(LEFT_NAMESPACE, configMap, null);

10
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap-polling-reload/src/test/java/org/springframework/cloud/kubernetes/fabric8/configmap/polling/reload/BootstrapEnabledPollingReloadConfigMapMountIT.java
View File

@@ -111,7 +111,7 @@ public class BootstrapEnabledPollingReloadConfigMapMountIT {
// replace data in configmap and wait for k8s to pick it up
// our polling will detect that and restart the app
InputStream configMapStream = util.inputStream("mount/configmap-mount.yaml");
ConfigMap configMap = client.configMaps().load(configMapStream).get();
ConfigMap configMap = client.configMaps().load(configMapStream).item();
configMap.setData(Map.of("application.properties", "from.properties.key=as-mount-changed"));
client.configMaps().inNamespace("default").resource(configMap).createOrReplace();
@@ -127,10 +127,10 @@ public class BootstrapEnabledPollingReloadConfigMapMountIT {
InputStream ingressStream = util.inputStream("ingress.yaml");
InputStream configMapStream = util.inputStream("mount/configmap-mount.yaml");
Deployment deployment = client.apps().deployments().load(deploymentStream).get();
Service service = client.services().load(serviceStream).get();
Ingress ingress = client.network().v1().ingresses().load(ingressStream).get();
ConfigMap configMap = client.configMaps().load(configMapStream).get();
Deployment deployment = client.apps().deployments().load(deploymentStream).item();
Service service = client.services().load(serviceStream).item();
Ingress ingress = client.network().v1().ingresses().load(ingressStream).item();
ConfigMap configMap = client.configMaps().load(configMapStream).item();
List<EnvVar> existing = new ArrayList<>(
deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getEnv());

8
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap-polling-reload/src/test/java/org/springframework/cloud/kubernetes/fabric8/configmap/polling/reload/ConfigMapPollingReloadIT.java
View File

@@ -112,10 +112,10 @@ class ConfigMapPollingReloadIT {
InputStream ingressStream = util.inputStream("ingress.yaml");
InputStream configMapStream = util.inputStream("configmap.yaml");
Deployment deployment = client.apps().deployments().load(deploymentStream).get();
Service service = client.services().load(serviceStream).get();
Ingress ingress = client.network().v1().ingresses().load(ingressStream).get();
ConfigMap configMap = client.configMaps().load(configMapStream).get();
Deployment deployment = client.apps().deployments().load(deploymentStream).item();
Service service = client.services().load(serviceStream).item();
Ingress ingress = client.network().v1().ingresses().load(ingressStream).item();
ConfigMap configMap = client.configMaps().load(configMapStream).item();
List<EnvVar> existing = new ArrayList<>(
deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getEnv());

10
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap-polling-reload/src/test/java/org/springframework/cloud/kubernetes/fabric8/configmap/polling/reload/PollingReloadConfigMapMountIT.java
View File

@@ -115,7 +115,7 @@ class PollingReloadConfigMapMountIT {
// replace data in configmap and wait for k8s to pick it up
// our polling will detect that and restart the app
InputStream configMapStream = util.inputStream("mount/configmap-mount.yaml");
ConfigMap configMap = client.configMaps().load(configMapStream).get();
ConfigMap configMap = client.configMaps().load(configMapStream).item();
configMap.setData(Map.of("application.properties", "from.properties.key=as-mount-changed"));
client.configMaps().inNamespace("default").resource(configMap).createOrReplace();
@@ -131,10 +131,10 @@ class PollingReloadConfigMapMountIT {
InputStream ingressStream = util.inputStream("ingress.yaml");
InputStream configMapStream = util.inputStream("mount/configmap-mount.yaml");
Deployment deployment = client.apps().deployments().load(deploymentStream).get();
Service service = client.services().load(serviceStream).get();
Ingress ingress = client.network().v1().ingresses().load(ingressStream).get();
ConfigMap configMap = client.configMaps().load(configMapStream).get();
Deployment deployment = client.apps().deployments().load(deploymentStream).item();
Service service = client.services().load(serviceStream).item();
Ingress ingress = client.network().v1().ingresses().load(ingressStream).item();
ConfigMap configMap = client.configMaps().load(configMapStream).item();
List<EnvVar> existing = new ArrayList<>(
deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getEnv());

8
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap/src/test/java/org/springframework/cloud/kubernetes/fabric8/configmap/Fabric8ConfigMapIT.java
View File

@@ -90,10 +90,10 @@ class Fabric8ConfigMapIT {
InputStream ingressStream = util.inputStream("fabric8-ingress.yaml");
InputStream configMapStream = util.inputStream("fabric8-configmap.yaml");
Deployment deployment = client.apps().deployments().load(deploymentStream).get();
Service service = client.services().load(serviceStream).get();
Ingress ingress = client.network().v1().ingresses().load(ingressStream).get();
ConfigMap configMap = client.configMaps().load(configMapStream).get();
Deployment deployment = client.apps().deployments().load(deploymentStream).item();
Service service = client.services().load(serviceStream).item();
Ingress ingress = client.network().v1().ingresses().load(ingressStream).item();
ConfigMap configMap = client.configMaps().load(configMapStream).item();
if (phase.equals(Phase.CREATE)) {
util.createAndWait(NAMESPACE, configMap, null);

6
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery-with-bootstrap/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/bootstrap/Fabric8DiscoveryBootstrapIT.java
View File

@@ -107,7 +107,7 @@ class Fabric8DiscoveryBootstrapIT {
InputStream serviceStream = util.inputStream("fabric8-discovery-service.yaml");
InputStream ingressStream = util.inputStream("fabric8-discovery-ingress.yaml");
Deployment deployment = client.apps().deployments().load(deploymentStream).get();
Deployment deployment = client.apps().deployments().load(deploymentStream).item();
List<EnvVar> existing = new ArrayList<>(
deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getEnv());
@@ -118,8 +118,8 @@ class Fabric8DiscoveryBootstrapIT {
.withValue("DEBUG").build());
deployment.getSpec().getTemplate().getSpec().getContainers().get(0).setEnv(existing);
Service service = client.services().load(serviceStream).get();
Ingress ingress = client.network().v1().ingresses().load(ingressStream).get();
Service service = client.services().load(serviceStream).item();
Ingress ingress = client.network().v1().ingresses().load(ingressStream).item();
if (phase.equals(Phase.CREATE)) {
util.createAndWait(NAMESPACE, null, deployment, service, ingress, true);

6
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryClientHealthIT.java
View File

@@ -226,7 +226,7 @@ class Fabric8DiscoveryClientHealthIT {
InputStream serviceStream = util.inputStream("fabric8-discovery-service.yaml");
InputStream ingressStream = util.inputStream("fabric8-discovery-ingress.yaml");
Deployment deployment = client.apps().deployments().load(deploymentStream).get();
Deployment deployment = client.apps().deployments().load(deploymentStream).item();
List<EnvVar> envVars = new ArrayList<>(
deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getEnv());
@@ -265,8 +265,8 @@ class Fabric8DiscoveryClientHealthIT {
envVars.add(debugLevelForReactive);
}
Service service = client.services().load(serviceStream).get();
Ingress ingress = client.network().v1().ingresses().load(ingressStream).get();
Service service = client.services().load(serviceStream).item();
Ingress ingress = client.network().v1().ingresses().load(ingressStream).item();
if (disableBlocking) {
EnvVar disableBlockingEnvVar = new EnvVarBuilder().withName("SPRING_CLOUD_DISCOVERY_BLOCKING_ENABLED")

14
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryFilterIT.java
View File

@@ -208,7 +208,7 @@ class Fabric8DiscoveryFilterIT {
InputStream serviceStream = util.inputStream("fabric8-discovery-service.yaml");
InputStream ingressStream = util.inputStream("fabric8-discovery-ingress.yaml");
Deployment deployment = client.apps().deployments().load(deploymentStream).get();
Deployment deployment = client.apps().deployments().load(deploymentStream).item();
List<EnvVar> envVars = new ArrayList<>(
deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getEnv());
EnvVar namespaceAUat = new EnvVarBuilder().withName("SPRING_CLOUD_KUBERNETES_DISCOVERY_NAMESPACES_0")
@@ -226,17 +226,17 @@ class Fabric8DiscoveryFilterIT {
envVars.add(debug);
deployment.getSpec().getTemplate().getSpec().getContainers().get(0).setEnv(envVars);
Service service = client.services().load(serviceStream).get();
Ingress ingress = client.network().v1().ingresses().load(ingressStream).get();
Service service = client.services().load(serviceStream).item();
Ingress ingress = client.network().v1().ingresses().load(ingressStream).item();
if (phase.equals(Phase.CREATE)) {
client.rbac().clusterRoleBindings().resource(client.rbac().clusterRoleBindings().load(getAdminRole()).get())
.create();
client.rbac().clusterRoleBindings()
.resource(client.rbac().clusterRoleBindings().load(getAdminRole()).item()).create();
util.createAndWait(NAMESPACE, null, deployment, service, ingress, true);
}
else {
client.rbac().clusterRoleBindings().resource(client.rbac().clusterRoleBindings().load(getAdminRole()).get())
.delete();
client.rbac().clusterRoleBindings()
.resource(client.rbac().clusterRoleBindings().load(getAdminRole()).item()).delete();
util.deleteAndWait(NAMESPACE, deployment, service, ingress);
}

8
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryIT.java
View File

@@ -134,7 +134,7 @@ class Fabric8DiscoveryIT {
InputStream ingressStream = util.inputStream("fabric8-discovery-ingress.yaml");
InputStream externalNameServiceInputStream = util.inputStream("external-name-service.yaml");
Deployment deployment = client.apps().deployments().load(deploymentStream).get();
Deployment deployment = client.apps().deployments().load(deploymentStream).item();
List<EnvVar> existing = new ArrayList<>(
deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getEnv());
@@ -145,9 +145,9 @@ class Fabric8DiscoveryIT {
.withValue("DEBUG").build());
deployment.getSpec().getTemplate().getSpec().getContainers().get(0).setEnv(existing);
Service service = client.services().load(serviceStream).get();
Service externalNameService = client.services().load(externalNameServiceInputStream).get();
Ingress ingress = client.network().v1().ingresses().load(ingressStream).get();
Service service = client.services().load(serviceStream).item();
Service externalNameService = client.services().load(externalNameServiceInputStream).item();
Ingress ingress = client.network().v1().ingresses().load(ingressStream).item();
if (phase.equals(Phase.CREATE)) {
util.createAndWait(NAMESPACE, null, deployment, service, ingress, true);

14
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryNamespaceFilterIT.java
View File

@@ -121,7 +121,7 @@ class Fabric8DiscoveryNamespaceFilterIT {
InputStream serviceStream = util.inputStream("fabric8-discovery-service.yaml");
InputStream ingressStream = util.inputStream("fabric8-discovery-ingress.yaml");
Deployment deployment = client.apps().deployments().load(deploymentStream).get();
Deployment deployment = client.apps().deployments().load(deploymentStream).item();
List<EnvVar> envVars = new ArrayList<>(
deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getEnv());
EnvVar activeProfileProperty = new EnvVarBuilder().withName("SPRING_CLOUD_KUBERNETES_DISCOVERY_NAMESPACES_0")
@@ -129,17 +129,17 @@ class Fabric8DiscoveryNamespaceFilterIT {
envVars.add(activeProfileProperty);
deployment.getSpec().getTemplate().getSpec().getContainers().get(0).setEnv(envVars);
Service service = client.services().load(serviceStream).get();
Ingress ingress = client.network().v1().ingresses().load(ingressStream).get();
Service service = client.services().load(serviceStream).item();
Ingress ingress = client.network().v1().ingresses().load(ingressStream).item();
if (phase.equals(Phase.CREATE)) {
client.rbac().clusterRoleBindings().resource(client.rbac().clusterRoleBindings().load(getAdminRole()).get())
.create();
client.rbac().clusterRoleBindings()
.resource(client.rbac().clusterRoleBindings().load(getAdminRole()).item()).create();
util.createAndWait(NAMESPACE, null, deployment, service, ingress, true);
}
else {
client.rbac().clusterRoleBindings().resource(client.rbac().clusterRoleBindings().load(getAdminRole()).get())
.delete();
client.rbac().clusterRoleBindings()
.resource(client.rbac().clusterRoleBindings().load(getAdminRole()).item()).delete();
util.deleteAndWait(NAMESPACE, deployment, service, ingress);
}

6
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryPodMetadataIT.java
View File

@@ -131,7 +131,7 @@ class Fabric8DiscoveryPodMetadataIT {
InputStream serviceStream = util.inputStream("fabric8-discovery-service.yaml");
InputStream ingressStream = util.inputStream("fabric8-discovery-ingress.yaml");
Deployment deployment = client.apps().deployments().load(deploymentStream).get();
Deployment deployment = client.apps().deployments().load(deploymentStream).item();
List<EnvVar> existing = new ArrayList<>(
deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getEnv());
@@ -144,8 +144,8 @@ class Fabric8DiscoveryPodMetadataIT {
.withValue("DEBUG").build());
deployment.getSpec().getTemplate().getSpec().getContainers().get(0).setEnv(existing);
Service service = client.services().load(serviceStream).get();
Ingress ingress = client.network().v1().ingresses().load(ingressStream).get();
Service service = client.services().load(serviceStream).item();
Ingress ingress = client.network().v1().ingresses().load(ingressStream).item();
if (phase.equals(Phase.CREATE)) {
util.createAndWait(NAMESPACE, null, deployment, service, ingress, true);

6
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/client/loadbalancer/it/Fabric8ClientLoadbalancerIT.java
View File

@@ -134,7 +134,7 @@ public class Fabric8ClientLoadbalancerIT {
InputStream ingressStream = util
.inputStream("spring-cloud-kubernetes-fabric8-client-loadbalancer-ingress.yaml");
Deployment deployment = client.apps().deployments().load(deploymentStream).get();
Deployment deployment = client.apps().deployments().load(deploymentStream).item();
List<EnvVar> envVars = new ArrayList<>(
deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getEnv());
EnvVar activeProfileProperty = new EnvVarBuilder().withName("SPRING_CLOUD_KUBERNETES_LOADBALANCER_MODE")
@@ -142,8 +142,8 @@ public class Fabric8ClientLoadbalancerIT {
envVars.add(activeProfileProperty);
deployment.getSpec().getTemplate().getSpec().getContainers().get(0).setEnv(envVars);
Service service = client.services().load(serviceStream).get();
Ingress ingress = client.network().v1().ingresses().load(ingressStream).get();
Service service = client.services().load(serviceStream).item();
Ingress ingress = client.network().v1().ingresses().load(ingressStream).item();
if (phase.equals(Phase.CREATE)) {
util.createAndWait(NAMESPACE, null, deployment, service, ingress, true);

8
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-secrets-event-reload/src/test/java/org/springframework/cloud/kubernetes/fabric8/secrets/event/reload/DataChangesInSecretsReloadIT.java
View File

@@ -151,7 +151,7 @@ class DataChangesInSecretsReloadIT {
InputStream ingressStream = util.inputStream("ingress.yaml");
InputStream secretAsStream = util.inputStream("secret.yaml");
Deployment deployment = client.apps().deployments().load(deploymentStream).get();
Deployment deployment = client.apps().deployments().load(deploymentStream).item();
List<EnvVar> envVars = new ArrayList<>(
deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getEnv());
@@ -169,9 +169,9 @@ class DataChangesInSecretsReloadIT {
envVars.add(configMapsDisabledEnvVar);
deployment.getSpec().getTemplate().getSpec().getContainers().get(0).setEnv(envVars);
Service service = client.services().load(serviceStream).get();
Ingress ingress = client.network().v1().ingresses().load(ingressStream).get();
Secret secret = client.secrets().load(secretAsStream).get();
Service service = client.services().load(serviceStream).item();
Ingress ingress = client.network().v1().ingresses().load(ingressStream).item();
Secret secret = client.secrets().load(secretAsStream).item();
if (phase.equals(Phase.CREATE)) {
util.createAndWait(NAMESPACE, null, secret);

8
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-secrets-event-reload/src/test/java/org/springframework/cloud/kubernetes/fabric8/secrets/event/reload/SecretsEventsReloadIT.java
View File

@@ -147,10 +147,10 @@ class SecretsEventsReloadIT {
InputStream ingressStream = util.inputStream("ingress.yaml");
InputStream secretStream = util.inputStream("secret.yaml");
Deployment deployment = client.apps().deployments().load(deploymentStream).get();
Service service = client.services().load(serviceStream).get();
Ingress ingress = client.network().v1().ingresses().load(ingressStream).get();
Secret secret = client.secrets().load(secretStream).get();
Deployment deployment = client.apps().deployments().load(deploymentStream).item();
Service service = client.services().load(serviceStream).item();
Ingress ingress = client.network().v1().ingresses().load(ingressStream).item();
Secret secret = client.secrets().load(secretStream).item();
if (configMapsDisabled) {
List<EnvVar> envVars = new ArrayList<>(

6
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-simple-core/src/test/java/org/springframework/cloud/kubernetes/fabric8/core/SimpleCoreIT.java
View File

@@ -92,9 +92,9 @@ class SimpleCoreIT {
InputStream serviceStream = util.inputStream("simple-core-service.yaml");
InputStream ingressStream = util.inputStream("simple-core-ingress.yaml");
Deployment deployment = client.apps().deployments().load(deploymentStream).get();
Service service = client.services().load(serviceStream).get();
Ingress ingress = client.network().v1().ingresses().load(ingressStream).get();
Deployment deployment = client.apps().deployments().load(deploymentStream).item();
Service service = client.services().load(serviceStream).item();
Ingress ingress = client.network().v1().ingresses().load(ingressStream).item();
if (phase.equals(Phase.CREATE)) {
util.createAndWait(NAMESPACE, null, deployment, service, ingress, true);

6
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-istio-it/src/test/java/org/springframework/cloud/kubernetes/fabric8/istio/Fabric8IstioIT.java
View File

@@ -126,9 +126,9 @@ class Fabric8IstioIT {
InputStream serviceStream = util.inputStream("istio-service.yaml");
InputStream ingressStream = util.inputStream("istio-ingress.yaml");
Deployment deployment = client.apps().deployments().load(deploymentStream).get();
Service service = client.services().load(serviceStream).get();
Ingress ingress = client.network().v1().ingresses().load(ingressStream).get();
Deployment deployment = client.apps().deployments().load(deploymentStream).item();
Service service = client.services().load(serviceStream).item();
Ingress ingress = client.network().v1().ingresses().load(ingressStream).item();
if (phase.equals(Phase.CREATE)) {
util.createAndWait(NAMESPACE, null, deployment, service, ingress, true);

28
spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/fabric8_client/Util.java
View File

@@ -24,7 +24,6 @@ import java.util.Set;
import java.util.concurrent.TimeUnit;
import io.fabric8.kubernetes.api.model.ConfigMap;
import io.fabric8.kubernetes.api.model.LoadBalancerIngress;
import io.fabric8.kubernetes.api.model.NamespaceBuilder;
import io.fabric8.kubernetes.api.model.Pod;
import io.fabric8.kubernetes.api.model.Secret;
@@ -32,6 +31,7 @@ import io.fabric8.kubernetes.api.model.Service;
import io.fabric8.kubernetes.api.model.ServiceAccount;
import io.fabric8.kubernetes.api.model.apps.Deployment;
import io.fabric8.kubernetes.api.model.networking.v1.Ingress;
import io.fabric8.kubernetes.api.model.networking.v1.IngressLoadBalancerIngress;
import io.fabric8.kubernetes.api.model.rbac.ClusterRole;
import io.fabric8.kubernetes.api.model.rbac.Role;
import io.fabric8.kubernetes.api.model.rbac.RoleBinding;
@@ -110,8 +110,8 @@ public final class Util {
public void busybox(String namespace, Phase phase) {
InputStream deploymentStream = inputStream("busybox/deployment.yaml");
InputStream serviceStream = inputStream("busybox/service.yaml");
Deployment deployment = client.apps().deployments().load(deploymentStream).get();
Service service = client.services().load(serviceStream).get();
Deployment deployment = client.apps().deployments().load(deploymentStream).item();
Service service = client.services().load(serviceStream).item();
if (phase.equals(Phase.CREATE)) {
createAndWait(namespace, "busybox", deployment, service, null, false);
@@ -187,19 +187,19 @@ public final class Util {
InputStream serviceAccountAsStream = inputStream("cluster/service-account.yaml");
InputStream roleBindingAsStream = inputStream("cluster/role-binding.yaml");
ClusterRole clusterRole = client.rbac().clusterRoles().load(clusterRoleBindingAsStream).get();
ClusterRole clusterRole = client.rbac().clusterRoles().load(clusterRoleBindingAsStream).item();
if (client.rbac().clusterRoles().withName(clusterRole.getMetadata().getName()).get() == null) {
client.rbac().clusterRoles().resource(clusterRole).create();
}
ServiceAccount serviceAccountFromStream = client.serviceAccounts().load(serviceAccountAsStream).get();
ServiceAccount serviceAccountFromStream = client.serviceAccounts().load(serviceAccountAsStream).item();
serviceAccountFromStream.getMetadata().setNamespace(serviceAccountNamespace);
if (client.serviceAccounts().inNamespace(serviceAccountNamespace)
.withName(serviceAccountFromStream.getMetadata().getName()).get() == null) {
client.serviceAccounts().inNamespace(serviceAccountNamespace).resource(serviceAccountFromStream).create();
}
RoleBinding roleBindingFromStream = client.rbac().roleBindings().load(roleBindingAsStream).get();
RoleBinding roleBindingFromStream = client.rbac().roleBindings().load(roleBindingAsStream).item();
namespaces.forEach(namespace -> {
roleBindingFromStream.getMetadata().setNamespace(namespace);
@@ -260,9 +260,9 @@ public final class Util {
InputStream serviceStream = inputStream("wiremock/wiremock-service.yaml");
InputStream ingressStream = inputStream("wiremock/wiremock-ingress.yaml");
Deployment deployment = client.apps().deployments().load(deploymentStream).get();
Service service = client.services().load(serviceStream).get();
Ingress ingress = client.network().v1().ingresses().load(ingressStream).get();
Deployment deployment = client.apps().deployments().load(deploymentStream).item();
Service service = client.services().load(serviceStream).item();
Ingress ingress = client.network().v1().ingresses().load(ingressStream).item();
if (phase.equals(Phase.CREATE)) {
deployment.getMetadata().setNamespace(namespace);
@@ -342,7 +342,7 @@ public final class Util {
return false;
}
List<LoadBalancerIngress> loadBalancerIngress = inner.getStatus().getLoadBalancer().getIngress();
List<IngressLoadBalancerIngress> loadBalancerIngress = inner.getStatus().getLoadBalancer().getIngress();
if (loadBalancerIngress == null || loadBalancerIngress.isEmpty()) {
LOG.info("ingress : " + ingressName + " not ready yet (loadbalancer ingress not yet present)");
return false;
@@ -368,19 +368,21 @@ public final class Util {
private void innerSetup(String namespace, InputStream serviceAccountAsStream, InputStream roleBindingAsStream,
InputStream roleAsStream) {
ServiceAccount serviceAccountFromStream = client.serviceAccounts().load(serviceAccountAsStream).get();
ServiceAccount serviceAccountFromStream = client.serviceAccounts().inNamespace(namespace)
.load(serviceAccountAsStream).item();
if (client.serviceAccounts().inNamespace(namespace).withName(serviceAccountFromStream.getMetadata().getName())
.get() == null) {
client.serviceAccounts().inNamespace(namespace).resource(serviceAccountFromStream).create();
}
RoleBinding roleBindingFromStream = client.rbac().roleBindings().load(roleBindingAsStream).get();
RoleBinding roleBindingFromStream = client.rbac().roleBindings().inNamespace(namespace)
.load(roleBindingAsStream).item();
if (client.rbac().roleBindings().inNamespace(namespace).withName(roleBindingFromStream.getMetadata().getName())
.get() == null) {
client.rbac().roleBindings().inNamespace(namespace).resource(roleBindingFromStream).create();
}
Role roleFromStream = client.rbac().roles().load(roleAsStream).get();
Role roleFromStream = client.rbac().roles().inNamespace(namespace).load(roleAsStream).item();
if (client.rbac().roles().inNamespace(namespace).withName(roleFromStream.getMetadata().getName())
.get() == null) {
client.rbac().roles().inNamespace(namespace).resource(roleFromStream).create();