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

Author: loft-bot

config/config.go

@@ -100,9 +100,6 @@ type Integrations struct {
 	// - Certificates and Issuers will be synced from the virtual cluster to the host cluster.
 	// - ClusterIssuers will be synced from the host cluster to the virtual cluster.
 	CertManager CertManager `json:"certManager,omitempty"`
-
-	// Istio syncs DestinationRules, Gateways and VirtualServices from virtual cluster to the host.
-	Istio Istio `json:"istio,omitempty"`
 }
 
 // CertManager reuses a host cert-manager and makes its CRDs from it available inside the vCluster
@@ -137,23 +134,6 @@ type ClusterIssuersSyncConfig struct {
 	Selector LabelSelector `json:"selector,omitempty"`
 }
 
-type Istio struct {
-	EnableSwitch
-	Sync IstioSync `json:"sync,omitempty"`
-}
-
-type IstioSync struct {
-	ToHost IstioSyncToHost `json:"toHost,omitempty"`
-}
-
-type IstioSyncToHost struct {
-	DestinationRules EnableSwitch `json:"destinationRules,omitempty"`
-
-	Gateways EnableSwitch `json:"gateways,omitempty"`
-
-	VirtualServices EnableSwitch `json:"virtualServices,omitempty"`
-}
-
 // ExternalSecrets reuses a host external secret operator and makes certain CRDs from it available inside the vCluster
 type ExternalSecrets struct {
 	// Enabled defines whether the external secret integration is enabled or not
@@ -297,10 +277,8 @@ func (c *Config) BackingStoreType() StoreType {
 	switch {
 	case c.ControlPlane.BackingStore.Etcd.Embedded.Enabled:
 		return StoreTypeEmbeddedEtcd
-	case c.ControlPlane.BackingStore.Etcd.External.Enabled:
-		return StoreTypeExternalEtcd
 	case c.ControlPlane.BackingStore.Etcd.Deploy.Enabled:
-		return StoreTypeDeployedEtcd
+		return StoreTypeExternalEtcd
 	case c.ControlPlane.BackingStore.Database.Embedded.Enabled:
 		return StoreTypeEmbeddedDatabase
 	case c.ControlPlane.BackingStore.Database.External.Enabled:
@@ -311,7 +289,7 @@ func (c *Config) BackingStoreType() StoreType {
 }
 
 func (c *Config) EmbeddedDatabase() bool {
-	return !c.ControlPlane.BackingStore.Database.External.Enabled && !c.ControlPlane.BackingStore.Etcd.Embedded.Enabled && !c.ControlPlane.BackingStore.Etcd.Deploy.Enabled && !c.ControlPlane.BackingStore.Etcd.External.Enabled
+	return !c.ControlPlane.BackingStore.Database.External.Enabled && !c.ControlPlane.BackingStore.Etcd.Embedded.Enabled && !c.ControlPlane.BackingStore.Etcd.Deploy.Enabled
 }
 
 func (c *Config) Distro() string {
@@ -352,11 +330,9 @@ func ValidateStoreChanges(currentStoreType, previousStoreType StoreType) error {
 	}
 
 	switch currentStoreType {
-	case StoreTypeDeployedEtcd:
-		fallthrough
 	case StoreTypeEmbeddedEtcd:
 		// switching from external ETCD, deploy ETCD, or embedded (SQLite) to deployed or embedded ETCD is valid
-		if previousStoreType == StoreTypeExternalEtcd || previousStoreType == StoreTypeDeployedEtcd || previousStoreType == StoreTypeEmbeddedDatabase {
+		if previousStoreType == StoreTypeExternalEtcd || previousStoreType == StoreTypeEmbeddedDatabase {
 			return nil
 		}
 	case StoreTypeExternalDatabase:
@@ -375,7 +351,7 @@ func ValidateStoreChanges(currentStoreType, previousStoreType StoreType) error {
 
 // ValidateDistroChanges checks whether migrating from one distro to the other is allowed.
 func ValidateDistroChanges(currentDistro, previousDistro string) error {
-	if currentDistro != previousDistro && !(previousDistro == "eks" && currentDistro == K8SDistro) && !(previousDistro == K3SDistro && currentDistro == K8SDistro) {
+	if currentDistro != previousDistro && !(previousDistro == "eks" && currentDistro == K8SDistro) {
 		return fmt.Errorf("seems like you were using %s as a distro before and now have switched to %s, please make sure to not switch between vCluster distros", previousDistro, currentDistro)
 	}
 	return nil
@@ -1122,10 +1098,10 @@ type Distro struct {
 	// K8S holds K8s relevant configuration.
 	K8S DistroK8s `json:"k8s,omitempty"`
 
-	// [Deprecated] K3S holds K3s relevant configuration.
+	// K3S holds K3s relevant configuration.
 	K3S DistroK3s `json:"k3s,omitempty"`
 
-	// [Deprecated] K0S holds k0s relevant configuration.
+	// K0S holds k0s relevant configuration.
 	K0S DistroK0s `json:"k0s,omitempty"`
 }
 
@@ -1144,8 +1120,16 @@ type DistroK8s struct {
 	// Enabled specifies if the K8s distro should be enabled. Only one distro can be enabled at the same time.
 	Enabled bool `json:"enabled,omitempty"`
 
-	// [Deprecated] Version field is deprecated.
-	// Use controlPlane.distro.k8s.image.tag to specify the Kubernetes version instead.
+	// Version specifies k8s components (scheduler, kube-controller-manager & apiserver) version.
+	// It is a shortcut for controlPlane.distro.k8s.apiServer.image.tag,
+	// controlPlane.distro.k8s.controllerManager.image.tag and
+	// controlPlane.distro.k8s.scheduler.image.tag
+	// If e.g. controlPlane.distro.k8s.version is set to v1.30.1 and
+	// controlPlane.distro.k8s.scheduler.image.tag
+	//(or controlPlane.distro.k8s.controllerManager.image.tag or controlPlane.distro.k8s.apiServer.image.tag)
+	// is set to v1.31.0,
+	// value from controlPlane.distro.k8s.(controlPlane-component).image.tag will be used
+	// (where controlPlane-component is apiServer, controllerManager and scheduler).
 	Version string `json:"version,omitempty"`
 
 	// APIServer holds configuration specific to starting the api server.
@@ -1172,12 +1156,6 @@ type DistroK0s struct {
 }
 
 type DistroCommon struct {
-	// Image is the distro image
-	Image Image `json:"image,omitempty"`
-
-	// ImagePullPolicy is the pull policy for the distro image
-	ImagePullPolicy string `json:"imagePullPolicy,omitempty"`
-
 	// Env are extra environment variables to use for the main container and NOT the init container.
 	Env []map[string]interface{} `json:"env,omitempty"`
 
@@ -1187,7 +1165,14 @@ type DistroCommon struct {
 	// Security options can be used for the distro init container
 	SecurityContext map[string]interface{} `json:"securityContext,omitempty"`
 }
+
 type DistroContainer struct {
+	// Image is the distro image
+	Image Image `json:"image,omitempty"`
+
+	// ImagePullPolicy is the pull policy for the distro image
+	ImagePullPolicy string `json:"imagePullPolicy,omitempty"`
+
 	// Command is the command to start the distro binary. This will override the existing command.
 	Command []string `json:"command,omitempty"`
 
@@ -1199,6 +1184,12 @@ type DistroContainerEnabled struct {
 	// Enabled signals this container should be enabled.
 	Enabled bool `json:"enabled,omitempty"`
 
+	// Image is the distro image
+	Image Image `json:"image,omitempty"`
+
+	// ImagePullPolicy is the pull policy for the distro image
+	ImagePullPolicy string `json:"imagePullPolicy,omitempty"`
+
 	// Command is the command to start the distro binary. This will override the existing command.
 	Command []string `json:"command,omitempty"`
 
@@ -1228,7 +1219,7 @@ type Image struct {
 	// Repository is the repository of the container image, e.g. my-repo/my-image
 	Repository string `json:"repository,omitempty"`
 
-	// Tag is the tag of the container image, e.g. latest. If set to the default, it will use the host Kubernetes version.
+	// Tag is the tag of the container image, e.g. latest
 	Tag string `json:"tag,omitempty"`
 }
 
@@ -1306,47 +1297,18 @@ type Etcd struct {
 
 	// Deploy defines to use an external etcd that is deployed by the helm chart
 	Deploy EtcdDeploy `json:"deploy,omitempty"`
-
-	// External defines to use a self-hosted external etcd that is not deployed by the helm chart
-	External EtcdExternal `json:"external,omitempty"`
 }
 
 func (e Etcd) JSONSchemaExtend(base *jsonschema.Schema) {
 	addProToJSONSchema(base, reflect.TypeOf(e))
 }
 
-type EtcdExternal struct {
-	// Enabled defines if the external etcd should be used.
-	Enabled bool `json:"enabled,omitempty"`
-
-	// Endpoint holds the endpoint of the external etcd server, e.g. my-example-service:2379
-	Endpoint string `json:"endpoint,omitempty"`
-
-	// TLS defines the tls configuration for the external etcd server
-	TLS EtcdExternalTLS `json:"tls,omitempty"`
-}
-
-// EtcdExternalTLS defines tls for external etcd server
-type EtcdExternalTLS struct {
-	// CaFile is the path to the ca file
-	CaFile string `json:"caFile,omitempty"`
-
-	// CertFile is the path to the cert file
-	CertFile string `json:"certFile,omitempty"`
-
-	// KeyFile is the path to the key file
-	KeyFile string `json:"keyFile,omitempty"`
-}
-
 type EtcdEmbedded struct {
 	// Enabled defines if the embedded etcd should be used.
 	Enabled bool `json:"enabled,omitempty" product:"pro"`
 
 	// MigrateFromDeployedEtcd signals that vCluster should migrate from the deployed external etcd to embedded etcd.
 	MigrateFromDeployedEtcd bool `json:"migrateFromDeployedEtcd,omitempty"`
-
-	// SnapshotCount defines the number of snapshots to keep for the embedded etcd. Defaults to 10000 if less than 1.
-	SnapshotCount int `json:"snapshotCount,omitempty"`
 }
 
 func (e EtcdEmbedded) JSONSchemaExtend(base *jsonschema.Schema) {
@@ -1838,18 +1800,9 @@ type NetworkPolicy struct {
 	// Enabled defines if the network policy should be deployed by vCluster.
 	Enabled bool `json:"enabled,omitempty"`
 
-	// FallbackDNS is the fallback DNS server to use if the virtual cluster does not have a DNS server.
-	FallbackDNS string `json:"fallbackDns,omitempty"`
-
-	// OutgoingConnections are the outgoing connections options for the vCluster workloads.
+	FallbackDNS         string              `json:"fallbackDns,omitempty"`
 	OutgoingConnections OutgoingConnections `json:"outgoingConnections,omitempty"`
 
-	// ExtraControlPlaneRules are extra allowed rules for the vCluster control plane.
-	ExtraControlPlaneRules []map[string]interface{} `json:"extraControlPlaneRules,omitempty"`
-
-	// ExtraWorkloadRules are extra allowed rules for the vCluster workloads.
-	ExtraWorkloadRules []map[string]interface{} `json:"extraWorkloadRules,omitempty"`
-
 	LabelsAndAnnotations `json:",inline"`
 }
 
@@ -2091,6 +2044,10 @@ type Experimental struct {
 
 	// DenyProxyRequests denies certain requests in the vCluster proxy.
 	DenyProxyRequests []DenyRule `json:"denyProxyRequests,omitempty" product:"pro"`
+
+	// ReuseNamespace allows reusing the same namespace to create multiple vClusters.
+	// This flag is deprecated, as this scenario will be removed entirely in upcoming releases.
+	ReuseNamespace bool `json:"reuseNamespace,omitempty"`
 }
 
 func (e Experimental) JSONSchemaExtend(base *jsonschema.Schema) {

config/config_test.go

@@ -2,6 +2,8 @@ package config
 
 import (
 	_ "embed"
+	"fmt"
+	"os"
 	"strings"
 	"testing"
 
@@ -404,3 +406,24 @@ 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/default_extra_values.go

@@ -17,7 +17,6 @@ type StoreType string
 const (
 	StoreTypeEmbeddedEtcd     StoreType = "embedded-etcd"
 	StoreTypeExternalEtcd     StoreType = "external-etcd"
-	StoreTypeDeployedEtcd     StoreType = "deployed-etcd"
 	StoreTypeEmbeddedDatabase StoreType = "embedded-database"
 	StoreTypeExternalDatabase StoreType = "external-database"
 )
@@ -27,27 +26,59 @@ 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",
 }
 
-// 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",
+// 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.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