Merge branch '3.0.x'

spring-cloud · Jun 21, 2023 · a40c5be · a40c5be
2 parents 9a95f08 + 097a270
commit a40c5be
Show file tree

Hide file tree

Showing 27 changed files with 13 additions and 26 deletions.
diff --git a/docs/src/main/asciidoc/spring-cloud-kubernetes.adoc b/docs/src/main/asciidoc/spring-cloud-kubernetes.adoc
@@ -47,6 +47,19 @@ To see the list of all Kubernetes related configuration properties please check
 
 include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/docs/src/main/asciidoc/building.adoc[]
 
+=== 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
 
 include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/docs/src/main/asciidoc/contributing.adoc[]

diff --git a/spring-cloud-kubernetes-integration-tests/README b/spring-cloud-kubernetes-integration-tests/README
@@ -9,7 +9,6 @@ you must name the image with the same name as the module. For example:
 	<artifactId>spring-boot-maven-plugin</artifactId>
 	<configuration>
 		<imageName>docker.io/springcloud/${project.artifactId}:${project.version}</imageName>
-		<imageBuilder>paketobuildpacks/builder</imageBuilder>
 	</configuration>
 	<executions>
 		<execution>

diff --git a/...cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-catalog-watcher/pom.xml b/...cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-catalog-watcher/pom.xml
@@ -51,7 +51,6 @@
 				<artifactId>spring-boot-maven-plugin</artifactId>
 				<configuration>
 					<imageName>docker.io/springcloud/${project.artifactId}:${project.version}</imageName>
-					<imageBuilder>paketobuildpacks/builder</imageBuilder>
 				</configuration>
 				<executions>
 					<execution>

diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-config-it/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-config-it/pom.xml
@@ -57,7 +57,6 @@
 				<artifactId>spring-boot-maven-plugin</artifactId>
 				<configuration>
 					<imageName>docker.io/springcloud/${project.artifactId}:${project.version}</imageName>
-					<imageBuilder>paketobuildpacks/builder</imageBuilder>
 				</configuration>
 				<executions>
 					<execution>

diff --git a/...ultiple-apps/spring-cloud-kubernetes-client-configuration-watcher-configmap-app-a/pom.xml b/...ultiple-apps/spring-cloud-kubernetes-client-configuration-watcher-configmap-app-a/pom.xml
@@ -47,7 +47,6 @@
 				<artifactId>spring-boot-maven-plugin</artifactId>
 				<configuration>
 					<imageName>docker.io/springcloud/${project.artifactId}:${project.version}</imageName>
-					<imageBuilder>paketobuildpacks/builder</imageBuilder>
 				</configuration>
 				<executions>
 					<execution>

diff --git a/...ultiple-apps/spring-cloud-kubernetes-client-configuration-watcher-configmap-app-b/pom.xml b/...ultiple-apps/spring-cloud-kubernetes-client-configuration-watcher-configmap-app-b/pom.xml
@@ -48,7 +48,6 @@
 				<artifactId>spring-boot-maven-plugin</artifactId>
 				<configuration>
 					<imageName>docker.io/springcloud/${project.artifactId}:${project.version}</imageName>
-					<imageBuilder>paketobuildpacks/builder</imageBuilder>
 				</configuration>
 				<executions>
 					<execution>

diff --git a/...ubernetes-integration-tests/spring-cloud-kubernetes-client-configmap-event-reload/pom.xml b/...ubernetes-integration-tests/spring-cloud-kubernetes-client-configmap-event-reload/pom.xml
@@ -56,7 +56,6 @@
 				<artifactId>spring-boot-maven-plugin</artifactId>
 				<configuration>
 					<imageName>docker.io/springcloud/${project.artifactId}:${project.version}</imageName>
-					<imageBuilder>paketobuildpacks/builder</imageBuilder>
 				</configuration>
 				<executions>
 					<execution>

diff --git a/...ernetes-integration-tests/spring-cloud-kubernetes-client-configmap-polling-reload/pom.xml b/...ernetes-integration-tests/spring-cloud-kubernetes-client-configmap-polling-reload/pom.xml
@@ -60,7 +60,6 @@
 				<artifactId>spring-boot-maven-plugin</artifactId>
 				<configuration>
 					<imageName>docker.io/springcloud/${project.artifactId}:${project.version}</imageName>
-					<imageBuilder>paketobuildpacks/builder</imageBuilder>
 				</configuration>
 				<executions>
 					<execution>

diff --git a/...ng-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/pom.xml b/...ng-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/pom.xml
@@ -61,7 +61,6 @@
 				<artifactId>spring-boot-maven-plugin</artifactId>
 				<configuration>
 					<imageName>docker.io/springcloud/${project.artifactId}:${project.version}</imageName>
