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

Author: sgalsaleh

.github/workflows/ci.yaml

@@ -449,8 +449,11 @@ jobs:
           MANGLE_METADATA: "1"
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          export K0S_VERSION=$(make print-PREVIOUS_K0S_VERSION)
-          export K0S_GO_VERSION=$(make print-PREVIOUS_K0S_GO_VERSION)
+          k0s_minor_version=$(make print-PREVIOUS_K0S_VERSION | sed 's/v[0-9]*\.\([0-9]*\).*/\1/')
+
+          # update k0s dep version to previous k0s version
+          ./scripts/update-k0s-dep-version.sh "$k0s_minor_version"
+
           export EC_VERSION=$(git describe --tags --abbrev=4 --match='[0-9]*.[0-9]*.[0-9]*')-previous-k0s
           export APP_VERSION=appver-dev-${{ needs.git-sha.outputs.git_sha }}-previous-k0s
           # avoid rate limiting
@@ -469,7 +472,8 @@ jobs:
       - name: Export k0s version
         id: export
         run: |
-          K0S_VERSION="$(make print-PREVIOUS_K0S_VERSION)"
+          # K0S_VERSION is now the previous k0s version
+          K0S_VERSION="$(make print-K0S_VERSION)"
           echo "K0S_VERSION=\"$K0S_VERSION\""
           echo "k0s_version=$K0S_VERSION" >> "$GITHUB_OUTPUT"
 

.github/workflows/dependencies.yaml

@@ -3,7 +3,11 @@ on:
   schedule:
   # everyday at midnight.
   - cron: '0 0 * * *'
-  workflow_dispatch: {}
+  workflow_dispatch:
+    inputs:
+      k0s_minor_version:
+        description: 'The minor version of k0s to update the dependencies for'
+        required: false
 
 jobs:
   update-dependencies:
@@ -16,29 +20,16 @@ jobs:
       with:
         go-version-file: go.mod
         cache-dependency-path: "**/*.sum"
-    - name: Kubectl
-      run: |
-        export VERSION=`curl -L -s https://dl.k8s.io/release/stable.txt`
-        sed -i "/^KUBECTL_VERSION/c\KUBECTL_VERSION = $VERSION" Makefile
     - name: K0s
       env:
         GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
-        # Remove the '-ec.X' suffix and only update if the prefix (upstream k0s release) has changed.
-        export CURVERSION=$(make print-K0S_VERSION)
-        export CURMAJMIN=$(echo $CURVERSION | awk -F'.' '{print $1 "." $2}')
-
-        # pin to the latest release for the current major.minor version
-        export VERSION=$(gh release list --repo k0sproject/k0s --exclude-pre-releases --json name,isLatest | \
-          jq -r "[.[] | select(.name | startswith(\"$CURMAJMIN\"))] | first | .name")
-
-        if [ "$CURVERSION" != "$VERSION" ]; then
-          sed -i "/^K0S_VERSION/c\K0S_VERSION = $VERSION" Makefile
-          sed -i "/^K0S_GO_VERSION/c\K0S_GO_VERSION = $VERSION" Makefile
-          # replace the first occurrence of K0S_BINARY_SOURCE_OVERRIDE
-          sed -i '0,/K0S_BINARY_SOURCE_OVERRIDE =.*/s/K0S_BINARY_SOURCE_OVERRIDE =.*/K0S_BINARY_SOURCE_OVERRIDE =/' Makefile
-          make go.mod
+        cur_minor="$INPUT_K0S_MINOR_VERSION"
+        if [ -z "$cur_minor" ]; then
+          cur_minor=$(make print-K0S_VERSION | awk -F'.' '{print $2}')
         fi
+
+        ./scripts/update-k0s-dep-version.sh "$cur_minor"
     - name: Troubleshoot
       env:
         GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -38,3 +38,6 @@ cover.out
 # e2e test runs locally
 e2e/playwright*.tar.gz
 e2e/support-bundle*.tar.gz
+
+# Local Netlify folder
+.netlify

Makefile

@@ -10,10 +10,10 @@ ADMIN_CONSOLE_CHART_REPO_OVERRIDE =
 ADMIN_CONSOLE_IMAGE_OVERRIDE =
 ADMIN_CONSOLE_MIGRATIONS_IMAGE_OVERRIDE =
 ADMIN_CONSOLE_KURL_PROXY_IMAGE_OVERRIDE =
