chore: sync config/*.go and values.schema.json to vCluster version v0.26.1-rc.2

Author: loft-bot

config/config.go

@@ -2,8 +2,6 @@ package config
 
 import (
 	_ "embed"
-	"fmt"
-	"os"
 	"strings"
 	"testing"
 
@@ -281,40 +279,6 @@ func TestConfig_IsProFeatureEnabled(t *testing.T) {
 			},
 			expected: true,
 		},
-		{
-			name: "Pro Sync Settings not used",
-			config: &Config{
-				Experimental: Experimental{
-					SyncSettings: ExperimentalSyncSettings{
-						DisableSync:              false,
-						RewriteKubernetesService: false,
-					},
-				},
-			},
-			expected: false,
-		},
-		{
-			name: "Pro Sync Setting disableSync used",
-			config: &Config{
-				Experimental: Experimental{
-					SyncSettings: ExperimentalSyncSettings{
-						DisableSync: true,
-					},
-				},
-			},
-			expected: true,
-		},
-		{
-			name: "Pro Sync Setting rewriteKubernetesService used",
-			config: &Config{
-				Experimental: Experimental{
-					SyncSettings: ExperimentalSyncSettings{
-						RewriteKubernetesService: true,
-					},
-				},
-			},
-			expected: true,
-		},
 		{
 			name: "Isolated Control Plane not used",
 			config: &Config{
@@ -398,6 +362,21 @@ func TestConfig_IsProFeatureEnabled(t *testing.T) {
 			},
 			expected: true,
 		},
+		{
+			name: "Hybrid scheduling is enabled",
+			config: &Config{
+				Sync: Sync{
+					ToHost: SyncToHost{
+						Pods: SyncPods{
+							HybridScheduling: HybridScheduling{
+								Enabled: true,
+							},
+						},
+					},
+				},
+			},
+			expected: true,
+		},
 	}
 
 	for _, tt := range tests {
@@ -406,24 +385,3 @@ func TestConfig_IsProFeatureEnabled(t *testing.T) {
 		})
 	}
 }
-
-func TestIfDefaultImagesVersionsAreInSync(t *testing.T) {
-	defaultConfig, err := NewDefaultConfig()
-	assert.NilError(t, err)
-	// this will fail when this test is moved or _init-containers.tpl is moved
-	initContainersTplFilePath := "../chart/templates/_init-containers.tpl"
-	tplBytes, err := os.ReadFile(initContainersTplFilePath)
-
-	assert.NilError(t, err)
-	assert.Equal(t, defaultConfig.ControlPlane.Distro.K8S.ControllerManager.Image.Tag, defaultConfig.ControlPlane.Distro.K8S.APIServer.Image.Tag)
-	assert.Equal(t, defaultConfig.ControlPlane.Distro.K8S.ControllerManager.Image.Tag, defaultConfig.ControlPlane.Distro.K8S.Scheduler.Image.Tag)
-	assert.Equal(t, defaultConfig.ControlPlane.Distro.K8S.APIServer.Image.Tag, defaultConfig.ControlPlane.Distro.K8S.Scheduler.Image.Tag)
-	expectedDefaultTag := fmt.Sprintf("{{- $defaultTag := %q -}}", defaultConfig.ControlPlane.Distro.K8S.ControllerManager.Image.Tag)
-	got := strings.Count(string(tplBytes), expectedDefaultTag)
-	assert.Equal(
-		t, got, 3,
-		fmt.Sprintf("please update $defaultTag in %s so it's equal to the "+
-			".Values.controlPlane.distro.k8s.controllerManager.image.tag",
-			initContainersTplFilePath),
-	)
-}

config/config_test.go

@@ -8,7 +8,6 @@ import (
 const (
 	K3SDistro = "k3s"
 	K8SDistro = "k8s"
-	K0SDistro = "k0s"
 	Unknown   = "unknown"
 )
 
@@ -17,6 +16,7 @@ type StoreType string
 const (
 	StoreTypeEmbeddedEtcd     StoreType = "embedded-etcd"
 	StoreTypeExternalEtcd     StoreType = "external-etcd"
+	StoreTypeDeployedEtcd     StoreType = "deployed-etcd"
 	StoreTypeEmbeddedDatabase StoreType = "embedded-database"
 	StoreTypeExternalDatabase StoreType = "external-database"
 )
@@ -26,59 +26,20 @@ var K3SVersionMap = map[string]string{
 	"1.32": "rancher/k3s:v1.32.1-k3s1",
 	"1.31": "rancher/k3s:v1.31.1-k3s1",
 	"1.30": "rancher/k3s:v1.30.2-k3s1",
-	"1.29": "rancher/k3s:v1.29.6-k3s1",
-	"1.28": "rancher/k3s:v1.28.11-k3s1",
-	"1.27": "rancher/k3s:v1.27.16-k3s1",
 }
 
-// K0SVersionMap holds the supported k0s versions
-var K0SVersionMap = map[string]string{
-	"1.32": "k0sproject/k0s:v1.30.2-k0s.0",
-	"1.31": "k0sproject/k0s:v1.30.2-k0s.0",
-	"1.30": "k0sproject/k0s:v1.30.2-k0s.0",
-	"1.29": "k0sproject/k0s:v1.29.6-k0s.0",
-	"1.28": "k0sproject/k0s:v1.28.11-k0s.0",
-	"1.27": "k0sproject/k0s:v1.27.16-k0s.0",
-}
-
-// K8SAPIVersionMap holds the supported k8s api servers
-var K8SAPIVersionMap = map[string]string{
-	"1.32": "registry.k8s.io/kube-apiserver:v1.32.1",
-	"1.31": "registry.k8s.io/kube-apiserver:v1.31.1",
-	"1.30": "registry.k8s.io/kube-apiserver:v1.30.2",
-	"1.29": "registry.k8s.io/kube-apiserver:v1.29.6",
-	"1.28": "registry.k8s.io/kube-apiserver:v1.28.11",
-	"1.27": "registry.k8s.io/kube-apiserver:v1.27.16",
-}
-
-// K8SControllerVersionMap holds the supported k8s controller managers
-var K8SControllerVersionMap = map[string]string{
-	"1.32": "registry.k8s.io/kube-controller-manager:v1.32.1",
-	"1.31": "registry.k8s.io/kube-controller-manager:v1.31.1",
-	"1.30": "registry.k8s.io/kube-controller-manager:v1.30.2",
-	"1.29": "registry.k8s.io/kube-controller-manager:v1.29.6",
-	"1.28": "registry.k8s.io/kube-controller-manager:v1.28.11",
-	"1.27": "registry.k8s.io/kube-controller-manager:v1.27.16",
-}
-
-// K8SSchedulerVersionMap holds the supported k8s schedulers
-var K8SSchedulerVersionMap = map[string]string{
-	"1.32": "registry.k8s.io/kube-scheduler:v1.32.1",
-	"1.31": "registry.k8s.io/kube-scheduler:v1.31.1",
-	"1.30": "registry.k8s.io/kube-scheduler:v1.30.2",
-	"1.29": "registry.k8s.io/kube-scheduler:v1.29.6",
-	"1.28": "registry.k8s.io/kube-scheduler:v1.28.11",
-	"1.27": "registry.k8s.io/kube-scheduler:v1.27.16",
+// K8SVersionMap holds the supported k8s api servers
+var K8SVersionMap = map[string]string{
+	"1.32": "ghcr.io/loft-sh/kubernetes:v1.32.1",
+	"1.31": "ghcr.io/loft-sh/kubernetes:v1.31.1",
+	"1.30": "ghcr.io/loft-sh/kubernetes:v1.30.2",
 }
 
 // K8SEtcdVersionMap holds the supported etcd
 var K8SEtcdVersionMap = map[string]string{
-	"1.32": "registry.k8s.io/etcd:3.5.17-0",
+	"1.32": "registry.k8s.io/etcd:3.5.21-0",
 	"1.31": "registry.k8s.io/etcd:3.5.15-0",
 	"1.30": "registry.k8s.io/etcd:3.5.13-0",
-	"1.29": "registry.k8s.io/etcd:3.5.10-0",
-	"1.28": "registry.k8s.io/etcd:3.5.9-0",
-	"1.27": "registry.k8s.io/etcd:3.5.7-0",
 }
 
 // ExtraValuesOptions holds the chart options
@@ -176,8 +137,6 @@ func addCommonReleaseValues(config *Config, options *ExtraValuesOptions) {
 		switch options.Distro {
 		case K3SDistro:
 			config.ControlPlane.Distro.K3S.Enabled = true
-		case K0SDistro:
-			config.ControlPlane.Distro.K0S.Enabled = true
 		case K8SDistro:
 		}
 	}

config/default_extra_values.go

@@ -5,6 +5,7 @@ import (
 	"errors"
 	"reflect"
 	"strconv"
+	"strings"
 
 	"sigs.k8s.io/yaml"
 )
@@ -166,3 +167,10 @@ func (f *StrBool) MarshalJSON() ([]byte, error) {
 		return []byte("\"" + *f + "\""), nil
 	}
 }
+
+func (f *StrBool) Bool() bool {
+	if f == nil {
+		return false
+	}
+	return strings.ToLower(string(*f)) == "true"
+}

config/diff.go

@@ -5,6 +5,8 @@ import (
 
 	"github.com/ghodss/yaml"
 	"github.com/loft-sh/log"
+	"github.com/loft-sh/vcluster/pkg/upgrade"
+	"golang.org/x/mod/semver"
 )
 
 type (
@@ -13,7 +15,11 @@ type (
 	}
 )
 
-func ExperimentalWarning(logger log.Logger, currentValues []byte, advisors map[string]func() string) string {
+var advisors = map[string]func() (warning string){
+	"sleepMode": SleepModeWarning,
+}
+
+func ExperimentalWarning(logger log.Logger, currentValues []byte) string {
 	exp := &ExperimentalConfig{}
 	if err := yaml.Unmarshal(currentValues, exp); err != nil {
 		logger.Warn(err)
@@ -36,3 +42,25 @@ func ExperimentalWarning(logger log.Logger, currentValues []byte, advisors map[s
 	expWarning := "An experimental feature you were using has been promoted! 🎉 See below on tips to update."
 	return strings.Join(append([]string{expWarning}, advice...), "\n")
 }
+
+const v24 = "v0.24.0-alpha.0"
+
+func SleepModeWarning() string {
+	// if we're not upgrading to v0.24+ no warning
+	if semver.Compare("v"+upgrade.GetVersion(), v24) == -1 {
+		return ""
+	}
+
+	return `
+sleepMode configuration is no longer under experimental. Please update your values and specify them with --values.
+
+For example
+
+|experimental:                          |sleepMode:
+|  sleepMode:                           |  enabled: true
+|    enabled: true            ---->     |  autoSleep:
+|    autoSleep:                         |    afterInactivity: 24h
+|      afterInactivity: 24h             |
+
+`
+}

config/experimental_helper.go

@@ -4,7 +4,7 @@ import (
 	"github.com/loft-sh/vcluster-config/config"
 )
 
-type LegacyK0sAndK3s struct {
+type LegacyK3s struct {
 	BaseHelm
 	AutoDeletePersistentVolumeClaims bool               `json:"autoDeletePersistentVolumeClaims,omitempty"`
 	K3sToken                         string             `json:"k3sToken,omitempty"`
@@ -14,7 +14,7 @@ type LegacyK0sAndK3s struct {
 	Storage                          Storage            `json:"storage,omitempty"`
 }
 
-func (c *LegacyK0sAndK3s) UnmarshalYAMLStrict(data []byte) error {
+func (c *LegacyK3s) UnmarshalYAMLStrict(data []byte) error {
 	return config.UnmarshalYAMLStrict(data, c)
 }
 

config/legacyconfig/config.go

@@ -4,63 +4,6 @@ import (
 	"testing"
 )
 
-func TestLegacyK0sAndK3s_UnmarshalYAMLStrict(t *testing.T) {
-	type args struct {
-		data []byte
-	}
-	tests := []struct {
-		name    string
-		args    args
-		wantErr bool
-	}{
-		{
-			name: "Valid: k3s",
-			args: args{
-				data: []byte(`
-sync:
-  nodes:
-   enabled: true
-telemetry:
-  disabled: false
-`),
-			},
-			wantErr: false,
-		},
-		{
-			name: "Invalid: k8s",
-			args: args{
-				data: []byte(`
-api:
-  image: registry.k8s.io/kube-apiserver:v1.29.0
-controller:
-  image: registry.k8s.io/kube-controller-manager:v1.29.0
-etcd:
-  image: registry.k8s.io/etcd:3.5.10-0
-scheduler:
-  image: registry.k8s.io/kube-scheduler:v1.29.0
-service:
-  type: NodePort
-serviceCIDR: 10.96.0.0/16
-sync:
-  nodes:
-   enabled: true
-telemetry:
-  disabled: false
-`),
-			},
-			wantErr: true,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			c := &LegacyK0sAndK3s{}
-			if err := c.UnmarshalYAMLStrict(tt.args.data); (err != nil) != tt.wantErr {
-				t.Errorf("LegacyK0sAndK3s.UnmarshalYAMLStrict() error = %v, wantErr %v", err, tt.wantErr)
-			}
-		})
-	}
-}
-
 func TestLegacyK8s_UnmarshalYAMLStrict(t *testing.T) {
 	type args struct {
 		data []byte
@@ -131,14 +74,14 @@ telemetry:
 			wantErr: true,
 		},
 		{
-			name: "Invalid: k0s",
+			name: "Invalid: k3s",
 			args: args{
 				data: []byte(`
 sync:
   nodes:
    enabled: true
 vcluster:
-  image: k0sproject/k0s:v1.29.1-k0s.0
+  image: k3sproject/k3s:v1.29.1-k3s.0
 telemetry:
   disabled: false
 `),