-					<imageBuilder>paketobuildpacks/builder</imageBuilder>
 				</configuration>
 				<executions>
 					<execution>

diff --git a/...cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-loadbalancer-it/pom.xml b/...cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-loadbalancer-it/pom.xml
@@ -56,7 +56,6 @@
 				<artifactId>spring-boot-maven-plugin</artifactId>
 				<configuration>
 					<imageName>docker.io/springcloud/${project.artifactId}:${project.version}</imageName>
-					<imageBuilder>paketobuildpacks/builder</imageBuilder>
 				</configuration>
 				<executions>
 					<execution>

diff --git a/...etes-integration-tests/spring-cloud-kubernetes-client-reactive-discoveryclient-it/pom.xml b/...etes-integration-tests/spring-cloud-kubernetes-client-reactive-discoveryclient-it/pom.xml
@@ -52,7 +52,6 @@
 				<artifactId>spring-boot-maven-plugin</artifactId>
 				<configuration>
 					<imageName>docker.io/springcloud/${project.artifactId}:${project.version}</imageName>
-					<imageBuilder>paketobuildpacks/builder</imageBuilder>
 				</configuration>
 				<executions>
 					<execution>

diff --git a/...-multiple-apps/spring-cloud-kubernetes-client-configuration-watcher-secrets-app-a/pom.xml b/...-multiple-apps/spring-cloud-kubernetes-client-configuration-watcher-secrets-app-a/pom.xml
@@ -47,7 +47,6 @@
 				<artifactId>spring-boot-maven-plugin</artifactId>
 				<configuration>
 					<imageName>docker.io/springcloud/${project.artifactId}:${project.version}</imageName>
-					<imageBuilder>paketobuildpacks/builder</imageBuilder>
 				</configuration>
 				<executions>
 					<execution>

diff --git a/...-multiple-apps/spring-cloud-kubernetes-client-configuration-watcher-secrets-app-b/pom.xml b/...-multiple-apps/spring-cloud-kubernetes-client-configuration-watcher-secrets-app-b/pom.xml
@@ -47,7 +47,6 @@
 				<artifactId>spring-boot-maven-plugin</artifactId>
 				<configuration>
 					<imageName>docker.io/springcloud/${project.artifactId}:${project.version}</imageName>
-					<imageBuilder>paketobuildpacks/builder</imageBuilder>
 				</configuration>
 				<executions>
 					<execution>

diff --git a/...-kubernetes-integration-tests/spring-cloud-kubernetes-client-secrets-event-reload/pom.xml b/...-kubernetes-integration-tests/spring-cloud-kubernetes-client-secrets-event-reload/pom.xml
@@ -52,7 +52,6 @@
 				<artifactId>spring-boot-maven-plugin</artifactId>
 				<configuration>
 					<imageName>docker.io/springcloud/${project.artifactId}:${project.version}</imageName>
-					<imageBuilder>paketobuildpacks/builder</imageBuilder>
 				</configuration>
 				<executions>
 					<execution>

diff --git a/...oud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/pom.xml b/...oud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/pom.xml
@@ -76,7 +76,6 @@
 				<artifactId>spring-boot-maven-plugin</artifactId>
 				<configuration>
 					<imageName>docker.io/springcloud/${project.artifactId}:${project.version}</imageName>
-					<imageBuilder>paketobuildpacks/builder</imageBuilder>
 				</configuration>
 				<executions>
 					<execution>

diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-core-k8s-client-it/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-core-k8s-client-it/pom.xml
@@ -51,7 +51,6 @@
 				<artifactId>spring-boot-maven-plugin</artifactId>
 				<configuration>
 					<imageName>docker.io/springcloud/${project.artifactId}:${project.version}</imageName>
-					<imageBuilder>paketobuildpacks/builder</imageBuilder>
 				</configuration>
 				<executions>
 					<execution>

diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-discoveryclient-it/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-discoveryclient-it/pom.xml
@@ -57,7 +57,6 @@
 				<artifactId>spring-boot-maven-plugin</artifactId>
 				<configuration>
 					<imageName>docker.io/springcloud/${project.artifactId}:${project.version}</imageName>
-					<imageBuilder>paketobuildpacks/builder</imageBuilder>
 				</configuration>
 				<executions>
 					<execution>

diff --git a/...bernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/pom.xml b/...bernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/pom.xml
@@ -51,7 +51,6 @@
 				<artifactId>spring-boot-maven-plugin</artifactId>
 				<configuration>
 					<imageName>docker.io/springcloud/${project.artifactId}:${project.version}</imageName>
