Merge branch 'main' of https://github.com/spring-cloud/spring-cloud-kubernetes

wind57 · wind57 · commit c416eea2789f · 2024-10-01T15:46:33.000+03:00
diff --git a/.github/workflows/composites/restore-docker-images/action.yaml b/.github/workflows/composites/restore-docker-images/action.yaml
@@ -29,8 +29,8 @@ runs:
       uses: actions/cache/save@v4
       if: steps.images-cache.outputs.cache-hit != 'true'
       with:
-        path: |
-          /tmp/docker/images
+        path: /tmp/docker/images
+        key: docker-images-github-cache-${{ hashFiles('**/current-images.txt') }}
 
     - name: print images
       shell: bash
diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml
@@ -48,9 +48,7 @@ jobs:
               owner: context.repo.owner,
               repo: context.repo.repo,
             })
-            for (const cache of caches.data.actions_caches) {
-              console.log(cache)
-            }  
+            console.log(caches.data)
 
       - name: maven build with dry-run for tests
         uses: ./.github/workflows/composites/maven-build-with-dry-run-for-tests
diff --git a/pom.xml b/pom.xml
@@ -311,7 +311,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-enforcer-plugin</artifactId>
-						<version>1.3.1</version>
+						<version>1.4.1</version>
 						<executions>
 							<execution>
 								<id>enforce-no-snapshots</id>
diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/pom.xml b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/pom.xml
@@ -13,7 +13,7 @@
 
 	<properties>
 		<docker.registry.organization>springcloud</docker.registry.organization>
-		<plexus-archiver.version>4.8.0</plexus-archiver.version>
+		<plexus-archiver.version>4.10.0</plexus-archiver.version>
 	</properties>
 
 	<dependencies>
diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/pom.xml b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/pom.xml
@@ -13,7 +13,7 @@
 
 	<properties>
 		<docker.registry.organization>springcloud</docker.registry.organization>
-		<plexus-archiver.version>4.8.0</plexus-archiver.version>
+		<plexus-archiver.version>4.10.0</plexus-archiver.version>
 	</properties>
 
 	<dependencies>
diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/pom.xml b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/pom.xml
@@ -13,7 +13,7 @@
 
 	<properties>
 		<docker.registry.organization>springcloud</docker.registry.organization>
-		<plexus-archiver.version>4.8.0</plexus-archiver.version>
+		<plexus-archiver.version>4.10.0</plexus-archiver.version>
 	</properties>
 
 	<dependencies>
diff --git a/spring-cloud-kubernetes-dependencies/pom.xml b/spring-cloud-kubernetes-dependencies/pom.xml
@@ -32,7 +32,7 @@
 	<name>Spring Cloud Kubernetes :: Dependencies</name>
 	<description>Spring Cloud Kubernetes Dependencies</description>
 	<properties>
-		<kubernetes-fabric8-client.version>6.9.2</kubernetes-fabric8-client.version>
+		<kubernetes-fabric8-client.version>6.13.4</kubernetes-fabric8-client.version>
 		<kubernetes-native-client.version>19.0.1</kubernetes-native-client.version>
 		<wiremock.version>3.4.2</wiremock.version>
 	</properties>
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
@@ -37,7 +37,7 @@ class Fabric8UserAgentDefaultConfigurationTests {
 	@Test
 	void testUserAgent() {
 		String userAgent = client.getConfiguration().getUserAgent();
-		assertThat(userAgent).isEqualTo("fabric8-kubernetes-client/6.9.2");
+		assertThat(userAgent).isEqualTo("fabric8-kubernetes-client/6.13.4");
 	}
 
 }
diff --git a/spring-cloud-kubernetes-integration-tests/pom.xml b/spring-cloud-kubernetes-integration-tests/pom.xml
@@ -15,12 +15,6 @@
 	<name>Spring Cloud Kubernetes :: Integration Tests</name>
 	<description>Integration tests where SCK applications are run inside a Kubernetes cluster</description>
 
