Upgrade to Fabric8 6.7.2 (#1373)

Co-authored-by: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com>
spring-cloud · Jun 22, 2023 · 668c04d · 668c04d
1 parent a40c5be
commit 668c04d
Show file tree

Hide file tree

Showing 28 changed files with 106 additions and 103 deletions.
diff --git a/...rc/main/java/org/springframework/cloud/kubernetes/commons/KubernetesClientProperties.java b/...rc/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
@@ -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>

diff --git a/.../src/main/java/org/springframework/cloud/kubernetes/fabric8/Fabric8AutoConfiguration.java b/.../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/...g/springframework/cloud/kubernetes/fabric8/Fabric8UserAgentDefaultConfigurationTests.java b/...g/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/...framework/cloud/kubernetes/fabric8/config/Fabric8ConfigMapPropertySourceLocatorTests.java b/...framework/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/.../springframework/cloud/kubernetes/fabric8/config/Fabric8ConfigMapPropertySourceTests.java b/.../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/...ngframework/cloud/kubernetes/fabric8/config/Fabric8SecretsPropertySourceLocatorTests.java b/...ngframework/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/...pringframework/cloud/kubernetes/fabric8/config/Fabric8SecretsPropertySourceMockTests.java b/...pringframework/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/...ava/org/springframework/cloud/kubernetes/fabric8/catalog/watch/Fabric8CatalogWatchIT.java b/...ava/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/...framework/cloud/kubernetes/fabric8/catalog/watch/Fabric8CatalogWatchWithNamespacesIT.java b/...framework/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<EnvVar> 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/...ringframework/cloud/kubernetes/fabric8/configmap/event/reload/ConfigMapEventReloadIT.java b/...ringframework/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<EnvVar> 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/...ework/cloud/kubernetes/fabric8/configmap/event/reload/DataChangesInConfigMapReloadIT.java b/...ework/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<EnvVar> 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/...netes/fabric8/configmap/polling/reload/BootstrapEnabledPollingReloadConfigMapMountIT.java b/...netes/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<EnvVar> existing = new ArrayList<>(
 				deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getEnv());

diff --git a/...framework/cloud/kubernetes/fabric8/configmap/polling/reload/ConfigMapPollingReloadIT.java b/...framework/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<EnvVar> existing = new ArrayList<>(
 				deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getEnv());

diff --git a/...work/cloud/kubernetes/fabric8/configmap/polling/reload/PollingReloadConfigMapMountIT.java b/...work/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<EnvVar> existing = new ArrayList<>(
 				deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getEnv());

diff --git a/.../test/java/org/springframework/cloud/kubernetes/fabric8/configmap/Fabric8ConfigMapIT.java b/.../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/...ngframework/cloud/kubernetes/fabric8/discovery/bootstrap/Fabric8DiscoveryBootstrapIT.java b/...ngframework/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<EnvVar> 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/...rg/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryClientHealthIT.java b/...rg/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<EnvVar> 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/...java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryFilterIT.java b/...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<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 @@ 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);
 		}