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(manager/flux): support chartRef in HelmRelease resources #31962

Open

ssams wants to merge 189 commits into renovatebot:main from ssams:feat/flux-chartref

+371 −50

ssams commented Oct 15, 2024 •

edited by viceice

Loading

Changes

Adds support for chartRef fields within HelmRelease resources in the flux manager, as described in #31945.

Context

Support `chartRef` for flux HelmRelease #31945

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 select 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

ssams added 2 commits

October 15, 2024 08:18


          feat(manager/flux): support chartRef in HelmRelease resources

d3f0bcd


          feat(manager/flux): update documentation for chartRef

dd7a0fa

viceice reviewed

View reviewed changes

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

viceice reviewed

View reviewed changes

lib/modules/manager/flux/__fixtures__/helmChart.yaml Show resolved Hide resolved


          feat(manager/flux): refactor to resolve review comments

ssams requested a review from viceice

October 16, 2024 07:39


          Merge branch 'main' into feat/flux-chartref

d3a0ddc

viceice reviewed

View reviewed changes

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/common.ts Outdated Show resolved Hide resolved

lib/modules/manager/flux/extract.spec.ts Outdated Show resolved Hide resolved

ssams and others added 2 commits

November 5, 2024 11:14


          feat(manager/flux): apply review comments - add logging and reuse tes…

7b968c0

…t fixture data


          Merge branch 'main' into feat/flux-chartref

3cbb614

Member

viceice commented Nov 5, 2024

conflicted

ssams and others added 5 commits

November 5, 2024 21:27


          Merge remote-tracking branch 'upstream/main' into feat/flux-chartref

950a118


          Merge branch 'main' into feat/flux-chartref

f435397


          Merge branch 'main' into feat/flux-chartref

05e507a


          Merge branch 'main' into feat/flux-chartref

84dd9ce


          Merge branch 'main' into feat/flux-chartref

a09c677

ssams requested a review from viceice

November 14, 2024 07:54

viceice requested changes

View reviewed changes

lib/modules/manager/flux/common.ts Outdated Show resolved Hide resolved

renovate bot and others added 12 commits

