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

feat(flux): add support for renovating OCIRespository #19017

Merged
merged 34 commits into from Dec 6, 2022
Merged

feat(flux): add support for renovating OCIRespository #19017

merged 34 commits into from Dec 6, 2022

Conversation

onedr0p
Copy link
Contributor

@onedr0p onedr0p commented Nov 22, 2022 •
edited

Signed-off-by: Devin Buhl devin@buhl.casa

Changes

Supports renovating https://fluxcd.io/flux/components/source/ocirepositories/ with either tag or digest

This PR does not address HelmRepository OCI only OCIRepository

Context

This adds support for renovating Flux's OCIRepository

Documentation (please check one with an [x])

  • I have updated the documentation, or
  • No documentation update is required

How I've tested my work (please tick one)

I have verified these changes via:

  • Code inspection only, or
  • Newly added/modified unit tests, or
  • No unit tests but ran on a real repository, or
  • Both unit tests + ran on a real repository

@onedr0p
fix: add original files from dirty branch
8dd07f1 
Signed-off-by: Devin Buhl <devin@buhl.casa>
@onedr0p
fix: add fixture files from dirty branch
fe73875 
Signed-off-by: Devin Buhl <devin@buhl.casa>
@onedr0p
fix: Remove oci Helm functionality for this PR
1a1007c 
Signed-off-by: Devin Buhl <devin@buhl.casa>
@onedr0p
chore: Update README.md
3062d7b 
Signed-off-by: Devin Buhl <devin@buhl.casa>
@onedr0p
chore: Run linter
cc9d99d 
Signed-off-by: Devin Buhl <devin@buhl.casa>
@onedr0p
fix: Remove stale files from tests
a34a061 
Signed-off-by: Devin Buhl <devin@buhl.casa>
viceice
viceice requested changes Nov 22, 2022
View reviewed changes
lib/modules/manager/flux/__fixtures__/ociSource.yaml Show resolved Hide resolved
lib/modules/manager/flux/extract.ts Outdated Show resolved Hide resolved
lib/modules/manager/flux/extract.ts Outdated Show resolved Hide resolved
lib/modules/manager/flux/extract.ts Outdated Show resolved Hide resolved
lib/modules/manager/flux/index.ts Outdated Show resolved Hide resolved
@viceice
Copy link
Member

viceice commented Nov 22, 2022

please reuse old PR in future. so we don't loose discussion history. you can force push in cases when a merge commit is to complicated to solve conflicts.

HonkingGoose
HonkingGoose reviewed Nov 22, 2022
View reviewed changes
lib/modules/manager/flux/extract.spec.ts Outdated Show resolved Hide resolved
lib/modules/manager/flux/readme.md Outdated Show resolved Hide resolved
@onedr0p
Copy link
Contributor Author

onedr0p commented Nov 22, 2022 •
edited

@viceice sorry for the dupe PR.

This won't close #18509 but I do plan to add support for that in another PR. I'll open an issue for OCIRepository and update the PR description to link to it.

Edit: Issue opened #19034 and PR description updated.

onedr0p and others added 8 commits November 22, 2022 07:28
@onedr0p @viceice
Update lib/modules/manager/flux/extract.ts
605af84 
Co-authored-by: Michael Kriese <michael.kriese@visualon.de>
@onedr0p @viceice
Update lib/modules/manager/flux/extract.ts
c80a136 
Co-authored-by: Michael Kriese <michael.kriese@visualon.de>
@onedr0p @viceice
Update lib/modules/manager/flux/extract.ts
42304f9 
Co-authored-by: Michael Kriese <michael.kriese@visualon.de>
@onedr0p @HonkingGoose
Update lib/modules/manager/flux/extract.spec.ts
49669b9 
Co-authored-by: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com>
@onedr0p
fix: update order of imports
eb8d633 
Signed-off-by: Devin Buhl <devin@buhl.casa>
@onedr0p
fix: correct tests for removing registryUrls and add test for digest …
39b9d16 
…and tag

Signed-off-by: Devin Buhl <devin@buhl.casa>
@onedr0p
fix: do not use var when it is not needed
7663b4b 
Signed-off-by: Devin Buhl <devin@buhl.casa>
@onedr0p
chore: Note in readme that digest takes precedence over tag
56b56fc 
Signed-off-by: Devin Buhl <devin@buhl.casa>
HonkingGoose
HonkingGoose suggested changes Nov 22, 2022
View reviewed changes
Copy link
Collaborator

@HonkingGoose HonkingGoose left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Small docs change.

lib/modules/manager/flux/readme.md Outdated Show resolved Hide resolved
onedr0p and others added 2 commits November 22, 2022 08:39
@onedr0p @HonkingGoose
Update lib/modules/manager/flux/readme.md
bc571a1 
Co-authored-by: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com>
@onedr0p
Merge branch 'main' into onedr0p-flux-oci
27228dc
@onedr0p
feat: Add support for tag with digest present
3707088 
Signed-off-by: Devin Buhl <devin@buhl.casa>
@rarkins rarkins requested a review from viceice November 24, 2022 07:42
HonkingGoose
HonkingGoose previously approved these changes Nov 27, 2022
View reviewed changes
viceice
viceice requested changes Nov 27, 2022
View reviewed changes
lib/modules/manager/flux/extract.ts Show resolved Hide resolved
lib/modules/manager/flux/extract.ts Outdated Show resolved Hide resolved
onedr0p and others added 3 commits November 28, 2022 16:16
@onedr0p @viceice
Update lib/modules/manager/flux/extract.ts
1e891de 
Co-authored-by: Michael Kriese <michael.kriese@visualon.de>
@onedr0p
fix: Log message, remove depName from tmpl
25eb22c 
Signed-off-by: Devin Buhl <devin@buhl.casa>
@rarkins
Merge branch 'main' into onedr0p-flux-oci
9a58ee0
@onedr0p onedr0p requested review from viceice and HonkingGoose and removed request for viceice and HonkingGoose November 29, 2022 12:37
@onedr0p
Copy link
Contributor Author

onedr0p commented Nov 29, 2022 •
edited

@viceice anything else you want me to cover in this PR?

viceice
viceice reviewed Nov 30, 2022
View reviewed changes
Copy link
Member

@viceice viceice left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you can probably also remove that from deps and return type.

lib/modules/manager/flux/extract.ts Outdated Show resolved Hide resolved
@onedr0p
fix: Remove type FluxManagerData on PackageDependency interface
f81d5cb 
Signed-off-by: Devin Buhl <devin@buhl.casa>
@onedr0p
Copy link
Contributor Author

onedr0p commented Nov 30, 2022

@viceice should be all set again

@onedr0p onedr0p requested a review from viceice November 30, 2022 14:31
@onedr0p
Copy link
Contributor Author

onedr0p commented Dec 5, 2022 •
edited

@viceice any chance on another review? I am keen to get started on some other work for this manager but want to make sure this PR is good first before continuing. Thanks!

HonkingGoose
HonkingGoose approved these changes Dec 5, 2022
View reviewed changes
Copy link
Collaborator

@HonkingGoose HonkingGoose left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm happy with the docs.

@rarkins rarkins enabled auto-merge (squash) December 5, 2022 19:22
@rarkins rarkins merged commit 06d92d0 into renovatebot:main Dec 6, 2022
@renovate-release
Copy link
Collaborator

🎉 This PR is included in version 34.50.0 🎉

The release is available on:

Your semantic-release bot 📦🚀

@onedr0p onedr0p deleted the onedr0p-flux-oci branch December 6, 2022 13:10
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jan 6, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@viceice viceice viceice approved these changes

@HonkingGoose HonkingGoose HonkingGoose approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Adding support for OCIRepository for flux manager
5 participants
@onedr0p @viceice @renovate-release @HonkingGoose @rarkins