-	<properties>
-		<java.version>17</java.version>
-		<docker-java.version>3.2.13</docker-java.version>
-		<testcontainers.version>1.18.3</testcontainers.version>
-	</properties>
-
 	<build>
 		<plugins>
 
@@ -93,18 +87,6 @@
 
 	</build>
 
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>org.testcontainers</groupId>
-				<artifactId>k3s</artifactId>
-				<version>${testcontainers.version}</version>
-				<scope>test</scope>
-			</dependency>
-		</dependencies>
-
-	</dependencyManagement>
-
 	<modules>
 
 		<!-- catalog-watcher -->
diff --git a/spring-cloud-kubernetes-test-support/pom.xml b/spring-cloud-kubernetes-test-support/pom.xml
@@ -11,10 +11,6 @@
 
 	<artifactId>spring-cloud-kubernetes-test-support</artifactId>
 
-	<properties>
-		<awaitility.version>4.0.3</awaitility.version>
-		<testcontainers.version>1.18.3</testcontainers.version>
-	</properties>
 	<dependencies>
 
 		<dependency>
@@ -38,13 +34,11 @@
 		<dependency>
 			<groupId>org.awaitility</groupId>
 			<artifactId>awaitility</artifactId>
-			<version>${awaitility.version}</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.testcontainers</groupId>
 			<artifactId>k3s</artifactId>
-			<version>${testcontainers.version}</version>
 		</dependency>
 
 	</dependencies>
diff --git a/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/Commons.java b/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/Commons.java
@@ -26,12 +26,15 @@
 import java.time.Duration;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 
 import com.github.dockerjava.api.command.ListImagesCmd;
 import com.github.dockerjava.api.command.PullImageCmd;
 import com.github.dockerjava.api.command.SaveImageCmd;
+import com.github.dockerjava.api.model.Bind;
+import com.github.dockerjava.api.model.HostConfig;
 import com.github.dockerjava.api.model.Image;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -90,9 +93,8 @@ private Commons() {
 	public static final String TEMP_FOLDER = new File(System.getProperty("java.io.tmpdir")).getAbsolutePath();
 
 	private static final K3sContainer CONTAINER = new FixedPortsK3sContainer(DockerImageName.parse(Commons.RANCHER))
-		.configureFixedPorts(EXPOSED_PORTS)
-		.withFileSystemBind(TEMP_FOLDER, TEMP_FOLDER)
-		.withFileSystemBind(TMP_IMAGES, TMP_IMAGES)
+		.configureFixedPorts()
+		.addBinds()
 		.withCommand(Commons.RANCHER_COMMAND)
 		.withReuse(true);
 
@@ -331,13 +333,23 @@ private FixedPortsK3sContainer(DockerImageName dockerImageName) {
 			super(dockerImageName);
 		}
 
-		private FixedPortsK3sContainer configureFixedPorts(int[] ports) {
-			for (int port : ports) {
+		private FixedPortsK3sContainer configureFixedPorts() {
+			for (int port : Commons.EXPOSED_PORTS) {
 				super.addFixedExposedPort(port, port);
 			}
 			return this;
 		}
 
+		private FixedPortsK3sContainer addBinds() {
+			super.withCreateContainerCmdModifier(cmd -> {
+				HostConfig hostConfig = Objects.requireNonNull(cmd.getHostConfig());
+				hostConfig.withBinds(Bind.parse(TEMP_FOLDER + ":" + TEMP_FOLDER),
+						Bind.parse(TMP_IMAGES + ":" + TMP_IMAGES));
+			});
+
+			return this;
+		}
+
 	}
 
 }

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ class Fabric8UserAgentDefaultConfigurationTests {`
`37`	`37`	`@Test`
`38`	`38`	`void testUserAgent() {`
`39`	`39`	`String userAgent = client.getConfiguration().getUserAgent();`
`40`		`- assertThat(userAgent).isEqualTo("fabric8-kubernetes-client/6.9.2");`
	`40`	`+ assertThat(userAgent).isEqualTo("fabric8-kubernetes-client/6.13.4");`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`}`