December 2, 2024 12:13


          fix(deps): update ghcr.io/renovatebot/base-image docker tag to v9.7.4 (…

952ab86

…renovatebot#32532)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          feat(manager/cargo): support reading package version from workspace (…

8703a11

…local only) (renovatebot#32533)


          build(deps): update dependency openpgp to v6 (renovatebot#32479)

9a1431c

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Michael Kriese <[email protected]>


          build(deps): update opentelemetry-js monorepo to v0.54.2 (renovatebot…

2c2fc61

…#32538)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          docs(gradle): correct requirements to process verification-metadata (r…

be8deab

…enovatebot#32534)


          chore(deps): update github/codeql-action action to v3.27.4 (renovateb…

e86a491

…ot#32541)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          docs: release notes for Renovate v39 (renovatebot#32504)

a4c5c3d

Co-authored-by: Rhys Arkins <[email protected]>


          fix(deps): update ghcr.io/renovatebot/base-image docker tag to v9.7.5 (…

4a59916

…renovatebot#32548)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          chore(deps): update slackapi/slack-github-action action to v1.27.1 (r…

16e70a8

…enovatebot#32554)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          chore(deps): update python:3.13 docker digest to bc78d3c (renovatebot…

e77948d

…#32553)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          fix(deps): update ghcr.io/renovatebot/base-image docker tag to v9.7.6 (…

054f0a3

…renovatebot#32557)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          feat(datasource/go): support gitea tags (renovatebot#32555)

e1993a1

renovate bot and others added 23 commits

December 2, 2024 12:13


          chore(deps): update dependency typescript to v5.7.2 (renovatebot#32811)

a3204a2

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          chore(deps): update dependency renovatebot/github-action to v41.0.5 (r…

3bd8241

…enovatebot#32816)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          feat(gerrit): Reduce email notifications (renovatebot#32817)

1f3078e


          chore(deps): update dependency @types/node to v20.17.7 (renovatebot#3…

…2820)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          docs(gradle): add a section about Gradle plugin support (renovatebot#…

d3c4205

…32773)


          chore(deps): update ghcr.io/containerbase/devcontainer docker tag to …

2098b0a

…v13.0.23 (renovatebot#32824)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          chore(deps): update dependency type-fest to v4.27.1 (renovatebot#32823)

b627479

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          fix(gerrit): getBranchStatus not returning red for failed checks (r…

e8b30bb

…enovatebot#32812)


          feat(preset): Add Apache POI monorepo group (renovatebot#32809)

1e64f80


          feat(preset): Add jetty monorepo group (renovatebot#32808)

4aa7aa2


          fix(docs): typo (renovatebot#32821)

77997cf


          fix(deps): update ghcr.io/containerbase/sidecar docker tag to v13.0.23 (

81288a9

renovatebot#32826)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          fix(deps): update ghcr.io/renovatebot/base-image docker tag to v9.11.4 (

91ac5db

renovatebot#32827)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          build(deps): update aws-sdk-js-v3 monorepo (renovatebot#32828)

767b557

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          docs(managers): add missing url and displayName (renovatebot#32621)

a797a72

Co-authored-by: Michael Kriese <[email protected]>


          fix(deps): update dependency mkdocs-material to v9.5.47 (renovatebot#…

d092f92

…32831)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          chore(deps): update dependency type-fest to v4.28.0 (renovatebot#32832)

4c1bd9a

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          chore(deps): update containerbase/internal-tools action to v3.5.4 (re…

ea419c3

…novatebot#32837)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          docs: update references to renovate/renovate (renovatebot#32838)

e2729e3

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          feat(lib/data): add Funogram monorepo (renovatebot#32835)

721ae18


          feat(manager/flux): manage HelmChart resource

548ff3e


          Merge remote-tracking branch 'upstream/main' into feat/flux-chartref

aaf1af2


          Merge remote-tracking branch 'upstream/main' into feat/flux-chartref

d5f35b4

Author

ssams commented Dec 2, 2024

unfortunately a lot of commits were introduced accidentally on this branch when merging with main somehow, but as far as I understand that shouldn't be a problem as you'll squash this anyway when merging? at least wanted to avoid force committing to remove them for now as described in the contrib guide, let me know if you need any changes to clean that up. the diff itself is clean though.

ssams requested a review from viceice

December 2, 2024 11:21


          Merge branch 'main' into feat/flux-chartref

viceice reviewed

View reviewed changes

lib/modules/manager/flux/common.ts Outdated Show resolved Hide resolved

lib/modules/manager/flux/extract.ts

@@ @@ -102,6 +106,39 @@ function resolveGitRepositoryPerSourceTag( @@
                 }
               }
+              function resolveHelmRepository(

Member

viceice Dec 12, 2024

same, extract to refactor pr. can combined with comment above

Author

ssams Dec 20, 2024

sorry, but I cannot really follow this. the extracted code in this function is literally identical to what was previously within the switch statement, and I need the exact same logic in the new case (as it's just about resolving the details of the referenced repository, properly supporting OCI repos etc). If I don't extract this into a function, I'd have to duplicate the whole block, copy+paste it down into the new case. which causes test coverage to decrease, and forcing the addition (and duplication) of test cases just to test the same code again in the other context - and to remove all of these additional tests again right afterwards in yet another PR too? that doesn't make sense.

I've removed the other refactoring as requested though, as that was in a part that is now mostly unchanged again after working on the various topics. but I really don't see how the second one here could be avoided without creating more questionable quality issues.

ssams and others added 2 commits

December 20, 2024 08:33


          Merge branch 'main' into feat/flux-chartref

88fd379


          feat(manager/flux) undo refactoring upon review request

ssams requested a review from viceice

December 20, 2024 08:04

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

39 participants