Merge branch 'main' into fix-kokoro-rewind

GoogleContainerTools · Jan 8, 2025 · c8a7933 · c8a7933
2 parents 6144049 + 9d79e53
commit c8a7933
Show file tree

Hide file tree

Showing 4,072 changed files with 476,903 additions and 276,592 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -7,71 +7,68 @@ 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"
 
   # check for updates to github actions
   - directory: "/"
     package-ecosystem: "github-actions"
     schedule:
-      interval: "daily"
+      interval: "weekly"
 
   - directory: "/integration/examples"
     package-ecosystem: "npm"
     schedule:
-      interval: "daily"
+      interval: "weekly"
   - directory: "/integration/examples"
     package-ecosystem: "bundler"
     schedule:
-      interval: "daily"
+      interval: "weekly"
   - directory: "/integration/examples"
     package-ecosystem: "composer"
     schedule:
-      interval: "daily"
+      interval: "weekly"
   - directory: "/integration/examples"
     package-ecosystem: "pip"
     schedule:
-      interval: "daily"
+      interval: "weekly"
   - directory: "/integration/examples"
     package-ecosystem: "maven"
     schedule:
-      interval: "daily"
+      interval: "weekly"
   - directory: "/integration/examples"
     package-ecosystem: "gradle"
     schedule:
-      interval: "daily"
+      interval: "weekly"
   - directory: "/integration/examples"
     package-ecosystem: "gomod"
     schedule:
-      interval: "daily"
+      interval: "weekly"
 
   - directory: "/examples"
     package-ecosystem: "npm"
     schedule:
-      interval: "daily"
+      interval: "weekly"
   - directory: "/examples"
     package-ecosystem: "bundler"
     schedule:
-      interval: "daily"
+      interval: "weekly"
   - directory: "/examples"
     package-ecosystem: "composer"
     schedule:
-      interval: "daily"
+      interval: "weekly"
   - directory: "/examples"
     package-ecosystem: "pip"
     schedule:
-      interval: "daily"
+      interval: "weekly"
   - directory: "/examples"
     package-ecosystem: "maven"
     schedule:
-      interval: "daily"
+      interval: "weekly"
   - directory: "/examples"
     package-ecosystem: "gradle"
     schedule:
-      interval: "daily"
+      interval: "weekly"
   - directory: "/examples"
     package-ecosystem: "gomod"
     schedule:
-      interval: "daily"
+      interval: "weekly"
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -53,7 +53,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3.27.9
+      uses: github/codeql-action/init@v3.28.0
       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@v3.27.9
+      uses: github/codeql-action/analyze@v3.28.0
diff --git a/.github/workflows/integration-linux.yml b/.github/workflows/integration-linux.yml
@@ -23,6 +23,7 @@ jobs:
         minikube_version: [1.34.0]
         gcloud_sdk_version: [502.0.0]
         container_structure_tests_version: [1.19.3]
+        java: [21]
         integration_test_partitions: [0, 1, 2, 3]
     steps:
 
@@ -37,6 +38,12 @@ jobs:
         go-version: 1.23.*
       id: go
 
+    - name: Set up Java
+      uses: actions/setup-java@v4
+      with:
+        distribution: 'temurin'
+        java-version: ${{ matrix.java }}
+
     # Retrieve build locations with `go env`
     # <https://markphelps.me/posts/speed-up-your-go-builds-with-actions-cache/>
     - id: go-cache-paths
@@ -129,4 +136,4 @@ jobs:
       if: ${{ env.NON_DOCS_FILES_CHANGED != 0 }}
       run: |
         skaffold config set --global collect-metrics false
-        IT_PARTITION=${{ matrix.integration_test_partitions }} make integration-tests
+        IT_PARTITION=${{ matrix.integration_test_partitions }} make integration-tests
diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml
@@ -43,14 +43,14 @@ jobs:
 
       # Upload the results as artifacts (optional).
       - name: "Upload artifact"
-        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
+        uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
         with:
           name: SARIF file
           path: results.sarif
           retention-days: 5
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@dd7559424621a6dd0b32ababe9e4b271a87f78d2 # v3.27.5
+        uses: github/codeql-action/upload-sarif@3407610120cd5656b6fc71991415cb50748b9489 # v3.27.5
         with:
           sarif_file: results.sarif
diff --git a/docs-v2/content/en/docs/design/global-config.md b/docs-v2/content/en/docs/design/global-config.md
@@ -19,6 +19,8 @@ The options are:
 | `k3d-disable-load` | boolean | If true, do not use `k3d import image` to load images locally. |
 | `kind-disable-load` | boolean | If true, do not use `kind load` to load images locally. |
 | `local-cluster` | boolean | If true, do not try to push images after building. By default, contexts with names `docker-for-desktop`, `docker-desktop`, or `minikube` are treated as local. |
+| `update-check` | boolean | Check for a more recent version of Skaffold. |
+| `collect-metrics` | boolean | Collect anonymized usage data. |
 
 For example, to treat any context as local by default: