diff --git a/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/KubernetesClientProperties.java b/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/KubernetesClientProperties.java
index d367217cfe..7ffa0da371 100644
--- a/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/KubernetesClientProperties.java
+++ b/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/KubernetesClientProperties.java
@@ -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) {
diff --git a/spring-cloud-kubernetes-dependencies/pom.xml b/spring-cloud-kubernetes-dependencies/pom.xml
index 87fbc2bc95..911ebbf11a 100644
--- a/spring-cloud-kubernetes-dependencies/pom.xml
+++ b/spring-cloud-kubernetes-dependencies/pom.xml
@@ -33,7 +33,7 @@
Spring Cloud Kubernetes Dependencies
0.13.0
- 6.2.0
+ 6.7.2
17.0.2
2.26.3
4.4
diff --git a/spring-cloud-kubernetes-fabric8-autoconfig/src/main/java/org/springframework/cloud/kubernetes/fabric8/Fabric8AutoConfiguration.java b/spring-cloud-kubernetes-fabric8-autoconfig/src/main/java/org/springframework/cloud/kubernetes/fabric8/Fabric8AutoConfiguration.java
index d5a277e8e6..c77246fa7e 100644
--- a/spring-cloud-kubernetes-fabric8-autoconfig/src/main/java/org/springframework/cloud/kubernetes/fabric8/Fabric8AutoConfiguration.java
+++ b/spring-cloud-kubernetes-fabric8-autoconfig/src/main/java/org/springframework/cloud/kubernetes/fabric8/Fabric8AutoConfiguration.java
@@ -86,14 +86,15 @@ public Config kubernetesClientConfig(KubernetesClientProperties kubernetesClient
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)) {
diff --git a/spring-cloud-kubernetes-fabric8-autoconfig/src/test/java/org/springframework/cloud/kubernetes/fabric8/Fabric8UserAgentDefaultConfigurationTests.java b/spring-cloud-kubernetes-fabric8-autoconfig/src/test/java/org/springframework/cloud/kubernetes/fabric8/Fabric8UserAgentDefaultConfigurationTests.java
index 400a32904e..43e7069091 100644
--- a/spring-cloud-kubernetes-fabric8-autoconfig/src/test/java/org/springframework/cloud/kubernetes/fabric8/Fabric8UserAgentDefaultConfigurationTests.java
+++ b/spring-cloud-kubernetes-fabric8-autoconfig/src/test/java/org/springframework/cloud/kubernetes/fabric8/Fabric8UserAgentDefaultConfigurationTests.java
@@ -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");
}
}
diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8ConfigMapPropertySourceLocatorTests.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8ConfigMapPropertySourceLocatorTests.java
index 547b07c441..ae101846df 100644
--- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8ConfigMapPropertySourceLocatorTests.java
+++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8ConfigMapPropertySourceLocatorTests.java
@@ -57,7 +57,7 @@ void locateShouldThrowExceptionOnFailureWhenFailFastIsEnabled() {
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
diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8ConfigMapPropertySourceTests.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8ConfigMapPropertySourceTests.java
index 3b3095a079..3f5c337f1a 100644
--- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8ConfigMapPropertySourceTests.java
+++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8ConfigMapPropertySourceTests.java
@@ -57,7 +57,7 @@ void constructorShouldThrowExceptionOnFailureWhenFailFastIsEnabled() {
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
diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8SecretsPropertySourceLocatorTests.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8SecretsPropertySourceLocatorTests.java
index 24c771e312..c55bdd6cd6 100644
--- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8SecretsPropertySourceLocatorTests.java
+++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8SecretsPropertySourceLocatorTests.java
@@ -57,7 +57,7 @@ void locateShouldThrowExceptionOnFailureWhenFailFastIsEnabled() {
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
diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8SecretsPropertySourceMockTests.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8SecretsPropertySourceMockTests.java
index d4c03b27b3..089a1a4f1c 100644
--- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8SecretsPropertySourceMockTests.java
+++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8SecretsPropertySourceMockTests.java
@@ -69,7 +69,7 @@ void labeledStrategyShouldThrowExceptionOnFailureWhenFailFastIsEnabled() {
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
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/fabric8/catalog/watch/Fabric8CatalogWatchIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/fabric8/catalog/watch/Fabric8CatalogWatchIT.java
index 2b7776d8bd..f023e43343 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/fabric8/catalog/watch/Fabric8CatalogWatchIT.java
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/fabric8/catalog/watch/Fabric8CatalogWatchIT.java
@@ -202,10 +202,10 @@ private static void app(boolean useEndpointSlices, Phase phase) {
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);
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/fabric8/catalog/watch/Fabric8CatalogWatchWithNamespacesIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/fabric8/catalog/watch/Fabric8CatalogWatchWithNamespacesIT.java
index e2250a0055..ca9e353156 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/fabric8/catalog/watch/Fabric8CatalogWatchWithNamespacesIT.java
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/fabric8/catalog/watch/Fabric8CatalogWatchWithNamespacesIT.java
@@ -219,8 +219,8 @@ private static void app(boolean useEndpointSlices, Phase phase) {
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 envVars = new ArrayList<>(
deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getEnv());
@@ -233,8 +233,8 @@ private static void app(boolean useEndpointSlices, Phase phase) {
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,
diff --git a/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 b/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
index 59b2f624f0..f77ed304f1 100644
--- a/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
+++ b/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
@@ -295,7 +295,7 @@ private static void manifests(String activeProfile, Phase phase, boolean secrets
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 envVars = new ArrayList<>(
deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getEnv());
@@ -312,11 +312,11 @@ private static void manifests(String activeProfile, Phase phase, boolean secrets
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);
diff --git a/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 b/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
index 7af428c97e..577352ad1e 100644
--- a/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
+++ b/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
@@ -154,7 +154,7 @@ private static void manifests(Phase phase) {
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 envVars = new ArrayList<>(
deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getEnv());
@@ -172,9 +172,9 @@ private static void manifests(Phase phase) {
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);
diff --git a/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 b/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
index c5f3d1ebe3..f51ab2f832 100644
--- a/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
+++ b/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
@@ -111,7 +111,7 @@ void test() {
// 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 @@ private static void manifests(Phase phase) {
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 existing = new ArrayList<>(
deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getEnv());
diff --git a/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 b/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
index 0c14ac1247..e8de622488 100644
--- a/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
+++ b/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
@@ -112,10 +112,10 @@ private static void manifests(Phase phase) {
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 existing = new ArrayList<>(
deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getEnv());
diff --git a/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 b/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
index 5675b06c1c..6b32b38534 100644
--- a/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
+++ b/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
@@ -115,7 +115,7 @@ void test() {
// 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 @@ private static void manifests(Phase phase) {
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 existing = new ArrayList<>(
deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getEnv());
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap/src/test/java/org/springframework/cloud/kubernetes/fabric8/configmap/Fabric8ConfigMapIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap/src/test/java/org/springframework/cloud/kubernetes/fabric8/configmap/Fabric8ConfigMapIT.java
index 0d3c4cd308..75dfd7175f 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap/src/test/java/org/springframework/cloud/kubernetes/fabric8/configmap/Fabric8ConfigMapIT.java
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap/src/test/java/org/springframework/cloud/kubernetes/fabric8/configmap/Fabric8ConfigMapIT.java
@@ -90,10 +90,10 @@ private static void manifests(Phase phase) {
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);
diff --git a/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 b/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
index a06f6fd670..98c37c7224 100644
--- a/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
+++ b/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
@@ -107,7 +107,7 @@ private static void manifests(Phase phase) {
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 existing = new ArrayList<>(
deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getEnv());
@@ -118,8 +118,8 @@ private static void manifests(Phase phase) {
.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);
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryClientHealthIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryClientHealthIT.java
index 545a9e62a5..bfe7b105a9 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryClientHealthIT.java
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryClientHealthIT.java
@@ -226,7 +226,7 @@ private static void manifests(boolean disableReactive, boolean disableBlocking,
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 envVars = new ArrayList<>(
deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getEnv());
@@ -265,8 +265,8 @@ private static void manifests(boolean disableReactive, boolean disableBlocking,
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")
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryFilterIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryFilterIT.java
index df958c16c4..0eb586b7e7 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryFilterIT.java
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryFilterIT.java
@@ -208,7 +208,7 @@ private static void manifests(Phase phase, String serviceFilter) {
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 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 @@ private static void manifests(Phase phase, String serviceFilter) {
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);
}
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryIT.java
index a82033fdd2..345805db6b 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryIT.java
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryIT.java
@@ -134,7 +134,7 @@ private static void manifests(Phase phase) {
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 existing = new ArrayList<>(
deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getEnv());
@@ -145,9 +145,9 @@ private static void manifests(Phase phase) {
.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);
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryNamespaceFilterIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryNamespaceFilterIT.java
index 3cc03d2ffb..aceb4c9178 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryNamespaceFilterIT.java
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryNamespaceFilterIT.java
@@ -121,7 +121,7 @@ private static void manifests(Phase phase) {
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 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 @@ private static void manifests(Phase phase) {
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);
}
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryPodMetadataIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryPodMetadataIT.java
index 1c37d3806b..2eab005dc2 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryPodMetadataIT.java
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryPodMetadataIT.java
@@ -131,7 +131,7 @@ private static void manifests(Phase phase) {
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 existing = new ArrayList<>(
deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getEnv());
@@ -144,8 +144,8 @@ private static void manifests(Phase phase) {
.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);
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/client/loadbalancer/it/Fabric8ClientLoadbalancerIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/client/loadbalancer/it/Fabric8ClientLoadbalancerIT.java
index 006e96547d..c28598a7af 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/client/loadbalancer/it/Fabric8ClientLoadbalancerIT.java
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/client/loadbalancer/it/Fabric8ClientLoadbalancerIT.java
@@ -134,7 +134,7 @@ private static void manifests(String type, Phase phase) {
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 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 @@ private static void manifests(String type, Phase phase) {
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);
diff --git a/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 b/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
index ec04224098..b258d54a85 100644
--- a/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
+++ b/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
@@ -151,7 +151,7 @@ private static void manifests(Phase phase) {
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 envVars = new ArrayList<>(
deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getEnv());
@@ -169,9 +169,9 @@ private static void manifests(Phase phase) {
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);
diff --git a/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 b/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
index ad845840ab..7ac3e7746a 100644
--- a/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
+++ b/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
@@ -147,10 +147,10 @@ private static void manifests(Phase phase, boolean configMapsDisabled) {
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 envVars = new ArrayList<>(
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-simple-core/src/test/java/org/springframework/cloud/kubernetes/fabric8/core/SimpleCoreIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-simple-core/src/test/java/org/springframework/cloud/kubernetes/fabric8/core/SimpleCoreIT.java
index 2cfc1c5d82..a21842a6a1 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-simple-core/src/test/java/org/springframework/cloud/kubernetes/fabric8/core/SimpleCoreIT.java
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-simple-core/src/test/java/org/springframework/cloud/kubernetes/fabric8/core/SimpleCoreIT.java
@@ -92,9 +92,9 @@ private static void manifests(Phase phase) {
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);
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-istio-it/src/test/java/org/springframework/cloud/kubernetes/fabric8/istio/Fabric8IstioIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-istio-it/src/test/java/org/springframework/cloud/kubernetes/fabric8/istio/Fabric8IstioIT.java
index 43a2994423..cdc3f91dca 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-istio-it/src/test/java/org/springframework/cloud/kubernetes/fabric8/istio/Fabric8IstioIT.java
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-istio-it/src/test/java/org/springframework/cloud/kubernetes/fabric8/istio/Fabric8IstioIT.java
@@ -126,9 +126,9 @@ private static void manifests(Phase phase) {
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);
diff --git a/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/fabric8_client/Util.java b/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/fabric8_client/Util.java
index 748f6203d9..982b780357 100644
--- a/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/fabric8_client/Util.java
+++ b/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/fabric8_client/Util.java
@@ -24,7 +24,6 @@
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.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 void createAndWait(String namespace, String name, @Nullable Deployment de
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 void setUpClusterWide(String serviceAccountNamespace, Set namespa
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 void wiremock(String namespace, String path, Phase phase) {
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 void waitForIngress(String namespace, Ingress ingress) {
return false;
}
- List loadBalancerIngress = inner.getStatus().getLoadBalancer().getIngress();
+ List 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 void waitForIngress(String namespace, Ingress ingress) {
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();