Merge remote-tracking branch 'origin/main' into k0s-1-29

Author: emosbaugh

Makefile

@@ -15,7 +15,7 @@ K0S_GO_VERSION = v1.29.13+k0s.0
 PREVIOUS_K0S_VERSION ?= v1.28.14+k0s.0-ec.0
 PREVIOUS_K0S_GO_VERSION ?= v1.28.14+k0s.0
 K0S_BINARY_SOURCE_OVERRIDE =
-TROUBLESHOOT_VERSION = v0.116.1
+TROUBLESHOOT_VERSION = v0.116.3
 
 KOTS_VERSION = v$(shell awk '/^version/{print $$2}' pkg/addons/adminconsole/static/metadata.yaml | sed -E 's/([0-9]+\.[0-9]+\.[0-9]+).*/\1/')
 # When updating KOTS_BINARY_URL_OVERRIDE, also update the KOTS_VERSION above or

cmd/buildtools/adminconsole.go

@@ -71,7 +71,7 @@ var updateAdminConsoleAddonCommand = &cli.Command{
 
 		logrus.Infof("extracting images from chart")
 		withproto := fmt.Sprintf("oci://%s", upstream)
-		images, err := helm.ExtractImagesFromOCIChart(hcli, withproto, "adminconsole", latest, values)
+		images, err := helm.ExtractImagesFromChart(hcli, withproto, latest, values)
 		if err != nil {
 			return fmt.Errorf("failed to get images from admin console chart: %w", err)
 		}

cmd/buildtools/embeddedclusteroperator.go

@@ -125,7 +125,7 @@ func updateOperatorAddonImages(ctx context.Context, hcli helm.Client, chartURL s
 	}
 
 	logrus.Infof("extracting images from chart version %s", chartVersion)
-	images, err := helm.ExtractImagesFromOCIChart(hcli, chartURL, "embeddedclusteroperator", chartVersion, values)
+	images, err := helm.ExtractImagesFromChart(hcli, chartURL, chartVersion, values)
 	if err != nil {
 		return fmt.Errorf("failed to get images from embedded cluster operator chart: %w", err)
 	}

cmd/buildtools/metadata.go

@@ -6,7 +6,6 @@ import (
 	"log"
 	"os"
 	"sort"
-	"strings"
 
 	k0sv1beta1 "github.com/k0sproject/k0s/pkg/apis/k0s/v1beta1"
 	embeddedclusterv1beta1 "github.com/replicatedhq/embedded-cluster/kinds/apis/v1beta1"
@@ -125,9 +124,5 @@ func extractImagesFromChart(hcli helm.Client, chart embeddedclusterv1beta1.Chart
 		}
 	}
 
-	if strings.HasPrefix(chart.ChartName, "oci://") {
-		return helm.ExtractImagesFromOCIChart(hcli, chart.ChartName, chart.Name, chart.Version, values)
-	}
-	parts := strings.SplitN(chart.ChartName, "/", 2)
-	return helm.ExtractImagesFromChart(hcli, parts[0], parts[1], chart.Version, values)
+	return helm.ExtractImagesFromChart(hcli, chart.ChartName, chart.Version, values)
 }

cmd/buildtools/openebs.go

@@ -134,7 +134,7 @@ func updateOpenEBSAddonImages(ctx context.Context, hcli helm.Client, chartURL st
 	}
 
 	logrus.Infof("extracting images from chart version %s", chartVersion)
-	images, err := helm.ExtractImagesFromOCIChart(hcli, chartURL, "openebs", chartVersion, values)
+	images, err := helm.ExtractImagesFromChart(hcli, chartURL, chartVersion, values)
 	if err != nil {
 		return fmt.Errorf("failed to get images from openebs chart: %w", err)
 	}

cmd/buildtools/registry.go

