Merge branch 'main' into dependabot/maven/main/io.fabric8-kubernetes-client-bom-7.4.0

Signed-off-by: Ryan Baxter <[email protected]>

Author: ryanjbaxter

.github/workflows/maven.yaml

@@ -41,7 +41,7 @@ jobs:
         uses: ./.github/workflows/composites/cache
 
       - name: Show caches
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           script: |
             const caches = await github.rest.actions.getActionsCacheList({

docs/modules/ROOT/pages/property-source-config/configmap-propertysource.adoc

@@ -575,12 +575,12 @@ If you want your application to fail the start-up process in such cases, you can
 
 [#config-map-retry]
 You can also make your application retry loading `ConfigMap` property sources on a failure. First, you need to
-set `spring.cloud.kubernetes.config.fail-fast=true`. Then you need to add `spring-retry` 
-and `spring-boot-starter-aop` to your classpath. You can configure retry properties such as
+set `spring.cloud.kubernetes.config.fail-fast=true`. Then you need to add `spring-retry`
+and `spring-boot-starter-aspectj` to your classpath. You can configure retry properties such as
 the maximum number of attempts, backoff options like initial interval, multiplier, max interval by setting the
 `spring.cloud.kubernetes.config.retry.*` properties.
 
-NOTE: If you already have `spring-retry` and `spring-boot-starter-aop` on the classpath for some reason
+NOTE: If you already have `spring-retry` and `spring-boot-starter-aspectj` on the classpath for some reason
 and want to enable fail-fast, but do not want retry to be enabled; you can disable retry for `ConfigMap` `PropertySources`
 by setting `spring.cloud.kubernetes.config.retry.enabled=false`.
 

docs/modules/ROOT/pages/property-source-config/secrets-propertysource.adoc

@@ -11,12 +11,12 @@ When enabled, the `Fabric8SecretsPropertySource` looks up Kubernetes for `Secret
 . Named after the application (as defined by `spring.application.name`)
 . Matching some labels
 
-*Note:* 
+*Note:*
 
 By default, consuming Secrets through the API (points 2 and 3 above) *is not enabled* for security reasons. The permission 'list' on secrets allows clients to inspect secrets values in the specified namespace.
 Further, we recommend that containers share secrets through mounted volumes.
 
-If you enable consuming Secrets through the API, we recommend that you limit access to Secrets by using an authorization policy, such as RBAC. 
+If you enable consuming Secrets through the API, we recommend that you limit access to Secrets by using an authorization policy, such as RBAC.
 For more information about risks and best practices when consuming Secrets through the API refer to https://kubernetes.io/docs/concepts/configuration/secret/#best-practices[this doc].
 
 If the secrets are found, their data is made available to the application.
@@ -135,16 +135,16 @@ the `Secret` named `s1` would be looked up in the namespace that the application
 See xref:property-source-config/namespace-resolution.adoc[namespace-resolution] to get a better understanding of how the namespace
 of the application is resolved.
 
-xref:property-source-config/configmap-propertysource.adoc#config-map-fail-fast[Similar to the `ConfigMaps`]; if you want your application to fail to start 
+xref:property-source-config/configmap-propertysource.adoc#config-map-fail-fast[Similar to the `ConfigMaps`]; if you want your application to fail to start
 when it is unable to load `Secrets` property sources, you can set `spring.cloud.kubernetes.secrets.fail-fast=true`.
 
 It is also possible to enable retry for `Secret` property sources xref:property-source-config/configmap-propertysource.adoc#config-map-retry[like the `ConfigMaps`].
-As with the `ConfigMap` property sources, first you need to set `spring.cloud.kubernetes.secrets.fail-fast=true`. 
-Then you need to add `spring-retry` and `spring-boot-starter-aop` to your classpath. 
+As with the `ConfigMap` property sources, first you need to set `spring.cloud.kubernetes.secrets.fail-fast=true`.
+Then you need to add `spring-retry` and `spring-boot-starter-aspectj` to your classpath.
 Retry behavior of the `Secret` property sources can be configured by setting the `spring.cloud.kubernetes.secrets.retry.*`
 properties.
 
-NOTE: If you already have `spring-retry` and `spring-boot-starter-aop` on the classpath for some reason
+NOTE: If you already have `spring-retry` and `spring-boot-starter-aspectj` on the classpath for some reason
 and want to enable fail-fast, but do not want retry to be enabled; you can disable retry for `Secrets` `PropertySources`
 by setting `spring.cloud.kubernetes.secrets.retry.enabled=false`.
 

docs/package.json

@@ -1,7 +1,7 @@
 {
 	"dependencies": {
 		"antora": "3.2.0-alpha.9",
-		"@antora/atlas-extension": "1.0.0-alpha.2",
+		"@antora/atlas-extension": "1.0.0-alpha.5",
 		"@antora/collector-extension": "1.0.2",
 		"@asciidoctor/tabs": "1.0.0-beta.6",
 		"@springio/antora-extensions": "1.14.7",

spring-cloud-kubernetes-client-autoconfig/src/main/java/org/springframework/cloud/kubernetes/client/KubernetesClientPodUtils.java

@@ -104,7 +104,7 @@ private V1Pod internalGetPod() {
 			if (isServiceHostEnvVarPresent() && isHostNameEnvVarPresent() && isServiceAccountFound()) {
 				LOG.debug("reading pod in namespace : " + namespace);
 				// The hostname of your pod is typically also its name.
-				return client.readNamespacedPod(hostName, namespace, null);
+				return client.readNamespacedPod(hostName, namespace).execute();
 			}
 		}
 		catch (Throwable t) {

spring-cloud-kubernetes-client-autoconfig/src/main/resources/META-INF/spring.factories

@@ -1,2 +1,2 @@
-org.springframework.boot.env.EnvironmentPostProcessor=\
+org.springframework.boot.EnvironmentPostProcessor=\
 org.springframework.cloud.kubernetes.client.profile.KubernetesClientProfileEnvironmentPostProcessor

spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/ActuatorEnabledFailFastExceptionTest.java

@@ -69,7 +69,7 @@ void afterEach() {
 	void test() throws ApiException {
 		Health health = healthIndicator.health(true);
 		Assertions.assertThat(Status.DOWN).isSameAs(health.getStatus());
-		Mockito.verify(coreV1Api).readNamespacedPod("host", "my-namespace", null);
+		Mockito.verify(coreV1Api).readNamespacedPod("host", "my-namespace");
 	}
 
 	private static void mocks() {
@@ -103,7 +103,7 @@ KubernetesClientPodUtils kubernetesPodUtils() throws ApiException {
 
 			mocks();
 
-			Mockito.when(coreV1Api.readNamespacedPod("host", "my-namespace", null))
+			Mockito.when(coreV1Api.readNamespacedPod("host", "my-namespace"))
 				.thenThrow(new RuntimeException("just because"));
 
 			return new KubernetesClientPodUtils(coreV1Api, "my-namespace", FAIL_FAST);

spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/ActuatorEnabledNoFailFastExceptionTest.java

@@ -72,7 +72,7 @@ void afterEach() {
 	void test() throws ApiException {
 		Health health = healthIndicator.health(true);
 		Assertions.assertThat(Status.UP).isSameAs(health.getStatus());
-		Mockito.verify(coreV1Api).readNamespacedPod("host", "my-namespace", null);
+		Mockito.verify(coreV1Api).readNamespacedPod("host", "my-namespace");
 	}
 
 	private static void mocks() {
@@ -106,7 +106,7 @@ KubernetesClientPodUtils kubernetesPodUtils() throws ApiException {
 
 			mocks();
 
-			Mockito.when(coreV1Api.readNamespacedPod("host", "my-namespace", null))
+			Mockito.when(coreV1Api.readNamespacedPod("host", "my-namespace"))
 				.thenThrow(new RuntimeException("just because"));
 
 			return new KubernetesClientPodUtils(coreV1Api, "my-namespace", FAIL_FAST);

spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/KubernetesClientPodUtilsTests.java

@@ -35,6 +35,8 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 /**
  * @author wind57
@@ -55,15 +57,15 @@ class KubernetesClientPodUtilsTests {
 
 	private static final V1Pod POD = new V1Pod();
 
-	private final CoreV1Api client = Mockito.mock(CoreV1Api.class);
+	private final CoreV1Api client = mock(CoreV1Api.class);
 
-	private final Path tokenPath = Mockito.mock(Path.class);
+	private final Path tokenPath = mock(Path.class);
 
-	private final File tokenFile = Mockito.mock(File.class);
+	private final File tokenFile = mock(File.class);
 
-	private final Path certPath = Mockito.mock(Path.class);
+	private final Path certPath = mock(Path.class);
 
-	private final File certFile = Mockito.mock(File.class);
+	private final File certFile = mock(File.class);
 
 	private MockedStatic<EnvReader> envReader;
 
@@ -156,19 +158,21 @@ private void mockHostname(String name) {
 	}
 
 	private void mockTokenPath(boolean result) {
-		Mockito.when(tokenPath.toFile()).thenReturn(tokenFile);
-		Mockito.when(tokenFile.exists()).thenReturn(result);
+		when(tokenPath.toFile()).thenReturn(tokenFile);
+		when(tokenFile.exists()).thenReturn(result);
 		paths.when(() -> Paths.get(SERVICE_ACCOUNT_TOKEN_PATH)).thenReturn(tokenPath);
 	}
 
 	private void mockCertPath(boolean result) {
-		Mockito.when(certPath.toFile()).thenReturn(certFile);
-		Mockito.when(certFile.exists()).thenReturn(result);
+		when(certPath.toFile()).thenReturn(certFile);
+		when(certFile.exists()).thenReturn(result);
 		paths.when(() -> Paths.get(SERVICE_ACCOUNT_CERT_PATH)).thenReturn(certPath);
 	}
 
 	private void mockPodResult() throws ApiException {
-		Mockito.when(client.readNamespacedPod(POD_HOSTNAME, "namespace", null)).thenReturn(POD);
+		CoreV1Api.APIreadNamespacedPodRequest request = mock(CoreV1Api.APIreadNamespacedPodRequest.class);
+		when(request.execute()).thenReturn(POD);
+		when(client.readNamespacedPod(POD_HOSTNAME, "namespace")).thenReturn(request);
 	}
 
 }

spring-cloud-kubernetes-client-config/pom.xml

@@ -59,12 +59,6 @@
 			<artifactId>spring-retry</artifactId>
 			<optional>true</optional>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-aop</artifactId>
-			<optional>true</optional>
-		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-health</artifactId>
@@ -107,7 +101,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-aop</artifactId>
+			<artifactId>spring-boot-starter-aspectj</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>