Skip to content

Commit

Permalink
Merge branch 'main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
yzewei authored Dec 24, 2024
2 parents 9631e22 + 4a8c428 commit 65bb12a
Show file tree
Hide file tree
Showing 7,563 changed files with 1,045,752 additions and 416,792 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
12 changes: 1 addition & 11 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -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
35 changes: 16 additions & 19 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
6 changes: 3 additions & 3 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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@v4
with:
path: |
${{ steps.go-cache-paths.outputs.go-build }}
Expand All @@ -53,7 +53,7 @@ jobs:
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v3.23.0
uses: github/codeql-action/init@v3.27.9
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -65,4 +65,4 @@ jobs:
make out/skaffold
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v3.23.0
uses: github/codeql-action/analyze@v3.27.9
98 changes: 0 additions & 98 deletions .github/workflows/draft-release.yml

This file was deleted.

22 changes: 11 additions & 11 deletions .github/workflows/integration-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
kustomize_version: [5.0.3]
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.5.0]
ko_version: [0.17.1]
kompose_version: [1.34.0]
kpt_version: [1.0.0-beta.55]
minikube_version: [1.34.0]
gcloud_sdk_version: [502.0.0]
container_structure_tests_version: [1.19.3]
integration_test_partitions: [0, 1, 2, 3]
steps:

Expand All @@ -32,9 +32,9 @@ jobs:
fetch-depth: 0

- name: Set up Go
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version: 1.20.*
go-version: 1.23.*
id: go

# Retrieve build locations with `go env`
Expand All @@ -44,7 +44,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@v4
with:
path: |
${{ steps.go-cache-paths.outputs.go-build }}
Expand Down Expand Up @@ -101,7 +101,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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/linters-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Set up Go
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version: 1.20.*
go-version: 1.23.*
id: go

- name: Check out code into the Go module directory
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/performance-comparison-label.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
echo "body=$body" >> $GITHUB_OUTPUT
- name: Create comment
uses: peter-evans/create-or-update-comment@23ff15729ef2fc348714a3bb66d2f655ca9066f2
uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043
with:
issue-number: ${{ github.event.pull_request.number }}
body: "${{ steps.parse-comment-template-into-gh-output.outputs.body }}"
10 changes: 5 additions & 5 deletions .github/workflows/performance-comparison.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,15 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Add reaction
uses: peter-evans/create-or-update-comment@23ff15729ef2fc348714a3bb66d2f655ca9066f2
uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043
with:
comment-id: ${{ github.event.comment.id }}
reactions: rocket

- name: Set up Go
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version: 1.20.*
go-version: 1.23.*
id: go

- name: Check out code into the Go module directory
Expand Down Expand Up @@ -92,7 +92,7 @@ jobs:
sudo install minikube /usr/local/bin/minikube
minikube start --profile=minikube --driver=docker
- uses: xt0rted/pull-request-comment-branch@d97294d304604fa98a2600a6e2f916a84b596dc7
- uses: xt0rted/pull-request-comment-branch@e8b8daa837e8ea7331c0003c9c316a64c6d8b0b1
id: comment-branch

- name: Make and install Skaffold binary from current PR
Expand Down Expand Up @@ -123,7 +123,7 @@ jobs:
echo "body=$body" >> $GITHUB_OUTPUT
- name: Create comment
uses: peter-evans/create-or-update-comment@23ff15729ef2fc348714a3bb66d2f655ca9066f2
uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043
with:
issue-number: ${{ github.event.issue.number }}
body: "${{ steps.run-performance-comparison-benchmarks.outputs.body }}"
13 changes: 7 additions & 6 deletions .github/workflows/scorecards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,22 +17,23 @@ jobs:
permissions:
# Needed to upload the results to code-scanning dashboard.
security-events: write
id-token: write
actions: read
contents: read

steps:
- name: "Checkout code"
uses: actions/checkout@v4 # v3.0.0
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
persist-credentials: false

- name: "Run analysis"
uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736 # v2.3.1
uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # v2.4.0
with:
results_file: results.sarif
results_format: sarif
# Read-only PAT token. To create it,
# follow the steps in https://github.com/ossf/scorecard-action#pat-token-creation.
# Read-only PAT token. To create it, follow the steps in
# https://github.com/ossf/scorecard-action/blob/main/docs/authentication/fine-grained-auth-token.md
repo_token: ${{ secrets.SCORECARD_READ_TOKEN }}
# Publish the results to enable scorecard badges. For more details, see
# https://github.com/ossf/scorecard-action#publishing-results.
Expand All @@ -42,14 +43,14 @@ jobs:

# Upload the results as artifacts (optional).
- name: "Upload artifact"
uses: actions/upload-artifact@1eb3cb2b3e0f29609092a73eb033bb759a334595 # v3.1.0
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@v3.23.0 # v1.0.26
uses: github/codeql-action/upload-sarif@dd7559424621a6dd0b32ababe9e4b271a87f78d2 # v3.27.5
with:
sarif_file: results.sarif
6 changes: 3 additions & 3 deletions .github/workflows/unit-tests-darwin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ jobs:
fetch-depth: 0

- name: Set up Go
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version: 1.20.*
go-version: 1.23.*
id: go

# Retrieve build locations with `go env`
Expand All @@ -33,7 +33,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@v4
with:
path: |
${{ steps.go-cache-paths.outputs.go-build }}
Expand Down
Loading

0 comments on commit 65bb12a

Please sign in to comment.