Skip to content

fix: display correct OCIRepository sources for HelmReleases in applications page #5042

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.

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

Merged

Conversation

Elgarni
Copy link
Contributor

@Elgarni Elgarni commented Jun 1, 2025

Closes

What changed?

🛑 In Applications page, when the source is OCIRepository, it displays incorrect info:
incorrect-part1
And after clicking on the app it's obviously showing not found as the info are not correct:
incorrect-part2

✅ With this change, it's fixed:
working-part1
working-part2

For reference, these are the objects spec:

apiVersion: source.toolkit.fluxcd.io/v1
kind: OCIRepository
metadata:
  labels:
    app.kubernetes.io/managed-by: flux
  name: gha-runner-scale-set-controller
  namespace: github-actions-operator
spec:
  interval: 1h0m0s
  ref:
    tag: 0.10.1
  url: oci://ghcr.io/actions/actions-runner-controller-charts/gha-runner-scale-set-controller
---
apiVersion: helm.toolkit.fluxcd.io/v2
kind: HelmRelease
metadata:
  labels:
    app.kubernetes.io/managed-by: flux
  name: github-actions-operator
  namespace: github-actions-operator
spec:
  chartRef:
    kind: OCIRepository
    name: gha-runner-scale-set-controller
  interval: 1h0m0s
  releaseName: github-actions-operator

Why was this change made?
Explained above ^

How was this change implemented?

In the frontend, HelmRelease.spec.chart is handled, but HelmRelease.spec.chartRef is not (which is the case when deploying from OCI Repository)

For more info check Flux docs here https://fluxcd.io/flux/components/helm/helmreleases/#chart-reference

How did you validate the change?

  • checked all sources for HelmRelease and ensured all is working
  • no breaking changes or refactoring for existing code. Added only missing support for chartRef

Release notes

  • fix: display correct OCIRepository sources for HelmReleases in applications page

Documentation Changes

@Elgarni
Copy link
Contributor Author

Elgarni commented Jun 1, 2025

@erikgb @casibbald can you take a look here

Copy link
Contributor

@mproffitt mproffitt left a comment

Choose a reason for hiding this comment

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

LGTM

@casibbald
Copy link
Collaborator

This is awesome! Guess he just needs a rebase.

@erikgb erikgb force-pushed the fix/applications-page-oci-repo-source branch from fbb6cb3 to 4df56da Compare June 6, 2025 17:33
@erikgb erikgb enabled auto-merge (squash) June 6, 2025 17:33
@erikgb
Copy link
Contributor

erikgb commented Jun 6, 2025

I rebased and enabled auto merge. Thanks for this fix and thanks for the reviews! 🚀

@erikgb erikgb merged commit fd02842 into weaveworks:main Jun 6, 2025
15 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants