Stop using kots

Author: sgalsaleh

.github/workflows/ci.yaml

@@ -267,8 +267,31 @@ jobs:
         with:
           go-version-file: go.mod
           cache-dependency-path: "**/*.sum"
-      - name: Free up runner disk space
-        run: *free-disk-space
+      - name: Free up runner disk space # this is much faster than .github/actions/free-disk-space
+        run: |
+          df -h
+          sudo rm -rf \
+            /usr/share/swift \
+            /usr/share/dotnet \
+            /usr/lib/jvm \
+            /usr/local/share/boost \
+            /usr/local/lib/heroku \
+            /usr/local/julia* \
+            /usr/local/.ghcup \
+            /usr/local/share/powershell \
+            /usr/local/bin/aliyun \
+            /usr/local/bin/azcopy \
+            /usr/local/bin/bicep \
+            /usr/local/bin/cpack \
+            /usr/local/bin/hub \
+            /usr/local/bin/minikube \
+            /usr/local/bin/packer \
+            /usr/local/bin/pulumi* \
+            /usr/local/bin/sam \
+            /usr/local/bin/stack \
+            /usr/local/bin/terraform \
+            /usr/local/bin/oc
+          df -h
       - name: Install kind
         uses: helm/kind-action@92086f6be054225fa813e0a4b13787fc9088faab
         with:
@@ -284,8 +307,6 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v6
-      - name: Free up runner disk space
-        run: *free-disk-space
       - name: Go cache
         uses: actions/cache@v4
         with:
@@ -435,7 +456,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v6
 
-      - name: Free up runner disk space
+      - name: Free up runner disk space # this is much faster than .github/actions/free-disk-space
         run: *free-disk-space
 
       - name: Cache embedded bins
@@ -591,7 +612,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v6
 
-      - name: Free up runner disk space
+      - name: Free up runner disk space # this is much faster than .github/actions/free-disk-space
         run: *free-disk-space
 
       - name: Cache embedded bins

.github/workflows/dependencies.yaml

@@ -45,7 +45,7 @@ jobs:
       env:
         GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
-        version=$(gh release list --repo helm/helm --json tagName,createdAt | jq -r '.[] | select(.tagName | startswith("v3.")) | .tagName' | head -1)
+        version=$(gh release list --repo helm/helm --json tagName,isLatest | jq -r '.[] | select(.isLatest) | .tagName')
         echo "helm version: $version"
         sed -i "/^HELM_VERSION/c\HELM_VERSION = $version" versions.mk
 

README.md

@@ -476,32 +476,32 @@ dagger call with-one-password --service-account=env:OP_SERVICE_ACCOUNT_TOKEN \
 
 ## Releasing
 
-Embedded Cluster maintains support for the current and two previous k8s minor versions, ensuring backward compatibility while supporting the latest features.
-All supported versions are released simultaneously from the main branch using a structured tagging approach that combines the application version with the supported k8s version.
+Embedded Cluster maintains support for the current and two previous K0s minor versions, ensuring backward compatibility while supporting the latest features.
+All supported versions are released simultaneously from the main branch using a structured tagging approach that combines the application version with the supported K0s version.
 
 ### Release Tagging Strategy
 
-Releases follow the format: `{APP_VERSION}+k8s-{K0S_MINOR_VERSION}`
+Releases follow the format: `{APP_VERSION}+k0s-{K0S_MINOR_VERSION}`
 
 **Examples:**
-- `2.10.0+k8s-1.33` - Application version 2.10.0 with k8s 1.33.x support
-- `2.10.0+k8s-1.32` - Application version 2.10.0 with k8s 1.32.x support
-- `2.10.0+k8s-1.31` - Application version 2.10.0 with k8s 1.31.x support
+- `2.10.0+k0s-1.33` - Application version 2.10.0 with K0s 1.33.x support
+- `2.10.0+k0s-1.32` - Application version 2.10.0 with K0s 1.32.x support
+- `2.10.0+k0s-1.31` - Application version 2.10.0 with K0s 1.31.x support
 
 ### Release Process
 
 1. **Prepare the release commit** - Ensure all changes are committed and tested
