Add v1.25 test and reduce amount of e2e tests

kubernetes · Sep 4, 2022 · 586acbe · 586acbe
1 parent 92534fa
commit 586acbe
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -174,8 +174,8 @@ jobs:
         id: kind
         uses: engineerd/setup-kind@aa272fe2a7309878ffc2a81c56cfe3ef108ae7d0 #v0.5.0
         with:
-          version: v0.14.0
-          image: kindest/node:v1.21.12
+          version: v0.15.0
+          image: kindest/node:v1.25.0
 
       - uses: geekyeggo/delete-artifact@b73cb986740e466292a536d0e32e2666c56fdeb3 # v1
         with:
@@ -208,7 +208,7 @@ jobs:
 
     strategy:
       matrix:
-        k8s: [v1.21.2, v1.22.9, v1.23.6, v1.24.0]
+        k8s: [v1.23.10, v1.24.4, v1.25.0]
 
     steps:
 
@@ -224,7 +224,7 @@ jobs:
         id: kind
         uses: engineerd/setup-kind@aa272fe2a7309878ffc2a81c56cfe3ef108ae7d0 #v0.5.0
         with:
-          version: v0.14.0
+          version: v0.15.0
           config: test/e2e/kind.yaml
           image: kindest/node:${{ matrix.k8s }}
 
@@ -265,7 +265,7 @@ jobs:
 
     strategy:
       matrix:
-        k8s: [v1.21.10, v1.22.9, v1.23.6, v1.24.0]
+        k8s: [v1.24.4, v1.25.0]
 
     steps:
 
@@ -281,7 +281,7 @@ jobs:
         id: kind
         uses: engineerd/setup-kind@aa272fe2a7309878ffc2a81c56cfe3ef108ae7d0 #v0.5.0
         with:
-          version: v0.14.0
+          version: v0.15.0
           config: test/e2e/kind.yaml
           image: kindest/node:${{ matrix.k8s }}
 
@@ -403,8 +403,8 @@ jobs:
         if: ${{ steps.filter-images.outputs.kube-webhook-certgen == 'true' }}
         uses: engineerd/setup-kind@aa272fe2a7309878ffc2a81c56cfe3ef108ae7d0 #v0.5.0
         with:
-          version: v0.14.0
-          image: kindest/node:v1.21.12
+          version: v0.15.0
+          image: kindest/node:v1.25.0
 
       - name: Set up Go 1.19.0
         id: go

diff --git a/build/build.sh b/build/build.sh
@@ -49,7 +49,7 @@ echo "Building targets for ${ARCH}, generated targets in ${TARGETS_DIR} director
 
 echo "Building ${PKG}/cmd/nginx"
 
-git config --global --add safe.directory /go/src/k8s.io/ingress-nginx
+git config --add safe.directory /go/src/k8s.io/ingress-nginx
 
 ${GO_BUILD_CMD} \
   -trimpath -ldflags="-buildid= -w -s \

diff --git a/rootfs/chroot.sh b/rootfs/chroot.sh
@@ -40,6 +40,7 @@ for dir in "${writeDirs[@]}"; do
   chown -R www-data.www-data ${dir};
 done
 
+
 mkdir -p  /chroot/lib /chroot/proc /chroot/usr /chroot/bin /chroot/dev /chroot/run 
 cp /etc/passwd /etc/group /chroot/etc/
 cp -a /usr/* /chroot/usr/