SpringCloud/spring-cloud-kubernetes
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.0.x' into main

Browse Source
This commit is contained in:
Ryan Baxter
2021-09-30 12:41:58 -04:00
parent ffaba47f64 bdfec55b87
commit 6520e9bf05
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-cloud-kubernetes-integration-tests/kind-config.yaml
View File

@@ -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

2
spring-cloud-kubernetes-integration-tests/run.sh
View File

@@ -120,7 +120,7 @@ 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} -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 ..