-2. **Create annotated tags** - Tag the same commit with all supported k8s minor versions using annotated tags with descriptive messages:
+2. **Create annotated tags** - Tag the same commit with all supported K0s minor versions using annotated tags with descriptive messages:
    ```bash
-   # Tag for k8s 1.33.x support
-   git tag -a 2.10.0+k8s-1.33 -m "Release 2.10.0+k8s-1.33"
-   git push origin 2.10.0+k8s-1.33
+   # Tag for K0s 1.33.x support
+   git tag -a 2.10.0+k0s-1.33 -m "Release 2.10.0+k0s-1.33"
+   git push origin 2.10.0+k0s-1.33
 
-   # Tag for k8s 1.32.x support
-   git tag -a 2.10.0+k8s-1.32 -m "Release 2.10.0+k8s-1.32"
-   git push origin 2.10.0+k8s-1.32
+   # Tag for K0s 1.32.x support
+   git tag -a 2.10.0+k0s-1.32 -m "Release 2.10.0+k0s-1.32"
+   git push origin 2.10.0+k0s-1.32
 
-   # Tag for k8s 1.31.x support
-   git tag -a 2.10.0+k8s-1.31 -m "Release 2.10.0+k8s-1.31"
-   git push origin 2.10.0+k8s-1.31
+   # Tag for K0s 1.31.x support
+   git tag -a 2.10.0+k0s-1.31 -m "Release 2.10.0+k0s-1.31"
+   git push origin 2.10.0+k0s-1.31
    ```

api/controllers/app/controller.go

@@ -20,6 +20,7 @@ import (
 	kotsv1beta1 "github.com/replicatedhq/kotskinds/apis/kots/v1beta1"
 	"github.com/sirupsen/logrus"
 	helmcli "helm.sh/helm/v3/pkg/cli"
+	"k8s.io/client-go/metadata"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	kyaml "sigs.k8s.io/yaml"
 )
