Bumping versions

README.adoc

@@ -2235,6 +2235,19 @@ The generated eclipse projects can be imported by selecting `import existing pro
 from the `file` menu.
 
 
+=== Building Docker Images On ARM64
+
+If you run the Spring Cloud Kuberentes build on an ARM64 machine the docker images
+used for the integration tests will fail to run due to using the wrong architecture.
+This is because the Paketo build pack does not yet support ARM64.  To work around this you
+can run the build by passing `-Dspring-boot.build-image.builder=dashaun/builder:tiny` to Maven.
+
+For example:
+```
+./mvnw clean install -Dspring-boot.build-image.builder=dashaun/builder:tiny
+```
+
+
 == Contributing
 
 :spring-cloud-build-branch: master

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

@@ -33,9 +33,9 @@ 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, @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,
+		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) {
 
 	/**

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

@@ -92,8 +92,9 @@ public Config kubernetesClientConfig(KubernetesClientProperties kubernetesClient
 				.withProxyUsername(or(kubernetesClientProperties.proxyUsername(), base.getProxyUsername()))
 				.withProxyPassword(or(kubernetesClientProperties.proxyPassword(), base.getProxyPassword()))
 				.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
+				// 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);