@@ -40,12 +40,13 @@ import (
4040 "k8s.io/apimachinery/pkg/types"
4141 ctrl "sigs.k8s.io/controller-runtime"
4242
43- sourcev1 "github.com/fluxcd/source-controller/api/v1beta2"
43+ sourcev1 "github.com/fluxcd/source-controller/api/v1"
44+ sourcev1b2 "github.com/fluxcd/source-controller/api/v1beta2"
4445
4546 v2 "github.com/fluxcd/helm-controller/api/v2beta1"
4647)
4748
48- func (r * HelmReleaseReconciler ) reconcileChart (ctx context.Context , hr * v2.HelmRelease ) (* sourcev1 .HelmChart , error ) {
49+ func (r * HelmReleaseReconciler ) reconcileChart (ctx context.Context , hr * v2.HelmRelease ) (* sourcev1b2 .HelmChart , error ) {
4950 chartName := types.NamespacedName {
5051 Namespace : hr .Spec .Chart .GetNamespace (hr .Namespace ),
5152 Name : hr .GetHelmChartName (),
@@ -67,7 +68,7 @@ func (r *HelmReleaseReconciler) reconcileChart(ctx context.Context, hr *v2.HelmR
6768 }
6869
6970 // Continue with the reconciliation of the current template.
70- var helmChart sourcev1 .HelmChart
71+ var helmChart sourcev1b2 .HelmChart
7172 err := r .Client .Get (ctx , chartName , & helmChart )
7273 if err != nil && ! apierrors .IsNotFound (err ) {
7374 return nil , err
@@ -81,7 +82,7 @@ func (r *HelmReleaseReconciler) reconcileChart(ctx context.Context, hr *v2.HelmR
8182 hr .Status .HelmChart = chartName .String ()
8283 return hc , nil
8384 case helmChartRequiresUpdate (hr , & helmChart ):
84- ctrl .LoggerFrom (ctx ).Info ("chart diverged from template" , strings .ToLower (sourcev1 .HelmChartKind ), chartName .String ())
85+ ctrl .LoggerFrom (ctx ).Info ("chart diverged from template" , strings .ToLower (sourcev1b2 .HelmChartKind ), chartName .String ())
8586 helmChart .Spec = hc .Spec
8687 helmChart .Labels = hc .Labels
8788 helmChart .Annotations = hc .Annotations
@@ -97,9 +98,9 @@ func (r *HelmReleaseReconciler) reconcileChart(ctx context.Context, hr *v2.HelmR
9798// getHelmChart retrieves the v1beta2.HelmChart for the given
9899// v2beta1.HelmRelease using the name that is advertised in the status
99100// object. It returns the v1beta2.HelmChart, or an error.
100- func (r * HelmReleaseReconciler ) getHelmChart (ctx context.Context , hr * v2.HelmRelease ) (* sourcev1 .HelmChart , error ) {
101+ func (r * HelmReleaseReconciler ) getHelmChart (ctx context.Context , hr * v2.HelmRelease ) (* sourcev1b2 .HelmChart , error ) {
101102 namespace , name := hr .Status .GetHelmChart ()
102- hc := & sourcev1 .HelmChart {}
103+ hc := & sourcev1b2 .HelmChart {}
103104 if err := r .Client .Get (ctx , types.NamespacedName {Namespace : namespace , Name : name }, hc ); err != nil {
104105 return nil , err
105106 }
@@ -109,7 +110,7 @@ func (r *HelmReleaseReconciler) getHelmChart(ctx context.Context, hr *v2.HelmRel
109110// loadHelmChart attempts to download the artifact from the provided source,
110111// loads it into a chart.Chart, and removes the downloaded artifact.
111112// It returns the loaded chart.Chart on success, or an error.
112- func (r * HelmReleaseReconciler ) loadHelmChart (source * sourcev1 .HelmChart ) (* chart.Chart , error ) {
113+ func (r * HelmReleaseReconciler ) loadHelmChart (source * sourcev1b2 .HelmChart ) (* chart.Chart , error ) {
113114 f , err := os .CreateTemp ("" , fmt .Sprintf ("%s-%s-*.tgz" , source .GetNamespace (), source .GetName ()))
114115 if err != nil {
115116 return nil , err
@@ -174,7 +175,7 @@ func (r *HelmReleaseReconciler) deleteHelmChart(ctx context.Context, hr *v2.Helm
174175 if hr .Status .HelmChart == "" {
175176 return nil
176177 }
177- var hc sourcev1 .HelmChart
178+ var hc sourcev1b2 .HelmChart
178179 chartNS , chartName := hr .Status .GetHelmChart ()
179180 err := r .Client .Get (ctx , types.NamespacedName {Namespace : chartNS , Name : chartName }, & hc )
180181 if err != nil {
@@ -196,19 +197,19 @@ func (r *HelmReleaseReconciler) deleteHelmChart(ctx context.Context, hr *v2.Helm
196197
197198// buildHelmChartFromTemplate builds a v1beta2.HelmChart from the
198199// v2beta1.HelmChartTemplate of the given v2beta1.HelmRelease.
199- func buildHelmChartFromTemplate (hr * v2.HelmRelease ) * sourcev1 .HelmChart {
200+ func buildHelmChartFromTemplate (hr * v2.HelmRelease ) * sourcev1b2 .HelmChart {
200201 template := hr .Spec .Chart
201- return & sourcev1 .HelmChart {
202+ return & sourcev1b2 .HelmChart {
202203 ObjectMeta : metav1.ObjectMeta {
203204 Name : hr .GetHelmChartName (),
204205 Namespace : hr .Spec .Chart .GetNamespace (hr .Namespace ),
205206 Labels : hr .Spec .Chart .ObjectMeta .Labels ,
206207 Annotations : hr .Spec .Chart .ObjectMeta .Annotations ,
207208 },
208- Spec : sourcev1 .HelmChartSpec {
209+ Spec : sourcev1b2 .HelmChartSpec {
209210 Chart : template .Spec .Chart ,
210211 Version : template .Spec .Version ,
211- SourceRef : sourcev1 .LocalHelmChartSourceReference {
212+ SourceRef : sourcev1b2 .LocalHelmChartSourceReference {
212213 Name : template .Spec .SourceRef .Name ,
213214 Kind : template .Spec .SourceRef .Kind ,
214215 },
@@ -224,7 +225,7 @@ func buildHelmChartFromTemplate(hr *v2.HelmRelease) *sourcev1.HelmChart {
224225// helmChartRequiresUpdate compares the v2beta1.HelmChartTemplate of the
225226// v2beta1.HelmRelease to the given v1beta2.HelmChart to determine if an
226227// update is required.
227- func helmChartRequiresUpdate (hr * v2.HelmRelease , chart * sourcev1 .HelmChart ) bool {
228+ func helmChartRequiresUpdate (hr * v2.HelmRelease , chart * sourcev1b2 .HelmChart ) bool {
228229 template := hr .Spec .Chart
229230 switch {
230231 case template .Spec .Chart != chart .Spec .Chart :
@@ -257,12 +258,12 @@ func helmChartRequiresUpdate(hr *v2.HelmRelease, chart *sourcev1.HelmChart) bool
257258}
258259
259260// templateVerificationToSourceVerification converts the HelmChartTemplateVerification to the OCIRepositoryVerification.
260- func templateVerificationToSourceVerification (template * v2.HelmChartTemplateVerification ) * sourcev1 .OCIRepositoryVerification {
261+ func templateVerificationToSourceVerification (template * v2.HelmChartTemplateVerification ) * sourcev1b2 .OCIRepositoryVerification {
261262 if template == nil {
262263 return nil
263264 }
264265
265- return & sourcev1 .OCIRepositoryVerification {
266+ return & sourcev1b2 .OCIRepositoryVerification {
266267 Provider : template .Provider ,
267268 SecretRef : template .SecretRef ,
268269 }
0 commit comments