Commit Graph

975 Commits

Author SHA1 Message Date
Kubernetes Prow Robot d499de1839
Merge pull request #964 from thockin/master
Change baseimage to trixie
2025-09-11 10:40:09 -07:00
Tim Hockin e7d9ff3499
Fix stage_binaries.sh to be smarter about links
Also delete some more cruft to make the image a bit smaller
2025-09-10 16:46:20 -07:00
Tim Hockin a203e93502
Change baseimage to trixie 2025-09-08 10:50:51 -07:00
Kubernetes Prow Robot 406506c0b7
Merge pull request #963 from kubernetes/dependabot/github_actions/actions/setup-go-6
build(deps): bump actions/setup-go from 5 to 6
2025-09-08 08:25:31 -07:00
dependabot[bot] aacd6e0f42
build(deps): bump actions/setup-go from 5 to 6
Bumps [actions/setup-go](https://github.com/actions/setup-go) from 5 to 6.
- [Release notes](https://github.com/actions/setup-go/releases)
- [Commits](https://github.com/actions/setup-go/compare/v5...v6)

---
updated-dependencies:
- dependency-name: actions/setup-go
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-09-08 13:09:25 +00:00
Tim Hockin 239a784830 go mod tidy in tools/ 2025-08-29 12:25:12 -07:00
Kubernetes Prow Robot 767db9dabf
Merge pull request #958 from kubernetes/dependabot/github_actions/actions/checkout-5
build(deps): bump actions/checkout from 4 to 5
2025-08-11 14:15:07 -07:00
dependabot[bot] 8ddbbf1031
build(deps): bump actions/checkout from 4 to 5
Bumps [actions/checkout](https://github.com/actions/checkout) from 4 to 5.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v4...v5)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '5'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-08-11 20:44:26 +00:00
Tim Hockin 5639ba750d Better 'tag' command in RELEASING 2025-07-29 15:20:48 -07:00
Tim Hockin 7abdf98b8b Bump manifest-tool 2025-07-02 11:39:34 -07:00
Tim Hockin 9c7d45e6dd Bump go-licenses to v2 2025-07-02 11:39:34 -07:00
Kubernetes Prow Robot c86639029c
Merge pull request #953 from sdowell/sdowell-owners
add sdowell to OWNERS
2025-06-25 18:54:28 -07:00
Sam Dowell 83de2df2c4 add sdowell to OWNERS 2025-06-18 16:14:33 -07:00
Kubernetes Prow Robot 534976a97c
Merge pull request #952 from sdowell/null-err-log
fix: gracefully handle nil err in Logger
2025-06-16 23:57:04 -07:00
Sam Dowell 00e00f019f fix: gracefully handle nil err in Logger
This handles the case where a null error is passed into the Logger
without causing a null pointer dereference / segfault. There are
currently a couple places that invoke this function with a nil error and
were resulting in a segfault.
2025-06-16 10:04:58 -07:00
dependabot[bot] 81dcf1617c build(deps): bump golangci/golangci-lint-action from 7 to 8
Bumps [golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action) from 7 to 8.
- [Release notes](https://github.com/golangci/golangci-lint-action/releases)
- [Commits](https://github.com/golangci/golangci-lint-action/compare/v7...v8)

---
updated-dependencies:
- dependency-name: golangci/golangci-lint-action
  dependency-version: '8'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-05-05 12:54:12 -07:00
Tim Hockin d5e6b7093c Bump golangci-lint to 2.1.0 2025-05-05 12:53:52 -07:00
Tim Hockin d76f86cb4d Fix whitespace 2025-05-02 08:01:27 -07:00
Tim Hockin ba499ade2f Make all of e2e use "local" for vars 2025-05-02 08:01:27 -07:00
Kubernetes Prow Robot 2c9f83bbee
Merge pull request #946 from AlanZhang2002/ambiguous-git-reset
added separator after ref to remove git reset --soft ambiguity
2025-05-01 12:05:56 -07:00
AlanZhang2002 7d9699e5fc added test for same SHA and filename 2025-05-01 11:23:47 -07:00
AlanZhang2002 21fce7f2a1 added separator after ref to remove git reset --soft ambiguity 2025-04-29 10:29:16 -07:00
Tim Hockin 913a6be647 Bump go and golangci-lint versions, fix lint 2025-03-24 13:43:12 -07:00
Tim Hockin de11885271 Update vendor 2025-03-24 13:43:12 -07:00
Kubernetes Prow Robot b2ca599b06
Merge pull request #942 from mcarbonneaux/master
update github.com/golang-jwt/jwt/v4 from v4.5.0 to v4.5.2
2025-03-24 12:58:32 -07:00
Mathieu CARBONNEAUX 717011b661 update github.com/golang-jwt/jwt/v4 from v4.5.0 to v4.5.2
CVE-2024-51744 et CVE-2025-30204
2025-03-24 19:57:08 +01:00
Tim Hockin d259d920a7 Typo in v3-to-v4.md 2025-03-01 08:30:48 -08:00
Kubernetes Prow Robot 217fa438dc
Merge pull request #934 from nan-yu/patch-1
Remove nan-yu from the OWNERS list
2025-02-05 10:14:16 -08:00
Nan Yu f08a34a951
Remove nan-yu from the OWNERS list 2025-02-05 09:45:41 -08:00
Tim Hockin 69eb59185a Env var handling should prefer old names
For back-compat, if we find both an old and new env var for the same
flag, prefer the old.  This matters because the docker image sets
GITSYNC_ROOT but some users still set GIT_SYNC_ROOT.
2024-12-12 15:35:26 -08:00
Tim Hockin cffb28d447 Set SSH verbosity based on git-sync -v value 2024-12-12 13:49:49 -08:00
Tim Hockin 8b861d95da Capitalize "AS" in dockerfile 2024-12-12 13:28:03 -08:00
Tim Hockin 97c0d585a8 Fix up CI for GH app tests
For now we skip
2024-09-25 12:38:45 -07:00
Nan Yu 8441240d9a Enable the GitHub app e2e test
The GitHub app e2e test requires a GitHub app to be created and
installed, and also requires a few environment variables to be set.

This commit updates the GitHub action workflow by providing the
environment variables which can be set via GitHub Secret. GitHub
Secrests cannot start with `GITHUB_`. Hence, this commit prepends
`TEST_` to the env variables.

It also updates how GitHub app private key file is set. It can be set by
either `TEST_GITHUB_APP_PRIVATE_KEY` or
`TEST_GITHUB_APP_PRIVATE_KEY_FILE`.
2024-09-25 11:51:39 -07:00
Liam Wyllie 0e2e0f0adc Add support for GitHub app authentication
Signed-off-by: Liam Wyllie <risset@mailbox.org>
2024-09-25 11:51:39 -07:00
Tim Hockin 69d239562d Fix SSH docs to use correct image 2024-09-16 09:58:03 -07:00
Kubernetes Prow Robot a5a965f08b
Merge pull request #914 from sdowell/git-lock-files
fix: recover when there is unreleased lock file
2024-08-12 11:09:47 -07:00
Sam Dowell ae22b20d07 fix: recover when there is unreleased lock file
If a previous git invocation crashes, it is possible that an orphaned
lock file (e.g. shallow.lock) is left on the filesystem. This previously
caused git-sync to crash loop because the lock file is never deleted.

This change adds a check in sanityCheckRepo for the existence of a git
lock file. If the git lock file exists at this stage, then initRepo will
re-initialize the repository.
2024-08-12 10:55:47 -07:00
Tim Hockin 9782ee2cfb Add docs on symlink 2024-08-12 10:27:24 -07:00
Kubernetes Prow Robot f73ee0008d
Merge pull request #910 from sdowell/e2e-image-build
test: harden e2e image build logic
2024-07-16 16:37:05 -07:00
Sam Dowell f6f7401e6b test: harden e2e image build logic
This introduces several changes to make the e2e test image logic more
robust:

- Rename IMAGE to GIT_SYNC_E2E_IMAGE to minimize accidental misuse
- Ensure that the image built by make container is the same as the image
  used by docker run
- Do not build the container if a custom image is specified

As an example, with the prior logic the following command always fails:
IMAGE="" make test
...
Unable to find image 'gcr.io/k8s-staging-git-sync/git-sync:latest' locally

Because the docker run command pulls a different image from the one
built by make container.
2024-07-16 16:07:29 -07:00
Tim Hockin 6af1e6921d Add lint for shellcheck, fix issues 2024-07-04 15:25:25 -07:00
Kubernetes Prow Robot 458a7e5c97
Merge pull request #905 from rul/sc_testgit
test_git.sh: shellcheck entire file
2024-06-28 12:02:39 -07:00
Raúl Benencia d12d9f2a01 test_git.sh: declare restore_opts and assign separately
This avoids masking return values. Fixes SC2155. Part of #891.
2024-06-28 11:29:31 -07:00
Raúl Benencia 0e81260572 test_git.sh: use mapfile to split command output
Fixes SC2207. Part of #891.
2024-06-28 11:28:32 -07:00
Raúl Benencia 4f0dc5679b test_git.sh: add quotes to to prevent globbing and word splitting
Fixes SC2086. Part of #891.
2024-06-28 11:28:25 -07:00
Raúl Benencia 6716848f4b test_git.sh: add '-r' to 'read' to avoid mangling backslashes
Fixes SC2162. Part of #891.
2024-06-28 11:24:30 -07:00
Raúl Benencia ae368ba2f1 test_git.sh: use parameter expansion instead of sed
Fixes SC2001. Part of #891.
2024-06-28 11:21:22 -07:00
Raúl Benencia 2ee13eb2bc test_git.sh: quote literal {}
Fixes SC1083. Part of #891.
2024-06-28 10:56:31 -07:00
Raúl Benencia 99d693d647 test_git.sh: replace test regex for glob match
Don't quote rhs of =~, it'll match literally rather than as a
regex. Fixes SC2076. Part of #891.
2024-06-28 07:09:09 -07:00