-K0S_VERSION = v1.31.11+k0s.0
-K0S_GO_VERSION = v1.31.11+k0s.0
-PREVIOUS_K0S_VERSION ?= v1.30.9+k0s.0
-PREVIOUS_K0S_GO_VERSION ?= v1.30.9+k0s.0
+K0S_VERSION = v1.32.7+k0s.0
+K0S_GO_VERSION = v1.32.7+k0s.0
+PREVIOUS_K0S_VERSION ?= v1.31.11+k0s.0
+PREVIOUS_K0S_GO_VERSION ?= v1.31.11+k0s.0
 K0S_BINARY_SOURCE_OVERRIDE =
 TROUBLESHOOT_VERSION = v0.121.2
 

README.md

@@ -290,3 +290,56 @@ make ssh-node0
     ```bash
     make kurl-proxy-down-ec
     ```
+
+## Upgrading K0s Minor Version
+
+To upgrade the K0s minor version in Embedded Cluster, you can use the provided update script ./scripts/update-k0s-dep-version.sh.
+This script will update the K0s dependency version across the project and regenerate necessary files.
+
+### Using the Update Script
+
+The update script automates the process of upgrading K0s to a new minor version:
+
+```bash
+./scripts/update-k0s-dep-version.sh [TARGET_MINOR]
+```
+
+**Parameters:**
+- `[TARGET_MINOR]` - The target K0s minor version (e.g., `1.28`, `1.29`, `1.30`)
+
+**Examples:**
+```bash
+# Upgrade to K0s 1.29.x
+./scripts/update-k0s-dep-version.sh 1.29
+
+# Upgrade to K0s 1.30.x
+./scripts/update-k0s-dep-version.sh 1.30
+```
+
+### What the Script Does
+
+The update script performs the following operations:
+
+1. **Updates Go module dependencies** - Modifies `go.mod` files to use the new K0s version
+2. **Regenerates CRDs** - Updates Custom Resource Definitions for the new K0s version
+3. **Updates build configurations** - Modifies build scripts and Dockerfiles as needed
+4. **Regenerates manifests** - Updates Kubernetes manifests and deployment files
+
+### After Running the Script
+
+1. **Review changes** - The script will show you what files were modified
+2. **Test the build** - Verify that the project builds successfully:
+   ```bash
+   make build
+   ```
+3. **Run tests** - Ensure all tests pass with the new version:
+   ```bash
+   make unit-tests
+   make test-integration
+   ```
+4. **Test installation** - Verify that installation works with the new K0s version:
+   ```bash
+   make initial-release
+   make create-node0
+   # Test installation process
+   ```

api/controllers/app/install/controller.go

