From ed15a23c825258468382ffa24fcf13a84d2ebeed Mon Sep 17 00:00:00 2001
From: Ryan Baxter <rbaxter@vmware.com>
Date: Tue, 28 Sep 2021 10:45:18 -0400
Subject: [PATCH 1/4] Specifying digest in images

---
 spring-cloud-kubernetes-integration-tests/kind-config.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spring-cloud-kubernetes-integration-tests/kind-config.yaml b/spring-cloud-kubernetes-integration-tests/kind-config.yaml
index 705c5a7d..93efbb38 100644
--- a/spring-cloud-kubernetes-integration-tests/kind-config.yaml
+++ b/spring-cloud-kubernetes-integration-tests/kind-config.yaml
@@ -10,7 +10,7 @@ containerdConfigPatches:
 # 1 control plane node and 3 workers
 nodes:
   - role: control-plane
-    image: kindest/node:v1.22.1
+    image: kindest/node:v1.21.1@sha256:69860bda5563ac81e3c0057d654b5253219618a22ec3a346306239bba8cfa1a6
     kubeadmConfigPatches:
     - |
       kind: InitConfiguration
@@ -25,4 +25,4 @@ nodes:
       hostPort: 443
       protocol: TCP
   - role: worker
-    image: kindest/node:v1.22.1
+    image: kindest/node:v1.21.1@sha256:69860bda5563ac81e3c0057d654b5253219618a22ec3a346306239bba8cfa1a6

From e770eace4db6ed281cb4bcd4a5a8d70188636d32 Mon Sep 17 00:00:00 2001
From: Ryan Baxter <rbaxter@pivotal.io>
Date: Thu, 30 Sep 2021 09:28:40 -0400
Subject: [PATCH 2/4] Use last good buildpack for image builds

---
 spring-cloud-kubernetes-integration-tests/run.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/spring-cloud-kubernetes-integration-tests/run.sh b/spring-cloud-kubernetes-integration-tests/run.sh
index 46e918cb..d5be27a9 100755
--- a/spring-cloud-kubernetes-integration-tests/run.sh
+++ b/spring-cloud-kubernetes-integration-tests/run.sh
@@ -120,7 +120,9 @@ main() {
 		echo "Running test: $p"
 		cd  $p
 		${MVN} spring-boot:build-image \
-      		-Dspring-boot.build-image.imageName=docker.io/springcloud/$p:${MVN_VERSION}
+      		-Dspring-boot.build-image.imageName=docker.io/springcloud/$p:${MVN_VERSION} build-image.builder \
+      		# REMOVE THIS ONCE A BUILDPACK RELEASE WITH https://github.com/paketo-buildpacks/bellsoft-liberica/issues/131 IS RELEASED
+      		-Dspring-boot.build-image.builder=paketobuildpacks/builder:0.1.169-base
     	"${KIND}" load docker-image docker.io/springcloud/$p:${MVN_VERSION}
      	${MVN} clean install -P it
 		cd ..

From d86a7978e295f13cb29f9a81995145befa0e372f Mon Sep 17 00:00:00 2001
From: Ryan Baxter <rbaxter@pivotal.io>
Date: Thu, 30 Sep 2021 10:39:00 -0400
Subject: [PATCH 3/4] Fix builder parameter

---
 spring-cloud-kubernetes-integration-tests/run.sh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/spring-cloud-kubernetes-integration-tests/run.sh b/spring-cloud-kubernetes-integration-tests/run.sh
index d5be27a9..e56faef7 100755
--- a/spring-cloud-kubernetes-integration-tests/run.sh
+++ b/spring-cloud-kubernetes-integration-tests/run.sh
@@ -120,9 +120,8 @@ main() {
 		echo "Running test: $p"
 		cd  $p
 		${MVN} spring-boot:build-image \
-      		-Dspring-boot.build-image.imageName=docker.io/springcloud/$p:${MVN_VERSION} build-image.builder \
-      		# REMOVE THIS ONCE A BUILDPACK RELEASE WITH https://github.com/paketo-buildpacks/bellsoft-liberica/issues/131 IS RELEASED
-      		-Dspring-boot.build-image.builder=paketobuildpacks/builder:0.1.169-base
+		     #REMOVE spring-boot.build-image.builder ONCE A BUILDPACK RELEASE WITH https://github.com/paketo-buildpacks/bellsoft-liberica/issues/131 IS RELEASED
+      		-Dspring-boot.build-image.imageName=docker.io/springcloud/$p:${MVN_VERSION} -Dspring-boot.build-image.builder=paketobuildpacks/builder:0.1.169-base \
     	"${KIND}" load docker-image docker.io/springcloud/$p:${MVN_VERSION}
      	${MVN} clean install -P it
 		cd ..

From bdfec55b87899baebeb5e775a3d4e8f3709e4b9c Mon Sep 17 00:00:00 2001
From: Ryan Baxter <rbaxter@pivotal.io>
Date: Thu, 30 Sep 2021 11:45:55 -0400
Subject: [PATCH 4/4] Removing comment

---
 spring-cloud-kubernetes-integration-tests/run.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/spring-cloud-kubernetes-integration-tests/run.sh b/spring-cloud-kubernetes-integration-tests/run.sh
index e56faef7..390a31f1 100755
--- a/spring-cloud-kubernetes-integration-tests/run.sh
+++ b/spring-cloud-kubernetes-integration-tests/run.sh
@@ -120,8 +120,7 @@ main() {
 		echo "Running test: $p"
 		cd  $p
 		${MVN} spring-boot:build-image \
-		     #REMOVE spring-boot.build-image.builder ONCE A BUILDPACK RELEASE WITH https://github.com/paketo-buildpacks/bellsoft-liberica/issues/131 IS RELEASED
-      		-Dspring-boot.build-image.imageName=docker.io/springcloud/$p:${MVN_VERSION} -Dspring-boot.build-image.builder=paketobuildpacks/builder:0.1.169-base \
+      		-Dspring-boot.build-image.imageName=docker.io/springcloud/$p:${MVN_VERSION} -Dspring-boot.build-image.builder=paketobuildpacks/builder:0.1.169-base
     	"${KIND}" load docker-image docker.io/springcloud/$p:${MVN_VERSION}
      	${MVN} clean install -P it
 		cd ..