Use pointer when converting Helm configs (#251)

* Use pointer when converting Helm configs

Author: sgalsaleh

go.mod

@@ -18,7 +18,7 @@ require (
 	github.com/ohler55/ojg v1.23.0
 	github.com/onsi/ginkgo/v2 v2.19.0
 	github.com/onsi/gomega v1.33.1
-	github.com/replicatedhq/embedded-cluster-kinds v1.4.5
+	github.com/replicatedhq/embedded-cluster-kinds v1.4.6
 	github.com/sirupsen/logrus v1.9.3
 	github.com/spf13/cobra v1.8.1
 	github.com/stretchr/testify v1.9.0

go.sum

@@ -174,8 +174,8 @@ github.com/prometheus/common v0.45.0 h1:2BGz0eBc2hdMDLnO/8n0jeB3oPrt2D08CekT0lne
 github.com/prometheus/common v0.45.0/go.mod h1:YJmSTw9BoKxJplESWWxlbyttQR4uaEcGyv9MZjVOJsY=
 github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo=
 github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo=
-github.com/replicatedhq/embedded-cluster-kinds v1.4.5 h1:OZygNoSL4yFF+r+0l2slnq/2aj3Wl6KF1TE2euz8hVI=
-github.com/replicatedhq/embedded-cluster-kinds v1.4.5/go.mod h1:AwopUvvGcaWO4mn9DkbPj5RnLuOy756CNLrcaAlmjMo=
+github.com/replicatedhq/embedded-cluster-kinds v1.4.6 h1:nP2/ANhUW1omiPp3WFm6tQWkLy9fAA4JPveazg8LlTU=
+github.com/replicatedhq/embedded-cluster-kinds v1.4.6/go.mod h1:AwopUvvGcaWO4mn9DkbPj5RnLuOy756CNLrcaAlmjMo=
 github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
 github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=

pkg/upgrade/upgrade.go

@@ -12,7 +12,6 @@ import (
 	k0sv1beta1 "github.com/k0sproject/k0s/pkg/apis/k0s/v1beta1"
 	"github.com/replicatedhq/embedded-cluster-kinds/apis/v1beta1"
 	clusterv1beta1 "github.com/replicatedhq/embedded-cluster-kinds/apis/v1beta1"
-	ectypes "github.com/replicatedhq/embedded-cluster-kinds/types"
 	"github.com/replicatedhq/embedded-cluster-operator/pkg/artifacts"
 	"github.com/replicatedhq/embedded-cluster-operator/pkg/autopilot"
 	"github.com/replicatedhq/embedded-cluster-operator/pkg/charts"
@@ -226,7 +225,7 @@ func getOperatorChart(ctx context.Context, cli client.Client, in *clusterv1beta1
 		return nil, fmt.Errorf("failed to get helm charts from installation: %w", err)
 	}
 
-	cfgs := k0sv1beta1.HelmExtensions{}
+	cfgs := &k0sv1beta1.HelmExtensions{}
 	cfgs, err = v1beta1.ConvertTo(*combinedConfigs, cfgs)
 	if err != nil {
 		return nil, fmt.Errorf("convert to k0s helm type: %w", err)
@@ -241,21 +240,6 @@ func getOperatorChart(ctx context.Context, cli client.Client, in *clusterv1beta1
 	return nil, fmt.Errorf("operator chart not found")
 }
 
-func getOperatorChartFromMetadata(metadata *ectypes.ReleaseMetadata) (k0sv1beta1.Chart, error) {
-	cfgs := k0sv1beta1.HelmExtensions{}
-	cfgs, err := v1beta1.ConvertTo(metadata.Configs, cfgs)
-	if err != nil {
-		return k0sv1beta1.Chart{}, fmt.Errorf("convert to k0s helm type: %w", err)
-	}
-
-	for _, chart := range cfgs.Charts {
-		if chart.Name == operatorChartName {
-			return chart, nil
-		}
-	}
-	return k0sv1beta1.Chart{}, fmt.Errorf("chart not found")
-}
-
 const (
 	installationNameAnnotation = "embedded-cluster.replicated.com/installation-name"
 )