Charles | missing api updates

weaveworks · Nov 21, 2024 · cdfc0e4 · cdfc0e4
1 parent eac4e54
commit cdfc0e4
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/core/server/inventory_test.go b/core/server/inventory_test.go
@@ -7,7 +7,7 @@ import (
 	"fmt"
 	"testing"
 
-	helmv2 "github.com/fluxcd/helm-controller/api/v2beta2"
+	helmv2 "github.com/fluxcd/helm-controller/api/v2"
 	kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1"
 	"github.com/fluxcd/pkg/apis/meta"
 	sourcev1 "github.com/fluxcd/source-controller/api/v1"

diff --git a/core/server/suspend_test.go b/core/server/suspend_test.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"testing"
 
-	helmv2 "github.com/fluxcd/helm-controller/api/v2beta2"
-	imgautomationv1 "github.com/fluxcd/image-automation-controller/api/v1beta1"
+	helmv2 "github.com/fluxcd/helm-controller/api/v2"
+	imgautomationv1 "github.com/fluxcd/image-automation-controller/api/v1beta2"
 	reflectorv1 "github.com/fluxcd/image-reflector-controller/api/v1beta2"
 	kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1"
 	sourcev1 "github.com/fluxcd/source-controller/api/v1"

diff --git a/core/server/sync_test.go b/core/server/sync_test.go
@@ -7,7 +7,7 @@ import (
 	"time"
 
 	helmv2 "github.com/fluxcd/helm-controller/api/v2"
-	imgautomationv1 "github.com/fluxcd/image-automation-controller/api/v1beta1"
+	imgautomationv1 "github.com/fluxcd/image-automation-controller/api/v1beta2"
 	reflectorv1 "github.com/fluxcd/image-reflector-controller/api/v1beta2"
 	kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1"
 	"github.com/fluxcd/pkg/apis/meta"
@@ -417,7 +417,7 @@ func makeHelmRelease(name string, ns corev1.Namespace, repo *sourcev1b2.HelmRepo
 			Namespace: ns.Name,
 		},
 		Spec: helmv2.HelmReleaseSpec{
-			Chart: helmv2.HelmChartTemplate{
+			Chart: &helmv2.HelmChartTemplate{
 				Spec: helmv2.HelmChartTemplateSpec{
 					Chart:   chart.Spec.Chart,
 					Version: chart.Spec.Version,

diff --git a/pkg/run/install/install_dashboard.go b/pkg/run/install/install_dashboard.go
@@ -364,7 +364,7 @@ func makeHelmRelease(log logger.Logger, name, namespace, username, passwordHash,
 			Interval: metav1.Duration{
 				Duration: 60 * time.Minute,
 			},
-			Chart: helmv2.HelmChartTemplate{
+			Chart: &helmv2.HelmChartTemplate{
 				Spec: helmv2.HelmChartTemplateSpec{
 					Chart: ossDashboardHelmChartName,
 					SourceRef: helmv2.CrossNamespaceObjectReference{

diff --git a/pkg/run/install/install_dashboard_test.go b/pkg/run/install/install_dashboard_test.go
@@ -66,7 +66,7 @@ var helmReleaseFixtures = []runtime.Object{
 			Name:      "dashboard-2",
 		},
 		Spec: helmv2.HelmReleaseSpec{
-			Chart: helmv2.HelmChartTemplate{
+			Chart: &helmv2.HelmChartTemplate{
 				Spec: helmv2.HelmChartTemplateSpec{
 					Chart: ossDashboardHelmChartName,
 				},
@@ -79,7 +79,7 @@ var helmReleaseFixtures = []runtime.Object{
 			Name:      "dashboard-3",
 		},
 		Spec: helmv2.HelmReleaseSpec{
-			Chart: helmv2.HelmChartTemplate{
+			Chart: &helmv2.HelmChartTemplate{
 				Spec: helmv2.HelmChartTemplateSpec{
 					Chart: enterpriseDashboardHelmChartName,
 					SourceRef: helmv2.CrossNamespaceObjectReference{