chore: sync config/*.go and values.schema.json to vCluster version v0.23.3

Author: loft-bot

config/config.go

@@ -2,12 +2,12 @@ package config
 
 import (
 	_ "embed"
+	"fmt"
+	"os"
 	"strings"
 	"testing"
 
 	"gotest.tools/assert"
-	"gotest.tools/assert/cmp"
-	"sigs.k8s.io/yaml"
 )
 
 func TestConfig_Diff(t *testing.T) {
@@ -281,6 +281,40 @@ 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{
@@ -364,21 +398,6 @@ 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 {
@@ -388,128 +407,23 @@ func TestConfig_IsProFeatureEnabled(t *testing.T) {
 	}
 }
 
-// We changed sync.toHost.pods.rewriteHosts.initContainer.image from a string to an object in 0.27.0.
-// We parse the previously used config on upgrade, so it must be backwards compatible.
-func TestImage_UnmarshalYAML(t *testing.T) {
-	tests := []struct {
-		name     string
-		yaml     string
-		expected Image
-	}{
-		{
-			name: "image as object",
-			yaml: `registry: registry:5000
-repository: some/repo
-tag: sometag`,
-			expected: Image{
-				Registry:   "registry:5000",
-				Repository: "some/repo",
-				Tag:        "sometag",
-			},
-		},
-		{
-			name: "image as string",
-			yaml: "registry:5000/some/repo:sometag",
-			expected: Image{
-				Registry:   "registry:5000",
-				Repository: "some/repo",
-				Tag:        "sometag",
-			},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			var actual Image
-			err := yaml.Unmarshal([]byte(tt.yaml), &actual)
-			assert.NilError(t, err)
-			assert.DeepEqual(t, actual, tt.expected)
-		})
-	}
-}
-
-func TestImage_String(t *testing.T) {
-	testCases := []struct {
-		name     string
-		image    Image
-		expected string
-	}{
-		{
-			name: "complete image reference",
-			image: Image{
-				Registry:   "registry.k8s.io",
-				Repository: "coredns/coredns",
-				Tag:        "1.11.3",
-			},
-			expected: "registry.k8s.io/coredns/coredns:1.11.3",
-		},
-		{
-			name: "may omit registry",
-			image: Image{
-				Repository: "coredns/coredns",
-				Tag:        "1.11.3",
-			},
-			expected: "coredns/coredns:1.11.3",
-		},
-		{
-			name: "may omit registry and repo",
-			image: Image{
-				Repository: "alpine",
-				Tag:        "3.20",
-			},
-			expected: "alpine:3.20",
-		},
-		{
-			name: "may omit tag",
-			image: Image{
-				Repository: "alpine",
-			},
-			expected: "alpine",
-		},
-		{
-			name: "omit repo but not registry is library",
-			image: Image{
-				Registry:   "ghcr.io",
-				Repository: "alpine",
-				Tag:        "3.20",
-			},
-			expected: "ghcr.io/library/alpine:3.20",
-		},
-		{
-			name: "registry may have port",
-			image: Image{
-				Registry:   "host.docker.internal:5000",
-				Repository: "coredns/coredns",
-				Tag:        "1.11.3",
-			},
-			expected: "host.docker.internal:5000/coredns/coredns:1.11.3",
-		},
-		{
-			name: "registry with port and omit tag",
-			image: Image{
-				Registry:   "localhost:5000",
-				Repository: "coredns/coredns",
-			},
-			expected: "localhost:5000/coredns/coredns",
-		},
-		{
-			name:     "empty image is nil value",
-			image:    Image{},
-			expected: "",
-		},
-	}
+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)
 
-	for _, tt := range testCases {
-		t.Run("String(): "+tt.name, func(t *testing.T) {
-			if actual := tt.image.String(); actual != tt.expected {
-				t.Errorf("Expected %s, got %s", tt.expected, actual)
-			}
-		})
-
-		t.Run("ParseImageRef(): "+tt.name, func(t *testing.T) {
-			var image Image
-			ParseImageRef(tt.expected, &image)
-			assert.Check(t, cmp.DeepEqual(tt.image, image))
-		})
-	}
+	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,6 +8,7 @@ import (
 const (
 	K3SDistro = "k3s"
 	K8SDistro = "k8s"
+	K0SDistro = "k0s"
 	Unknown   = "unknown"
 )
 
@@ -16,33 +17,68 @@ type StoreType string
 const (
 	StoreTypeEmbeddedEtcd     StoreType = "embedded-etcd"
 	StoreTypeExternalEtcd     StoreType = "external-etcd"
-	StoreTypeDeployedEtcd     StoreType = "deployed-etcd"
 	StoreTypeEmbeddedDatabase StoreType = "embedded-database"
 	StoreTypeExternalDatabase StoreType = "external-database"
 )
 
 // K3SVersionMap holds the supported k3s versions
 var K3SVersionMap = map[string]string{
-	"1.33": "rancher/k3s:v1.33.1-k3s1",
 	"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",
 }
 
-// K8SVersionMap holds the supported k8s api servers
-var K8SVersionMap = map[string]string{
-	"1.33": "ghcr.io/loft-sh/kubernetes:v1.33.1",
-	"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",
+// 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",
 }
 
 // K8SEtcdVersionMap holds the supported etcd
 var K8SEtcdVersionMap = map[string]string{
-	"1.33": "registry.k8s.io/etcd:3.5.21-0",
-	"1.32": "registry.k8s.io/etcd:3.5.21-0",
+	"1.32": "registry.k8s.io/etcd:3.5.17-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
@@ -90,31 +126,26 @@ func getExtraValues(options *ExtraValuesOptions) (*Config, error) {
 	return vConfig, nil
 }
 
-func ParseImageRef(ref string, image *Image) {
-	*image = Image{}
-
-	splitRepoAndTag := func(s string) {
-		split := strings.SplitN(s, ":", 2)
-		switch len(split) {
-		case 1:
-			image.Repository = s
-		case 2:
-			image.Repository = split[0]
-			image.Tag = split[1]
-		}
-		image.Repository = strings.TrimPrefix(image.Repository, "library/")
+func SplitImage(image string) (string, string, string) {
+	imageSplitted := strings.Split(image, ":")
+	if len(imageSplitted) == 1 {
+		return "", "", ""
 	}
 
-	parts := strings.SplitN(ref, "/", 2)
-	switch {
-	case len(parts) == 1: // <repo>[:<tag>]
-		splitRepoAndTag(parts[0])
-	case strings.ContainsAny(parts[0], ".:"): // <registry>/<repo>[:<tag>]
-		image.Registry = parts[0]
-		splitRepoAndTag(parts[1])
-	default: // <repo/repo>[:<tag]
-		splitRepoAndTag(ref)
+	// check if registry needs to be filled
+	registryAndRepository := strings.Join(imageSplitted[:len(imageSplitted)-1], ":")
+	parts := strings.Split(registryAndRepository, "/")
+	registry := ""
+	repository := strings.Join(parts, "/")
+	if len(parts) >= 2 && (strings.ContainsRune(parts[0], '.') || strings.ContainsRune(parts[0], ':')) {
+		// The first part of the repository is treated as the registry domain
+		// iff it contains a '.' or ':' character, otherwise it is all repository
+		// and the domain defaults to Docker Hub.
+		registry = parts[0]
+		repository = strings.Join(parts[1:], "/")
 	}
+
+	return registry, repository, imageSplitted[len(imageSplitted)-1]
 }
 
 func addCommonReleaseValues(config *Config, options *ExtraValuesOptions) {
@@ -145,6 +176,8 @@ 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,7 +5,6 @@ import (
 	"errors"
 	"reflect"
 	"strconv"
-	"strings"
 
 	"sigs.k8s.io/yaml"
 )
@@ -167,10 +166,3 @@ 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"
-}