cherrypick

.github/CODEOWNERS

@@ -1,11 +1 @@
-# JIB owners
-**/**jib** @GoogleContainerTools/skaffold-team @chanseokoh
-
-# kpt owners
-pkg/skaffold/deploy/**kpt** @GoogleContainerTools/skaffold-team @yuwenma
-
-# Debug owners
-pkg/skaffold/debug/** @GoogleContainerTools/skaffold-team
-docs-v1/content/en/docs/how-tos/debug/** @GoogleContainerTools/skaffold-team
-integration/test-data/debug/** @GoogleContainerTools/skaffold-team
-integration/debug_test.go @GoogleContainerTools/skaffold-team
+* @GoogleContainerTools/skaffold-team

.github/dependabot.yml

@@ -7,71 +7,24 @@ updates:
   - directory: "/"
     package-ecosystem: "gomod"
     schedule:
-      interval: "daily"
-    # Security updates have their own PR limit, so setting this to 0 will only
-    # allow security updates through.
-    open-pull-requests-limit: 0
+      interval: "weekly"
+    groups:
+      golang:
+        patterns:
+          - "*"
+    exclude-paths:
+      - codelab
+      - examples
+      - hack
+      - integration
+      - pkg/skaffold/build/ko/testdata
 
   # check for updates to github actions
   - directory: "/"
     package-ecosystem: "github-actions"
     schedule:
-      interval: "daily"
-
-  - directory: "/integration/examples"
-    package-ecosystem: "npm"
-    schedule:
-      interval: "daily"
-  - directory: "/integration/examples"
-    package-ecosystem: "bundler"
-    schedule:
-      interval: "daily"
-  - directory: "/integration/examples"
-    package-ecosystem: "composer"
-    schedule:
-      interval: "daily"
-  - directory: "/integration/examples"
-    package-ecosystem: "pip"
-    schedule:
-      interval: "daily"
-  - directory: "/integration/examples"
-    package-ecosystem: "maven"
-    schedule:
-      interval: "daily"
-  - directory: "/integration/examples"
-    package-ecosystem: "gradle"
-    schedule:
-      interval: "daily"
-  - directory: "/integration/examples"
-    package-ecosystem: "gomod"
-    schedule:
-      interval: "daily"
-
-  - directory: "/examples"
-    package-ecosystem: "npm"
-    schedule:
-      interval: "daily"
-  - directory: "/examples"
-    package-ecosystem: "bundler"
-    schedule:
-      interval: "daily"
-  - directory: "/examples"
-    package-ecosystem: "composer"
-    schedule:
-      interval: "daily"
-  - directory: "/examples"
-    package-ecosystem: "pip"
-    schedule:
-      interval: "daily"
-  - directory: "/examples"
-    package-ecosystem: "maven"
-    schedule:
-      interval: "daily"
-  - directory: "/examples"
-    package-ecosystem: "gradle"
-    schedule:
-      interval: "daily"
-  - directory: "/examples"
-    package-ecosystem: "gomod"
-    schedule:
-      interval: "daily"
+      interval: "weekly"
+    groups:
+      github-actions:
+        patterns:
+          - "*"

.github/workflows/codeql-analysis.yml

@@ -33,7 +33,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v6
 
     # Retrieve build locations with `go env`
     # <https://markphelps.me/posts/speed-up-your-go-builds-with-actions-cache/>
@@ -42,7 +42,7 @@ jobs:
         echo "go-build=$(go env GOCACHE)" >> $GITHUB_OUTPUT
         echo "go-mod=$(go env GOMODCACHE)" >> $GITHUB_OUTPUT
 
-    - uses: actions/cache@v3
+    - uses: actions/cache@v5
       with:
         path: |
           ${{ steps.go-cache-paths.outputs.go-build }}
@@ -53,7 +53,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2.21.5
+      uses: github/codeql-action/init@v4
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -65,4 +65,4 @@ jobs:
        make out/skaffold
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2.21.5
+      uses: github/codeql-action/analyze@v4

.github/workflows/integration-linux.yml

@@ -16,35 +16,62 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        kustomize_version: [3.5.4]
-        ko_version: [0.4.0]
-        kompose_version: [1.21.0]
-        kpt_version: [1.0.0-beta.24]
-        minikube_version: [1.30.1]
-        gcloud_sdk_version: [410.0.0]
-        container_structure_tests_version: [1.8.0]
+        kustomize_version: [5.6.0]
+        ko_version: [0.17.1]
+        kompose_version: [1.35.0]
+        kpt_version: [1.0.0-beta.57]
+        minikube_version: [1.35.0]
+        gcloud_sdk_version: [520.0.0]
+        container_structure_tests_version: [1.19.3]
+        java: [21]
         integration_test_partitions: [0, 1, 2, 3]
     steps:
 
     - name: Check out code into the Go module directory
-      uses: actions/checkout@v3
+      uses: actions/checkout@v6
       with:
         fetch-depth: 0
 
     - name: Set up Go
-      uses: actions/setup-go@v4
+      uses: actions/setup-go@v6
       with:
-        go-version: 1.20.*
+        go-version: 1.25.7
       id: go
 
+    - name: Set up Java
+      uses: actions/setup-java@v5
+      with:
+        distribution: 'temurin'
+        java-version: ${{ matrix.java }}
+
+    - name: Clean up disk space
+      run: |
+        echo "--- Disk space before cleanup ---"
+        df -h
+        sudo rm -rf /usr/share/dotnet
+        sudo rm -rf /usr/local/lib/android
+        sudo rm -rf /opt/ghc
+        sudo rm -rf /usr/share/swift
+        sudo rm -rf /usr/local/.ghcup
+        sudo rm -rf /usr/share/code
+        sudo rm -rf /usr/share/miniconda
+        sudo rm -rf /usr/share/az_deps
+        # Remove unused Docker images, containers, networks, and build cache
+        # The '|| true' prevents the workflow from failing if no items are found to prune.
+        docker system prune -a --force || true
+        docker builder prune -a --force || true
+
+        echo "--- Disk space after cleanup ---"
+        df -h
+
     # Retrieve build locations with `go env`
     # <https://markphelps.me/posts/speed-up-your-go-builds-with-actions-cache/>
     - id: go-cache-paths
       run: |
         echo "go-build=$(go env GOCACHE)" >> $GITHUB_OUTPUT
         echo "go-mod=$(go env GOMODCACHE)" >> $GITHUB_OUTPUT
 
-    - uses: actions/cache@v3
+    - uses: actions/cache@v5
       with:
         path: |
           ${{ steps.go-cache-paths.outputs.go-build }}
@@ -101,7 +128,7 @@ jobs:
     - name: Install Container Structure Test
       if: ${{ env.NON_DOCS_FILES_CHANGED != 0 }}
       run: |
-        wget -O container-structure-test https://storage.googleapis.com/container-structure-test/v${{ matrix.container_structure_tests_version }}/container-structure-test-linux-amd64 && chmod +x container-structure-test
+        wget -O container-structure-test https://github.com/GoogleContainerTools/container-structure-test/releases/download/v${{ matrix.container_structure_tests_version }}/container-structure-test-linux-amd64 && chmod +x container-structure-test
         sudo mv container-structure-test /usr/local/bin/
 
     - name: Setup other files and permissions

.github/workflows/linters-checks.yml

@@ -15,13 +15,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Set up Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v6
         with:
-          go-version: 1.20.*
+          go-version: 1.25.7
         id: go
 
       - name: Check out code into the Go module directory
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
@@ -36,4 +36,4 @@ jobs:
 
       - name: Run make checks
         run: |
-          make checks
+          make checks