Add functions to check if distros are enabled

Signed-off-by: Mauro Morales <[email protected]>
kairos-io · Jan 14, 2025 · e8bfaaa · e8bfaaa
1 parent a144b7a
commit e8bfaaa
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/internal/provider/bootstrap.go b/internal/provider/bootstrap.go
@@ -168,7 +168,7 @@ func oneTimeBootstrap(l types.KairosLogger, c *providerConfig.Config, vpnSetupFN
 	var svcName, svcRole, envFile, binPath string
 
 	// Determine the service type (K3s or K0s) and set appropriate variables
-	if c.K3s.Enabled || c.K3sAgent.Enabled {
+	if c.IsK3sDistributionEnabled() {
 		k3sConfig := c.K3s
 		if c.K3sAgent.Enabled {
 			k3sConfig = c.K3sAgent
@@ -213,7 +213,7 @@ func oneTimeBootstrap(l types.KairosLogger, c *providerConfig.Config, vpnSetupFN
 			return err
 		}
 	} else {
-		l.Info("No K3s or K0s configuration found, skipping bootstrap.")
+		l.Info("No Kubernetes configuration found, skipping bootstrap.")
 		return nil
 	}
 

diff --git a/internal/provider/config/config.go b/internal/provider/config/config.go
@@ -49,6 +49,10 @@ func (c Config) IsK3sEnabled() bool {
 	return c.K3s.IsEnabled()
 }
 
+func (c Config) IsK3sDistributionEnabled() bool {
+	return c.IsK3sAgentEnabled() || c.IsK3sEnabled()
+}
+
 func (c Config) IsK0sEnabled() bool {
 	return c.K0s.IsEnabled()
 }
@@ -57,6 +61,10 @@ func (c Config) IsK0sWorkerEnabled() bool {
 	return c.K0sWorker.IsEnabled()
 }
 
+func (c Config) IsK0sDistributionEnabled() bool {
+	return c.IsK0sEnabled() || c.IsK0sWorkerEnabled()
+}
+
 func (c Config) IsAKubernetesDistributionEnabled() bool {
 	return c.IsK3sAgentEnabled() || c.IsK3sEnabled() || c.IsK0sEnabled() || c.IsK0sWorkerEnabled()
 }