Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade github.com/fluxcd/pkg/{git,git/gogit} #4238

Merged
merged 1 commit into from
Sep 13, 2023
Merged

Upgrade github.com/fluxcd/pkg/{git,git/gogit} #4238

merged 1 commit into from
Sep 13, 2023

Conversation

makkes
Copy link
Member

@makkes makkes commented Sep 13, 2023

This allows us to get rid of the replace directive consuming the filepath-securejoin fork.

@makkes makkes requested a review from pjbgf September 13, 2023 15:48
Upgrade github.com/fluxcd/pkg/{git,git/gogit}
c721474 
This allows us to get rid of the replace directive consuming the
filepath-securejoin fork.

Signed-off-by: Max Jonas Werner <[email protected]>
@makkes makkes merged commit 904226f into main Sep 13, 2023
@makkes makkes deleted the upgrade-pkg branch September 13, 2023 17:38
@stefanprodan stefanprodan added dependencies Pull requests that update a dependency backport:release/v2.1.x To be backported to release/v2.1.x labels Sep 18, 2023
@fluxcdbot
Copy link
Member

Backport failed for release/v2.1.x, because it was unable to cherry-pick the commit(s).

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
@fluxcdbot
Copy link
Member

Backport failed for release/v2.1.x, because it was unable to cherry-pick the commit(s).

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
@nrdufour
chore(deps): update dependency fluxcd/flux2 to v2.1.1 (#94)
a349b22 
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 [#&#8203;4255](fluxcd/flux2#4255) - [@&#8203;hiddeco](https://github.com/hiddeco) - tests/azure: update controller dependencies
-   PR [#&#8203;4251](fluxcd/flux2#4251) - [@&#8203;fluxcdbot](https://github.com/fluxcdbot) - Update toolkit components
-   PR [#&#8203;4246](fluxcd/flux2#4246) - [@&#8203;dependabot](https://github.com/dependabot)\[bot] - build(deps): bump the ci group with 4 updates
-   PR [#&#8203;4238](fluxcd/flux2#4238) - [@&#8203;makkes](https://github.com/makkes) - Upgrade github.com/fluxcd/pkg/{git,git/gogit}
-   PR [#&#8203;4233](fluxcd/flux2#4233) - [@&#8203;sonbui00](https://github.com/sonbui00) - chore: remove support armv6h for aur package
-   PR [#&#8203;4228](fluxcd/flux2#4228) - [@&#8203;sonbui00](https://github.com/sonbui00) - Improve AUR package templates
-   PR [#&#8203;4227](fluxcd/flux2#4227) - [@&#8203;dependabot](https://github.com/dependabot)\[bot] - build(deps): bump the ci group with 3 updates
-   PR [#&#8203;4226](fluxcd/flux2#4226) - [@&#8203;somtochiama](https://github.com/somtochiama) - Update description of kubeconfig specific flag
-   PR [#&#8203;4222](fluxcd/flux2#4222) - [@&#8203;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 [#&#8203;4221](fluxcd/flux2#4221) - [@&#8203;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 [#&#8203;4215](fluxcd/flux2#4215) - [@&#8203;dependabot](https://github.com/dependabot)\[bot] - build(deps): bump the ci group with 4 updates
-   PR [#&#8203;4213](fluxcd/flux2#4213) - [@&#8203;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 [#&#8203;4212](fluxcd/flux2#4212) - [@&#8203;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 [#&#8203;4198](fluxcd/flux2#4198) - [@&#8203;makkes](https://github.com/makkes) - Add 2.1.x backport label
-   PR [#&#8203;4197](fluxcd/flux2#4197) - [@&#8203;stefanprodan](https://github.com/stefanprodan) - Fix links to fluxcd.io
-   PR [#&#8203;4195](fluxcd/flux2#4195) - [@&#8203;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 <[email protected]>
Co-committed-by: Renovate <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pjbgf pjbgf pjbgf approved these changes

Assignees
No one assigned
Labels
backport:release/v2.1.x To be backported to release/v2.1.x dependencies Pull requests that update a dependency
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@makkes @fluxcdbot @pjbgf @stefanprodan