@@ -14,7 +14,9 @@ import (
 	"github.com/replicatedhq/embedded-cluster/api/pkg/logger"
 	"github.com/replicatedhq/embedded-cluster/api/types"
 	"github.com/replicatedhq/embedded-cluster/pkg/release"
+	kotsv1beta1 "github.com/replicatedhq/kotskinds/apis/kots/v1beta1"
 	"github.com/sirupsen/logrus"
+	kyaml "sigs.k8s.io/yaml"
 )
 
 type Controller interface {
@@ -32,18 +34,20 @@ type Controller interface {
 var _ Controller = (*InstallController)(nil)
 
 type InstallController struct {
-	appConfigManager    appconfig.AppConfigManager
-	appInstallManager   appinstallmanager.AppInstallManager
-	appPreflightManager apppreflightmanager.AppPreflightManager
-	appReleaseManager   appreleasemanager.AppReleaseManager
-	stateMachine        statemachine.Interface
-	logger              logrus.FieldLogger
-	license             []byte
-	releaseData         *release.ReleaseData
-	store               store.Store
-	configValues        types.AppConfigValues
-	clusterID           string
-	airgapBundle        string
+	appConfigManager           appconfig.AppConfigManager
+	appInstallManager          appinstallmanager.AppInstallManager
+	appPreflightManager        apppreflightmanager.AppPreflightManager
+	appReleaseManager          appreleasemanager.AppReleaseManager
+	stateMachine               statemachine.Interface
+	logger                     logrus.FieldLogger
+	license                    []byte
+	releaseData                *release.ReleaseData
+	store                      store.Store
+	configValues               types.AppConfigValues
+	clusterID                  string
+	airgapBundle               string
+	privateCACertConfigMapName string
+	registrySettings           *types.RegistrySettings
 }
 
 type InstallControllerOption func(*InstallController)
@@ -120,6 +124,18 @@ func WithAirgapBundle(airgapBundle string) InstallControllerOption {
 	}
 }
 
+func WithRegistrySettings(registrySettings *types.RegistrySettings) InstallControllerOption {
+	return func(c *InstallController) {
+		c.registrySettings = registrySettings
+	}
+}
+
+func WithPrivateCACertConfigMapName(configMapName string) InstallControllerOption {
+	return func(c *InstallController) {
+		c.privateCACertConfigMapName = configMapName
+	}
+}
+
 func NewInstallController(opts ...InstallControllerOption) (*InstallController, error) {
 	controller := &InstallController{
 		logger: logger.NewDiscardLogger(),
@@ -133,11 +149,22 @@ func NewInstallController(opts ...InstallControllerOption) (*InstallController,
 		return nil, err
 	}
 
+	var license *kotsv1beta1.License
+	if len(controller.license) > 0 {
+		license = &kotsv1beta1.License{}
+		if err := kyaml.Unmarshal(controller.license, license); err != nil {
+			return nil, fmt.Errorf("parse license: %w", err)
+		}
+	}
+
 	if controller.appConfigManager == nil {
 		appConfigManager, err := appconfig.NewAppConfigManager(
 			*controller.releaseData.AppConfig,
 			appconfig.WithLogger(controller.logger),
 			appconfig.WithAppConfigStore(controller.store.AppConfigStore()),
+			appconfig.WithReleaseData(controller.releaseData),
+			appconfig.WithLicense(license),
+			appconfig.WithPrivateCACertConfigMapName(controller.privateCACertConfigMapName),
 		)
 		if err != nil {
 			return nil, fmt.Errorf("failed to create app config manager: %w", err)
@@ -164,10 +191,20 @@ func NewInstallController(opts ...InstallControllerOption) (*InstallController,
 	}
 
 	if controller.appReleaseManager == nil {
-		appReleaseManager, err := appreleasemanager.NewAppReleaseManager(
-			*controller.releaseData.AppConfig,
+		var appReleaseManagerOpts []appreleasemanager.AppReleaseManagerOption
+		appReleaseManagerOpts = append(appReleaseManagerOpts,
 			appreleasemanager.WithLogger(controller.logger),
 			appreleasemanager.WithReleaseData(controller.releaseData),
+			appreleasemanager.WithLicense(license),
+			appreleasemanager.WithPrivateCACertConfigMapName(controller.privateCACertConfigMapName),
+		)
+
+		// Add registry settings if available
+		appReleaseManagerOpts = append(appReleaseManagerOpts, appreleasemanager.WithRegistrySettings(controller.registrySettings))
+
+		appReleaseManager, err := appreleasemanager.NewAppReleaseManager(
+			*controller.releaseData.AppConfig,
+			appReleaseManagerOpts...,
 		)
 		if err != nil {
 			return nil, fmt.Errorf("create app release manager: %w", err)
@@ -178,8 +215,8 @@ func NewInstallController(opts ...InstallControllerOption) (*InstallController,
 	if controller.appInstallManager == nil {
 		appInstallManager, err := appinstallmanager.NewAppInstallManager(
 			appinstallmanager.WithLogger(controller.logger),
-			appinstallmanager.WithLicense(controller.license),
 			appinstallmanager.WithReleaseData(controller.releaseData),
+			appinstallmanager.WithLicense(controller.license),
 			appinstallmanager.WithClusterID(controller.clusterID),
 			appinstallmanager.WithAirgapBundle(controller.airgapBundle),
 			appinstallmanager.WithAppInstallStore(controller.store.AppInstallStore()),

api/controllers/kubernetes/install/controller.go

@@ -191,6 +191,7 @@ func NewInstallController(opts ...InstallControllerOption) (*InstallController,
 			appcontroller.WithReleaseData(controller.releaseData),
 			appcontroller.WithConfigValues(controller.configValues),
 			appcontroller.WithAirgapBundle(controller.airgapBundle),
+			appcontroller.WithPrivateCACertConfigMapName(""), // Private CA ConfigMap functionality not yet implemented for Kubernetes installations
 		)
 		if err != nil {
 			return nil, fmt.Errorf("create app install controller: %w", err)

api/controllers/linux/install/controller.go

@@ -16,11 +16,14 @@ import (
 	"github.com/replicatedhq/embedded-cluster/api/types"
 	ecv1beta1 "github.com/replicatedhq/embedded-cluster/kinds/apis/v1beta1"
 	"github.com/replicatedhq/embedded-cluster/pkg-new/hostutils"
+	"github.com/replicatedhq/embedded-cluster/pkg/addons/adminconsole"
 	"github.com/replicatedhq/embedded-cluster/pkg/airgap"
 	"github.com/replicatedhq/embedded-cluster/pkg/metrics"
 	"github.com/replicatedhq/embedded-cluster/pkg/release"
 	"github.com/replicatedhq/embedded-cluster/pkg/runtimeconfig"
+	kotsv1beta1 "github.com/replicatedhq/kotskinds/apis/kots/v1beta1"
 	"github.com/sirupsen/logrus"
+	"sigs.k8s.io/yaml"
 )
 
 type Controller interface {
@@ -253,7 +256,8 @@ func NewInstallController(opts ...InstallControllerOption) (*InstallController,
 
 	// Initialize the app controller with the state machine first
 	if controller.InstallController == nil {
-		appInstallController, err := appcontroller.NewInstallController(
+		var appControllerOpts []appcontroller.InstallControllerOption
+		appControllerOpts = append(appControllerOpts,
 			appcontroller.WithStateMachine(controller.stateMachine),
 			appcontroller.WithLogger(controller.logger),
 			appcontroller.WithStore(controller.store),
@@ -262,7 +266,26 @@ func NewInstallController(opts ...InstallControllerOption) (*InstallController,
 			appcontroller.WithConfigValues(controller.configValues),
 			appcontroller.WithClusterID(controller.clusterID),
 			appcontroller.WithAirgapBundle(controller.airgapBundle),
+			appcontroller.WithPrivateCACertConfigMapName(adminconsole.PrivateCASConfigMapName), // Linux installations use the ConfigMap
 		)
+
+		// Detect registry settings and pass to app controller
+		var license *kotsv1beta1.License
+		if controller.license != nil {
+			// Parse license from bytes
+			var parsedLicense kotsv1beta1.License
+			if err := yaml.Unmarshal(controller.license, &parsedLicense); err != nil {
+				return nil, fmt.Errorf("failed to parse license data: %w", err)
+			}
+			license = &parsedLicense
+		}
+		registrySettings, err := controller.detectRegistrySettings(license)
+		if err != nil {
+			return nil, fmt.Errorf("failed to detect registry settings: %w", err)
+		}
+		appControllerOpts = append(appControllerOpts, appcontroller.WithRegistrySettings(registrySettings))
+
+		appInstallController, err := appcontroller.NewInstallController(appControllerOpts...)
 		if err != nil {
 			return nil, fmt.Errorf("create app install controller: %w", err)
 		}

api/controllers/linux/install/controller_test.go

@@ -1199,7 +1199,7 @@ func TestSetupInfra(t *testing.T) {
 				appcontroller.WithStateMachine(sm),
 				appcontroller.WithStore(mockStore),
 				appcontroller.WithReleaseData(getTestReleaseData(&appConfig)),
-				appcontroller.WithLicense([]byte("test-license")),
+				appcontroller.WithLicense([]byte("spec:\n  licenseID: test-license\n")),
 				appcontroller.WithAppConfigManager(mockAppConfigManager),
 				appcontroller.WithAppPreflightManager(mockAppPreflightManager),
 				appcontroller.WithAppReleaseManager(mockAppReleaseManager),
@@ -1216,7 +1216,7 @@ func TestSetupInfra(t *testing.T) {
 				WithAllowIgnoreHostPreflights(tt.serverAllowIgnoreHostPreflights),
 				WithMetricsReporter(mockMetricsReporter),
 				WithReleaseData(getTestReleaseData(&appConfig)),
-				WithLicense([]byte("test-license")),
+				WithLicense([]byte("spec:\n  licenseID: test-license\n")),
 				WithStore(mockStore),
 			)
 			require.NoError(t, err)