Merge branch 'devel' into kind-0.20

submariner-io · Aug 10, 2023 · 0e98052 · 0e98052
2 parents f0c2090 + 9135eda
commit 0e98052
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 11 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -5,11 +5,6 @@ updates:
     directory: '/'
     schedule:
       interval: monthly
-  - package-ecosystem: github-actions
-    directory: '/'
-    target-branch: "release-0.12"
-    schedule:
-      interval: monthly
   - package-ecosystem: github-actions
     directory: '/'
     target-branch: "release-0.13"
@@ -25,6 +20,30 @@ updates:
     target-branch: "release-0.15"
     schedule:
       interval: monthly
+  - package-ecosystem: gomod
+    target-branch: "release-0.14"
+    directory: "/"
+    schedule:
+      interval: weekly
+    allow:
+      # Pick up k8s.io updates
+      - dependency-name: k8s.io/client-go
+    ignore:
+      # 0.14 tracks the 0.25 branch
+      - dependency-name: k8s.io/*
+        versions: ">= 0.26.0-alpha.0"
+  - package-ecosystem: gomod
+    target-branch: "release-0.15"
+    directory: "/"
+    schedule:
+      interval: weekly
+    allow:
+      # Pick up k8s.io updates
+      - dependency-name: k8s.io/client-go
+    ignore:
+      # 0.15 tracks the 0.26 branch
+      - dependency-name: k8s.io/*
+        versions: ">= 0.27.0-alpha.0"
   - package-ecosystem: gomod
     directory: "/"
     schedule:

diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml
@@ -18,15 +18,15 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: 'Verify no "Apply suggestions from code review" commits'
-        uses: tim-actions/commit-message-checker-with-regex@e16b08b1a7f5cafeb1f8167de05bf1d40239eb5d
+        uses: tim-actions/commit-message-checker-with-regex@094fc16ff83d04e2ec73edb5eaf6aa267db33791
         with:
           commits: ${{ steps.get-pr-commits.outputs.commits }}
           pattern: '^(?!.*(apply suggestions from code review))'
           flags: 'i'
           error: 'Commits addressing code review feedback should typically be squashed into the commits under review'
 
       - name: 'Verify no "fixup!" commits'
-        uses: tim-actions/commit-message-checker-with-regex@e16b08b1a7f5cafeb1f8167de05bf1d40239eb5d
+        uses: tim-actions/commit-message-checker-with-regex@094fc16ff83d04e2ec73edb5eaf6aa267db33791
         with:
           commits: ${{ steps.get-pr-commits.outputs.commits }}
           pattern: '^(?!fixup!)'
@@ -123,7 +123,7 @@ jobs:
         run: cat ${{ steps.scan.outputs.sarif }}
       - name: Upload Anchore scan SARIF report
         if: always()
-        uses: github/codeql-action/upload-sarif@004c5de30b6423267685b897a3d595e944f7fed5
+        uses: github/codeql-action/upload-sarif@0ba4244466797eb048eb91a6cd43d5c03ca8bd05
         with:
           sarif_file: ${{ steps.scan.outputs.sarif }}
 

diff --git a/.github/workflows/report.yml b/.github/workflows/report.yml
@@ -28,6 +28,6 @@ jobs:
       - name: Show Anchore scan SARIF report
         run: cat ${{ steps.scan.outputs.sarif }}
       - name: Upload Anchore scan SARIF report
-        uses: github/codeql-action/upload-sarif@004c5de30b6423267685b897a3d595e944f7fed5
+        uses: github/codeql-action/upload-sarif@0ba4244466797eb048eb91a6cd43d5c03ca8bd05
         with:
           sarif_file: ${{ steps.scan.outputs.sarif }}
diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
@@ -21,7 +21,7 @@ jobs:
         uses: docker/setup-qemu-action@2b82ce82d56a2a04d2637cd93a637ae1b359c0a7
 
       - name: Set up buildx
-        uses: docker/setup-buildx-action@16c0bc4a6e6ada2cfd8afd41d22d95379cf7c32a
+        uses: docker/setup-buildx-action@4c0219f9ac95b02789c1075625400b2acbff50b1
 
       - name: Restore images from the cache
         uses: ./gh-actions/restore-images

diff --git a/package/Dockerfile.nettest b/package/Dockerfile.nettest
@@ -16,6 +16,8 @@ FROM alpine
 
 WORKDIR /app
 
+ARG VERSION
+
 RUN apk add --no-cache \
 	bash \
 	bind-tools \
@@ -27,4 +29,6 @@ RUN apk add --no-cache \
 COPY --from=0 /usr/local/bin/net* /usr/local/bin/
 COPY scripts/nettest/* /app/
 
+RUN echo ${VERSION} >> /app/version
+
 CMD ["/bin/bash","-l"]
diff --git a/scripts/shared/build_image.sh b/scripts/shared/build_image.sh
@@ -55,7 +55,7 @@ fi
 [[ -n "$PLATFORM" ]] || PLATFORM="$default_platform"
 
 # Rebuild the image to update any changed layers and tag it back so it will be used.
-buildargs_flags=(--build-arg BUILDKIT_INLINE_CACHE=1 --build-arg "BASE_BRANCH=${BASE_BRANCH}")
+buildargs_flags=(--build-arg BUILDKIT_INLINE_CACHE=1 --build-arg "BASE_BRANCH=${BASE_BRANCH}" --build-arg "VERSION=${VERSION}")
 if [[ "${PLATFORM}" != "${default_platform}" ]] && docker buildx version > /dev/null 2>&1; then
     docker buildx use buildx_builder || docker buildx create --name buildx_builder --use
     docker buildx build "${output_flag}" -t "${local_image}" "${cache_flags[@]}" -f "${dockerfile}" --iidfile "${hashfile}" --platform "${PLATFORM}" "${buildargs_flags[@]}" .