@@ -72,7 +72,7 @@ var updateRegistryAddonCommand = &cli.Command{
 
 		logrus.Infof("extracting images from chart")
 		withproto := fmt.Sprintf("oci://%s", upstream)
-		images, err := helm.ExtractImagesFromOCIChart(hcli, withproto, "docker-registry", latest, values)
+		images, err := helm.ExtractImagesFromChart(hcli, withproto, latest, values)
 		if err != nil {
 			return fmt.Errorf("failed to get images from chart: %w", err)
 		}

cmd/buildtools/seaweedfs.go

@@ -122,7 +122,7 @@ func updateSeaweedFSAddonImages(ctx context.Context, hcli helm.Client, chartURL
 	}
 
 	logrus.Infof("extracting images from chart version %s", chartVersion)
-	images, err := helm.ExtractImagesFromOCIChart(hcli, chartURL, "seaweedfs", chartVersion, values)
+	images, err := helm.ExtractImagesFromChart(hcli, chartURL, chartVersion, values)
 	if err != nil {
 		return fmt.Errorf("failed to get images from seaweedfs chart: %w", err)
 	}

cmd/buildtools/utils.go

@@ -452,7 +452,7 @@ func MirrorChart(hcli helm.Client, repo *repo.Entry, name, ver string) error {
 	dst := fmt.Sprintf("oci://%s", os.Getenv("CHARTS_DESTINATION"))
 	chartURL := fmt.Sprintf("%s/%s", dst, name)
 	logrus.Infof("verifying if destination tag already exists")
-	dstMeta, err := helm.GetOCIChartMetadata(hcli, chartURL, name, ver)
+	dstMeta, err := helm.GetChartMetadata(hcli, chartURL, ver)
 	if err != nil && !strings.HasSuffix(err.Error(), "not found") {
 		return fmt.Errorf("verify tag exists: %w", err)
 	} else if err == nil {

cmd/buildtools/velero.go

@@ -171,7 +171,7 @@ func findVeleroVersionFromChart(ctx context.Context, hcli helm.Client, chartURL
 	if err != nil {
 		return "", fmt.Errorf("failed to get velero values: %v", err)
 	}
-	images, err := helm.ExtractImagesFromOCIChart(hcli, chartURL, "velero", chartVersion, values)
+	images, err := helm.ExtractImagesFromChart(hcli, chartURL, chartVersion, values)
 	if err != nil {
 		return "", fmt.Errorf("failed to get images from velero chart: %w", err)
 	}
@@ -216,7 +216,7 @@ func updateVeleroAddonImages(ctx context.Context, hcli helm.Client, chartURL str
 	}
 
 	logrus.Infof("extracting images from chart version %s", chartVersion)
-	images, err := helm.ExtractImagesFromOCIChart(hcli, chartURL, "velero", chartVersion, values)
+	images, err := helm.ExtractImagesFromChart(hcli, chartURL, chartVersion, values)
 	if err != nil {
 		return fmt.Errorf("failed to get images from velero chart: %w", err)
 	}

cmd/installer/cli/install.go

@@ -608,7 +608,7 @@ func installAndStartCluster(ctx context.Context, networkInterface string, airgap
 		return nil, fmt.Errorf("create config file: %w", err)
 	}
 	logrus.Debugf("creating systemd unit files")
-	if err := createSystemdUnitFiles(false, proxy); err != nil {
+	if err := createSystemdUnitFiles(ctx, false, proxy); err != nil {
 		return nil, fmt.Errorf("create systemd unit files: %w", err)
 	}
 
@@ -769,7 +769,7 @@ func validateAdminConsolePassword(password, passwordCheck string) bool {
 
 // createSystemdUnitFiles links the k0s systemd unit file. this also creates a new
 // systemd unit file for the local artifact mirror service.
-func createSystemdUnitFiles(isWorker bool, proxy *ecv1beta1.ProxySpec) error {
+func createSystemdUnitFiles(ctx context.Context, isWorker bool, proxy *ecv1beta1.ProxySpec) error {
 	dst := systemdUnitFileName()
 	if _, err := os.Lstat(dst); err == nil {
 		if err := os.Remove(dst); err != nil {
@@ -793,7 +793,7 @@ func createSystemdUnitFiles(isWorker bool, proxy *ecv1beta1.ProxySpec) error {
 	if _, err := helpers.RunCommand("systemctl", "daemon-reload"); err != nil {
 		return fmt.Errorf("unable to get reload systemctl daemon: %w", err)
 	}
-	if err := installAndEnableLocalArtifactMirror(); err != nil {
+	if err := installAndEnableLocalArtifactMirror(ctx); err != nil {
 		return fmt.Errorf("unable to install and enable local artifact mirror: %w", err)
 	}
 	return nil
@@ -828,7 +828,7 @@ Environment="NO_PROXY=%s"`, httpProxy, httpsProxy, noProxy)
 // installAndEnableLocalArtifactMirror installs and enables the local artifact mirror. This
 // service is responsible for serving on localhost, through http, all files that are used
 // during a cluster upgrade.
-func installAndEnableLocalArtifactMirror() error {
+func installAndEnableLocalArtifactMirror(ctx context.Context) error {
 	materializer := goods.NewMaterializer()
 	if err := materializer.LocalArtifactMirrorUnitFile(); err != nil {
 		return fmt.Errorf("failed to materialize artifact mirror unit: %w", err)
@@ -839,15 +839,50 @@ func installAndEnableLocalArtifactMirror() error {
 	if _, err := helpers.RunCommand("systemctl", "daemon-reload"); err != nil {
 		return fmt.Errorf("unable to get reload systemctl daemon: %w", err)
 	}
+	if _, err := helpers.RunCommand("systemctl", "enable", "local-artifact-mirror"); err != nil {
+		return fmt.Errorf("unable to enable the local artifact mirror service: %w", err)
+	}
+	logrus.Debugf("Starting local artifact mirror")
 	if _, err := helpers.RunCommand("systemctl", "start", "local-artifact-mirror"); err != nil {
 		return fmt.Errorf("unable to start the local artifact mirror: %w", err)
 	}
-	if _, err := helpers.RunCommand("systemctl", "enable", "local-artifact-mirror"); err != nil {
-		return fmt.Errorf("unable to start the local artifact mirror service: %w", err)
+	if err := waitForLocalArtifactMirror(ctx); err != nil {
+		return fmt.Errorf("unable to wait for the local artifact mirror: %w", err)
 	}
+	logrus.Debugf("Local artifact mirror started!")
 	return nil
 }
 
+func waitForLocalArtifactMirror(ctx context.Context) error {
+	consecutiveSuccesses := 0
+	requiredSuccesses := 3
+	maxAttempts := 30
+	checkInterval := 2 * time.Second
+
+	var lastErr error
+	for attempt := 0; attempt < maxAttempts; attempt++ {
+		_, err := helpers.RunCommand("systemctl", "status", "local-artifact-mirror")
+		if err == nil {
+			consecutiveSuccesses++
+			if consecutiveSuccesses >= requiredSuccesses {
+				return nil
+			}
+		} else {
+			consecutiveSuccesses = 0
+			lastErr = err
+		}
+
+		select {
+		case <-ctx.Done():
+			return ctx.Err()
+		case <-time.After(checkInterval):
+			continue
+		}
+	}
+
+	return lastErr
+}
+
 const (
 	localArtifactMirrorDropInFileContents = `[Service]
 Environment="LOCAL_ARTIFACT_MIRROR_PORT=%d"