Merge remote-tracking branch 'origin/main' into ash/restorecon

Author: hedge-sparrow

Makefile

@@ -343,14 +343,24 @@ create-node%: DISTRO = debian-bookworm
 create-node%: NODE_PORT = 30000
 create-node%: MANAGER_NODE_PORT = 30080
 create-node%: K0S_DATA_DIR = /var/lib/embedded-cluster/k0s
+create-node%: K0S_DATA_DIR_V3 = $(shell \
+	if [ -n "$(REPLICATED_APP)" ]; then \
+		echo "/var/lib/$(shell echo '$(REPLICATED_APP)' | tr '[:upper:]' '[:lower:]' | sed 's/[^a-z0-9-]/-/g')/k0s"; \
+	else \
+		echo "/var/lib/embedded-cluster-smoke-test-staging-app/k0s"; \
+	fi)
 create-node%: ENABLE_V3 = 0
 create-node%:
+	@echo "Mounting data directories:"
+	@echo "  v2: $(K0S_DATA_DIR)"
+	@echo "  v3: $(K0S_DATA_DIR_V3)"
 	@docker run -d \
 		--name node$* \
 		--hostname node$* \
 		--privileged \
 		--restart=unless-stopped \
 		-v $(K0S_DATA_DIR) \
+		-v $(K0S_DATA_DIR_V3) \
 		-v $(shell pwd):/replicatedhq/embedded-cluster \
 		-v $(shell dirname $(shell pwd))/kots:/replicatedhq/kots \
 		$(if $(filter node0,node$*),-p $(NODE_PORT):$(NODE_PORT)) \

README.md

@@ -91,6 +91,12 @@ Additionally, it includes a Registry when deployed in air gap mode, and SeaweedF
     make list-distros
     ```
 
+    **Note:** The development environment automatically mounts both data directories to support v2 and v3:
+    - **v2 mode:** Uses `/var/lib/embedded-cluster/k0s`
+    - **v3 mode:** Uses `/var/lib/{app-slug}/k0s` (determined from `REPLICATED_APP`)
+    
+    Both directories are mounted automatically, so the embedded cluster binary can use whichever one it needs without any manual configuration.
+
 1. In the Vendor Portal, create and download a license that is assigned to the channel.
 We recommend storing this license in the `local-dev/` directory, as it is gitignored and not otherwise used by the CI.
 

api/README.md

@@ -93,6 +93,12 @@ Provides a client library for interacting with the API. The client package imple
    - This design choice enables better testability and easier iteration in the development environment
    - API components should be independently configurable and testable
 
+2. **Kubernetes as a Subset of Linux**:
+   - The Kubernetes installation target should be a subset of the Linux installation target
+   - Linux installations include Kubernetes cluster setup (k0s, addons) plus application management
+   - Kubernetes installations focus on application management (deployment, upgrades, lifecycle) on an existing Kubernetes cluster
+   - Once Linux installation finishes setting up the Kubernetes cluster, subsequent operations should follow the same workflow as Kubernetes installations
+
 ## Integration
 
 The API package is designed to be used as part of the larger Embedded Cluster system. It provides both HTTP endpoints for external access and a client library for internal use.

api/api.go

@@ -5,6 +5,7 @@ import (
 
 	"github.com/replicatedhq/embedded-cluster/api/controllers/auth"
 	"github.com/replicatedhq/embedded-cluster/api/controllers/console"
+	kubernetesinstall "github.com/replicatedhq/embedded-cluster/api/controllers/kubernetes/install"
 	linuxinstall "github.com/replicatedhq/embedded-cluster/api/controllers/linux/install"
 	"github.com/replicatedhq/embedded-cluster/api/pkg/logger"
 	"github.com/replicatedhq/embedded-cluster/api/types"
@@ -39,9 +40,10 @@ type API struct {
 	logger          logrus.FieldLogger
 	metricsReporter metrics.ReporterInterface
 
-	authController         auth.Controller
-	consoleController      console.Controller
-	linuxInstallController linuxinstall.Controller
+	authController              auth.Controller
+	consoleController           console.Controller
+	linuxInstallController      linuxinstall.Controller
+	kubernetesInstallController kubernetesinstall.Controller
 
 	handlers handlers
 }
@@ -70,6 +72,13 @@ func WithLinuxInstallController(linuxInstallController linuxinstall.Controller)
 	}
 }
 
+// WithKubernetesInstallController configures the kubernetes install controller for the API.
+func WithKubernetesInstallController(kubernetesInstallController kubernetesinstall.Controller) Option {
+	return func(a *API) {
+		a.kubernetesInstallController = kubernetesInstallController
+	}
+}
+
 // WithLogger configures the logger for the API. If not provided, a default logger will be created.
 func WithLogger(logger logrus.FieldLogger) Option {
 	return func(a *API) {

api/client/client.go

@@ -11,12 +11,15 @@ import (
 
 type Client interface {
 	Authenticate(password string) error
-	GetInstallationConfig() (types.InstallationConfig, error)
-	GetInstallationStatus() (types.Status, error)
-	ConfigureInstallation(config types.InstallationConfig) (types.Status, error)
-	SetupInfra() (types.Infra, error)
-	GetInfraStatus() (types.Infra, error)
-	SetInstallStatus(status types.Status) (types.Status, error)
+	GetLinuxInstallationConfig() (types.LinuxInstallationConfig, error)
+	GetLinuxInstallationStatus() (types.Status, error)
+	ConfigureLinuxInstallation(config types.LinuxInstallationConfig) (types.Status, error)
+	SetupLinuxInfra() (types.LinuxInfra, error)
+	GetLinuxInfraStatus() (types.LinuxInfra, error)
+
+	GetKubernetesInstallationConfig() (types.KubernetesInstallationConfig, error)
+	ConfigureKubernetesInstallation(config types.KubernetesInstallationConfig) (types.Status, error)
+	GetKubernetesInstallationStatus() (types.Status, error)
 }
 
 type client struct {