Upgrade github.com/fluxcd/pkg/{git,git/gogit} #4238
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This allows us to get rid of the replace directive consuming the filepath-securejoin fork. Signed-off-by: Max Jonas Werner <mail@makk.es>
pjbgf
approved these changes
Sep 13, 2023
stefanprodan
added
dependencies
|
Backport failed for Please cherry-pick the changes locally. git fetch origin release/v2.1.x
git worktree add -d .worktree/backport-4238-to-release/v2.1.x origin/release/v2.1.x
cd .worktree/backport-4238-to-release/v2.1.x
git checkout -b backport-4238-to-release/v2.1.x
ancref=$(git merge-base 1902f4af0d726673d72d4cf6deb322140b25910f c721474e0bcbe21d7161bb62dd380908578f575b)
git cherry-pick -x $ancref..c721474e0bcbe21d7161bb62dd380908578f575b |
1 similar comment
|
Backport failed for Please cherry-pick the changes locally. git fetch origin release/v2.1.x
git worktree add -d .worktree/backport-4238-to-release/v2.1.x origin/release/v2.1.x
cd .worktree/backport-4238-to-release/v2.1.x
git checkout -b backport-4238-to-release/v2.1.x
ancref=$(git merge-base 1902f4af0d726673d72d4cf6deb322140b25910f c721474e0bcbe21d7161bb62dd380908578f575b)
git cherry-pick -x $ancref..c721474e0bcbe21d7161bb62dd380908578f575b |
nrdufour
added a commit
to nrdufour/home-ops
that referenced
this pull request
Oct 3, 2023
This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [fluxcd/flux2](https://github.com/fluxcd/flux2) | Kustomization | patch | `v2.1.0` -> `v2.1.1` | --- ### Release Notes <details> <summary>fluxcd/flux2 (fluxcd/flux2)</summary> ### [`v2.1.1`](https://github.com/fluxcd/flux2/releases/tag/v2.1.1) [Compare Source](fluxcd/flux2@v2.1.0...v2.1.1) #### Highlights Flux `v2.1.1` is a patch release which comes with various fixes. Users are encouraged to upgrade for the best experience. ##### Fixes - Use auto lookup strategy for Buckets to widen support for S3-compatible object storage services (`source-controller`). - Fix Secret type check for HelmRepositories TLS certs referred in `.spec.secretRef` (`source-controller`). - Fix the branch name reporting when the push branch is the same as the checkout branch (`image-automation-controller`). - Restore Helm logs inclusion in failure events (`helm-controller`). - Fix the impersonation of the default service account when diffing HelmReleases (`helm-controller`). - Check source for `nil` artifact before loading Helm charts (`helm-controller`). - Update the description of Kubernetes specific flag to distinguish them from Flux bootstrap flags (`flux` CLI). #### Components changelog - source-controller [v1.1.1](https://github.com/fluxcd/source-controller/blob/v1.1.1/CHANGELOG.md) - helm-controller [v0.36.1](https://github.com/fluxcd/helm-controller/blob/v0.36.1/CHANGELOG.md) - image-automation-controller [v0.36.1](https://github.com/fluxcd/image-automation-controller/blob/v0.36.1/CHANGELOG.md) #### CLI Changelog - PR [#​4255](fluxcd/flux2#4255) - [@​hiddeco](https://github.com/hiddeco) - tests/azure: update controller dependencies - PR [#​4251](fluxcd/flux2#4251) - [@​fluxcdbot](https://github.com/fluxcdbot) - Update toolkit components - PR [#​4246](fluxcd/flux2#4246) - [@​dependabot](https://github.com/dependabot)\[bot] - build(deps): bump the ci group with 4 updates - PR [#​4238](fluxcd/flux2#4238) - [@​makkes](https://github.com/makkes) - Upgrade github.com/fluxcd/pkg/{git,git/gogit} - PR [#​4233](fluxcd/flux2#4233) - [@​sonbui00](https://github.com/sonbui00) - chore: remove support armv6h for aur package - PR [#​4228](fluxcd/flux2#4228) - [@​sonbui00](https://github.com/sonbui00) - Improve AUR package templates - PR [#​4227](fluxcd/flux2#4227) - [@​dependabot](https://github.com/dependabot)\[bot] - build(deps): bump the ci group with 3 updates - PR [#​4226](fluxcd/flux2#4226) - [@​somtochiama](https://github.com/somtochiama) - Update description of kubeconfig specific flag - PR [#​4222](fluxcd/flux2#4222) - [@​dependabot](https://github.com/dependabot)\[bot] - build(deps): bump github.com/cyphar/filepath-securejoin from 0.2.3 to 0.2.4 in /tests/integration - PR [#​4221](fluxcd/flux2#4221) - [@​dependabot](https://github.com/dependabot)\[bot] - build(deps): bump github.com/cyphar/filepath-securejoin from 0.2.3 to 0.2.4 in /tests/azure - PR [#​4215](fluxcd/flux2#4215) - [@​dependabot](https://github.com/dependabot)\[bot] - build(deps): bump the ci group with 4 updates - PR [#​4213](fluxcd/flux2#4213) - [@​dependabot](https://github.com/dependabot)\[bot] - build(deps): bump github.com/docker/distribution from 2.8.1+incompatible to 2.8.2+incompatible in /tests/integration - PR [#​4212](fluxcd/flux2#4212) - [@​dependabot](https://github.com/dependabot)\[bot] - build(deps): bump github.com/docker/docker from 23.0.1+incompatible to 23.0.3+incompatible in /tests/integration - PR [#​4198](fluxcd/flux2#4198) - [@​makkes](https://github.com/makkes) - Add 2.1.x backport label - PR [#​4197](fluxcd/flux2#4197) - [@​stefanprodan](https://github.com/stefanprodan) - Fix links to fluxcd.io - PR [#​4195](fluxcd/flux2#4195) - [@​dependabot](https://github.com/dependabot)\[bot] - build(deps): bump the ci group with 2 updates </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNi45Ni4wIiwidXBkYXRlZEluVmVyIjoiMzYuOTYuMCIsInRhcmdldEJyYW5jaCI6Im1haW4ifQ==--> Reviewed-on: https://git.home/nrdufour/home-ops/pulls/94 Co-authored-by: Renovate <renovate@ptinem.io> Co-committed-by: Renovate <renovate@ptinem.io>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This allows us to get rid of the replace directive consuming the filepath-securejoin fork.