chore(ci): buildtools update addon command fails (#3100)

Author: emosbaugh

cmd/buildtools/utils.go

@@ -355,7 +355,7 @@ func GetGreatestTagFromRegistry(ctx context.Context, ref string, constraints *se
 
 func LatestChartVersion(ctx context.Context, hcli helm.Client, repo *repo.Entry, name string) (string, error) {
 	logrus.Infof("adding helm repo %s", repo.Name)
-	err := hcli.AddRepo(ctx, repo)
+	err := hcli.AddRepoBin(ctx, repo)
 	if err != nil {
 		return "", fmt.Errorf("add helm repo: %w", err)
 	}
@@ -479,6 +479,10 @@ func MirrorChart(ctx context.Context, hcli helm.Client, repo *repo.Entry, name,
 	logrus.Infof("downloaded %s chart: %s", name, chpath)
 	defer os.Remove(chpath)
 
+	err = hcli.AddRepoBin(ctx, repo)
+	if err != nil {
+		return fmt.Errorf("add helm repo: %w", err)
+	}
 	srcMeta, err := hcli.GetChartMetadata(ctx, chpath, ver)
 	if err != nil {
 		return fmt.Errorf("get source chart metadata: %w", err)

pkg/helm/client.go

@@ -205,6 +205,40 @@ func (h *HelmClient) AddRepo(_ context.Context, repo *repo.Entry) error {
 	return nil
 }
 
+// AddRepoBin adds a repository to the helm client using the helm binary. This is necessary because
+// the AddRepo method does not work with other methods using the binary executor.
+func (h *HelmClient) AddRepoBin(ctx context.Context, repo *repo.Entry) error {
+	// Use helm repo add command to add the repository
+	args := []string{"repo", "add", repo.Name, repo.URL}
+
+	// Add username/password if provided
+	if repo.Username != "" {
+		args = append(args, "--username", repo.Username)
+	}
+	if repo.Password != "" {
+		args = append(args, "--password", repo.Password)
+	}
+
+	// Add insecure flag if needed
+	if repo.InsecureSkipTLSverify {
+		args = append(args, "--insecure-skip-tls-verify")
+	}
+
+	// Add pass-credentials flag if needed
+	if repo.PassCredentialsAll {
+		args = append(args, "--pass-credentials")
+	}
+
+	_, _, err := h.executor.ExecuteCommand(ctx, nil, nil, args...)
+	if err != nil {
+		return fmt.Errorf("helm repo add: %w", err)
+	}
+
+	// Store the repository entry for future reference
+	h.repositories = append(h.repositories, repo)
+	return nil
+}
+
 func (h *HelmClient) Latest(ctx context.Context, reponame, chart string) (string, error) {
 	// Use helm search repo with JSON output to find the latest version
 	args := []string{"search", "repo", fmt.Sprintf("%s/%s", reponame, chart), "--version", ">0.0.0", "--versions", "--output", "json"}

pkg/helm/interface.go

@@ -15,6 +15,7 @@ var (
 type Client interface {
 	Close() error
 	AddRepo(ctx context.Context, repo *repo.Entry) error
+	AddRepoBin(ctx context.Context, repo *repo.Entry) error
 	Latest(ctx context.Context, reponame, chart string) (string, error)
 	Pull(ctx context.Context, reponame, chart string, version string) (string, error)
 	PullByRef(ctx context.Context, ref string, version string) (string, error)

pkg/helm/mock_client.go

@@ -25,6 +25,11 @@ func (m *MockClient) AddRepo(ctx context.Context, repo *repo.Entry) error {
 	return args.Error(0)
 }
 
+func (m *MockClient) AddRepoBin(ctx context.Context, repo *repo.Entry) error {
+	args := m.Called(ctx, repo)
+	return args.Error(0)
+}
+
 func (m *MockClient) Latest(ctx context.Context, reponame, chart string) (string, error) {
 	args := m.Called(ctx, reponame, chart)
 	return args.String(0), args.Error(1)