@@ -32,7 +33,7 @@ type Controller interface {
 	GetAppPreflightStatus(ctx context.Context) (types.Status, error)
 	GetAppPreflightOutput(ctx context.Context) (*types.PreflightsOutput, error)
 	GetAppPreflightTitles(ctx context.Context) ([]string, error)
-	InstallApp(ctx context.Context, ignoreAppPreflights bool) error
+	InstallApp(ctx context.Context, opts InstallAppOptions) error
 	GetAppInstallStatus(ctx context.Context) (types.AppInstall, error)
 	UpgradeApp(ctx context.Context, ignoreAppPreflights bool) error
 	GetAppUpgradeStatus(ctx context.Context) (types.AppUpgrade, error)
@@ -52,6 +53,7 @@ type AppController struct {
 	releaseData                *release.ReleaseData
 	hcli                       helm.Client
 	kcli                       client.Client
+	mcli                       metadata.Interface
 	preflightRunner            preflights.PreflightRunnerInterface
 	kubernetesEnvSettings      *helmcli.EnvSettings
 	store                      store.Store
@@ -129,6 +131,12 @@ func WithKubeClient(kcli client.Client) AppControllerOption {
 	}
 }
 
+func WithMetadataClient(mcli metadata.Interface) AppControllerOption {
+	return func(c *AppController) {
+		c.mcli = mcli
+	}
+}
+
 func WithKubernetesEnvSettings(envSettings *helmcli.EnvSettings) AppControllerOption {
 	return func(c *AppController) {
 		c.kubernetesEnvSettings = envSettings
@@ -262,7 +270,9 @@ func NewAppController(opts ...AppControllerOption) (*AppController, error) {
 			appinstallmanager.WithAirgapBundle(controller.airgapBundle),
 			appinstallmanager.WithAppInstallStore(controller.store.AppInstallStore()),
 			appinstallmanager.WithKubeClient(controller.kcli),
+			appinstallmanager.WithMetadataClient(controller.mcli),
 			appinstallmanager.WithKubernetesEnvSettings(controller.kubernetesEnvSettings),
+			appinstallmanager.WithHelmClient(controller.hcli),
 		)
 		if err != nil {
 			return nil, fmt.Errorf("create app install manager: %w", err)

api/controllers/app/controller_mock.go

@@ -69,8 +69,8 @@ func (m *MockController) GetAppPreflightTitles(ctx context.Context) ([]string, e
 }
 
 // InstallApp mocks the InstallApp method
-func (m *MockController) InstallApp(ctx context.Context, ignoreAppPreflights bool) error {
-	args := m.Called(ctx, ignoreAppPreflights)
+func (m *MockController) InstallApp(ctx context.Context, opts InstallAppOptions) error {
+	args := m.Called(ctx, opts)
 	return args.Error(0)
 }
 

api/controllers/app/install.go

@@ -9,14 +9,22 @@ import (
 
 	"github.com/replicatedhq/embedded-cluster/api/internal/states"
 	"github.com/replicatedhq/embedded-cluster/api/types"
+	ecv1beta1 "github.com/replicatedhq/embedded-cluster/kinds/apis/v1beta1"
 )
 
 var (
 	ErrAppPreflightChecksFailed = errors.New("app preflight checks failed")
 )
 
+type InstallAppOptions struct {
+	IgnoreAppPreflights bool
+	ProxySpec           *ecv1beta1.ProxySpec
+	RegistrySettings    *types.RegistrySettings
+	HostCABundlePath    string
+}
+
 // InstallApp triggers app installation with proper state transitions and panic handling
-func (c *AppController) InstallApp(ctx context.Context, ignoreAppPreflights bool) (finalErr error) {
+func (c *AppController) InstallApp(ctx context.Context, opts InstallAppOptions) (finalErr error) {
 	logger := c.logger.WithField("operation", "install-app")
 
 	lock, err := c.stateMachine.AcquireLock()
@@ -45,7 +53,7 @@ func (c *AppController) InstallApp(ctx context.Context, ignoreAppPreflights bool
 		}
 
 		allowIgnoreAppPreflights := true // TODO: implement if we decide to support a ignore-app-preflights CLI flag for V3
-		if !ignoreAppPreflights || !allowIgnoreAppPreflights {
+		if !opts.IgnoreAppPreflights || !allowIgnoreAppPreflights {
 			return types.NewBadRequestError(ErrAppPreflightChecksFailed)
 		}
 
@@ -60,9 +68,15 @@ func (c *AppController) InstallApp(ctx context.Context, ignoreAppPreflights bool
 	}
 
 	// Get config values for app installation
-	configValues, err := c.appConfigManager.GetKotsadmConfigValues()
+	appConfigValues, err := c.GetAppConfigValues(ctx)
+	if err != nil {
+		return fmt.Errorf("get app config values for app install: %w", err)
+	}
+
+	// Extract installable Helm charts from release manager
+	installableCharts, err := c.appReleaseManager.ExtractInstallableHelmCharts(ctx, appConfigValues, opts.ProxySpec, opts.RegistrySettings)
 	if err != nil {
-		return fmt.Errorf("get kotsadm config values for app install: %w", err)
+		return fmt.Errorf("extract installable helm charts: %w", err)
 	}
 
 	err = c.stateMachine.Transition(lock, states.StateAppInstalling, nil)
@@ -97,8 +111,8 @@ func (c *AppController) InstallApp(ctx context.Context, ignoreAppPreflights bool
 			return fmt.Errorf("set status to running: %w", err)
 		}
 
-		// Install the app
-		err := c.appInstallManager.Install(ctx, configValues)
+		// Install the app with installable charts
+		err = c.appInstallManager.Install(ctx, installableCharts, opts.RegistrySettings, opts.HostCABundlePath)
 		if err != nil {
 			return fmt.Errorf("install app: %w", err)
 		}