Merge branch 'main' into fix-1715-drop-profiles-support

wind57 · Oct 2, 2024 · 4db2991 · 4db2991
2 parents 4e89d23 + c416eea
commit 4db2991
Show file tree

Hide file tree

Showing 15 changed files with 32 additions and 50 deletions.
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/docs/modules/ROOT/pages/spring-cloud-kubernetes-configserver.adoc b/docs/modules/ROOT/pages/spring-cloud-kubernetes-configserver.adoc
@@ -4,7 +4,7 @@
 The Spring Cloud Kubernetes Config Server, is based on https://spring.io/projects/spring-cloud-config[Spring Cloud Config Server] and adds an https://docs.spring.io/spring-cloud-config/docs/current/reference/html/#_environment_repository[environment repository] for Kubernetes
 https://kubernetes.io/docs/concepts/configuration/configmap/[Config Maps] and https://kubernetes.io/docs/concepts/configuration/secret/[Secrets].
 
-This is component is completely optional.  However, it allows you to continue to leverage configuration
+This component is completely optional.  However, it allows you to continue to leverage configuration
 you may have stored in existing environment repositories (Git, SVN, Vault, etc) with applications that you are running on Kubernetes.
 
 A default image is located on https://hub.docker.com/r/springcloud/spring-cloud-kubernetes-configserver[Docker Hub] which will allow you to easily get a Config Server deployed on Kubernetes without building

diff --git a/docs/package.json b/docs/package.json
@@ -5,6 +5,6 @@
 		"@antora/collector-extension": "1.0.0-alpha.3",
 		"@asciidoctor/tabs": "1.0.0-beta.6",
 		"@springio/antora-extensions": "1.11.1",
-		"@springio/asciidoctor-extensions": "1.0.0-alpha.13"
+		"@springio/asciidoctor-extensions": "1.0.0-alpha.14"
 	}
 }
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>
@@ -67,7 +67,7 @@
 					<plugin>
 						<groupId>com.spotify</groupId>
 						<artifactId>dockerfile-maven-plugin</artifactId>
-						<version>1.4.12</version>
+						<version>1.4.13</version>
 						<configuration>
 							<repository>${docker.registry.organization}/${artifactId}</repository>
 							<tag>${project.version}</tag>

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>
@@ -86,7 +86,7 @@
 					<plugin>
 						<groupId>com.spotify</groupId>
 						<artifactId>dockerfile-maven-plugin</artifactId>
-						<version>1.4.12</version>
+						<version>1.4.13</version>
 						<configuration>
 							<repository>${docker.registry.organization}/${artifactId}</repository>
 							<tag>${project.version}</tag>

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>
@@ -59,7 +59,7 @@
 					<plugin>
 						<groupId>com.spotify</groupId>
 						<artifactId>dockerfile-maven-plugin</artifactId>
-						<version>1.4.12</version>
+						<version>1.4.13</version>
 						<configuration>
 							<repository>${docker.registry.organization}/${artifactId}</repository>
 							<tag>${project.version}</tag>

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-examples/kubernetes-leader-election-example/pom.xml b/spring-cloud-kubernetes-examples/kubernetes-leader-election-example/pom.xml
@@ -79,7 +79,7 @@
 			</plugin>
 			<plugin>
 				<artifactId>maven-failsafe-plugin</artifactId>
-				<version>3.1.2</version>
+				<version>3.5.0</version>
 			</plugin>
 		</plugins>
 	</build>

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.9.2");
+		assertThat(userAgent).isEqualTo("fabric8-kubernetes-client/6.13.4");
 	}
 
 }
diff --git a/spring-cloud-kubernetes-fabric8-config/pom.xml b/spring-cloud-kubernetes-fabric8-config/pom.xml
@@ -59,10 +59,6 @@
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-commons</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.security</groupId>
-			<artifactId>spring-security-rsa</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>jakarta.annotation</groupId>
 			<artifactId>jakarta.annotation-api</artifactId>

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/...src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/Commons.java b/...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;
+		}
+
 	}
 
 }