-					<imageBuilder>paketobuildpacks/builder</imageBuilder>
 				</configuration>
 				<executions>
 					<execution>

diff --git a/...s-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap-event-reload/pom.xml b/...s-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap-event-reload/pom.xml
@@ -58,7 +58,6 @@
 				<artifactId>spring-boot-maven-plugin</artifactId>
 				<configuration>
 					<imageName>docker.io/springcloud/${project.artifactId}:${project.version}</imageName>
-					<imageBuilder>paketobuildpacks/builder</imageBuilder>
 				</configuration>
 				<executions>
 					<execution>

diff --git a/...integration-tests/spring-cloud-kubernetes-fabric8-client-configmap-polling-reload/pom.xml b/...integration-tests/spring-cloud-kubernetes-fabric8-client-configmap-polling-reload/pom.xml
@@ -61,7 +61,6 @@
 				<artifactId>spring-boot-maven-plugin</artifactId>
 				<configuration>
 					<imageName>docker.io/springcloud/${project.artifactId}:${project.version}</imageName>
-					<imageBuilder>paketobuildpacks/builder</imageBuilder>
 				</configuration>
 				<executions>
 					<execution>

diff --git a/...oud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap/pom.xml b/...oud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap/pom.xml
@@ -51,7 +51,6 @@
 				<artifactId>spring-boot-maven-plugin</artifactId>
 				<configuration>
 					<imageName>docker.io/springcloud/${project.artifactId}:${project.version}</imageName>
-					<imageBuilder>paketobuildpacks/builder</imageBuilder>
 				</configuration>
 				<executions>
 					<execution>

diff --git a/...integration-tests/spring-cloud-kubernetes-fabric8-client-discovery-with-bootstrap/pom.xml b/...integration-tests/spring-cloud-kubernetes-fabric8-client-discovery-with-bootstrap/pom.xml
@@ -55,7 +55,6 @@
 				<artifactId>spring-boot-maven-plugin</artifactId>
 				<configuration>
 					<imageName>docker.io/springcloud/${project.artifactId}:${project.version}</imageName>
-					<imageBuilder>paketobuildpacks/builder</imageBuilder>
 				</configuration>
 				<executions>
 					<execution>

diff --git a/...oud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/pom.xml b/...oud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/pom.xml
@@ -51,7 +51,6 @@
 				<artifactId>spring-boot-maven-plugin</artifactId>
 				<configuration>
 					<imageName>docker.io/springcloud/${project.artifactId}:${project.version}</imageName>
-					<imageBuilder>paketobuildpacks/builder</imageBuilder>
 				</configuration>
 				<executions>
 					<execution>

diff --git a/...-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-loadbalancer/pom.xml b/...-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-loadbalancer/pom.xml
@@ -51,7 +51,6 @@
 				<artifactId>spring-boot-maven-plugin</artifactId>
 				<configuration>
 					<imageName>docker.io/springcloud/${project.artifactId}:${project.version}</imageName>
-					<imageBuilder>paketobuildpacks/builder</imageBuilder>
 				</configuration>
 				<executions>
 					<execution>

diff --git a/...tes-integration-tests/spring-cloud-kubernetes-fabric8-client-secrets-event-reload/pom.xml b/...tes-integration-tests/spring-cloud-kubernetes-fabric8-client-secrets-event-reload/pom.xml
@@ -53,7 +53,6 @@
 				<artifactId>spring-boot-maven-plugin</artifactId>
 				<configuration>
 					<imageName>docker.io/springcloud/${project.artifactId}:${project.version}</imageName>
-					<imageBuilder>paketobuildpacks/builder</imageBuilder>
 				</configuration>
 				<executions>
 					<execution>

diff --git a/...d-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-simple-core/pom.xml b/...d-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-simple-core/pom.xml
@@ -51,7 +51,6 @@
 				<artifactId>spring-boot-maven-plugin</artifactId>
 				<configuration>
 					<imageName>docker.io/springcloud/${project.artifactId}:${project.version}</imageName>
-					<imageBuilder>paketobuildpacks/builder</imageBuilder>
 				</configuration>
 				<executions>
 					<execution>

diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-istio-it/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-istio-it/pom.xml
@@ -51,7 +51,6 @@
 				<artifactId>spring-boot-maven-plugin</artifactId>
 				<configuration>
 					<imageName>docker.io/springcloud/${project.artifactId}:${project.version}</imageName>
-					<imageBuilder>paketobuildpacks/builder</imageBuilder>
 				</configuration>
 				<executions>
 					<execution>