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

Author: loft-bot

config/config.go

@@ -77,9 +77,6 @@ type Config struct {
 
 	// Plugin specifies which vCluster plugins to enable. Use "plugins" instead. Do not use this option anymore.
 	Plugin map[string]Plugin `json:"plugin,omitempty"`
-
-	// SleepMode holds the native sleep mode configuration for Pro clusters
-	SleepMode *SleepMode `json:"sleepMode,omitempty"`
 }
 
 // Integrations holds config for vCluster integrations with other operators or tools running on the host cluster
@@ -90,19 +87,13 @@ type Integrations struct {
 	// KubeVirt reuses a host kubevirt and makes certain CRDs from it available inside the vCluster
 	KubeVirt KubeVirt `json:"kubeVirt,omitempty"`
 
-	// ExternalSecrets reuses a host external secret operator and makes certain CRDs from it available inside the vCluster.
-	// - ExternalSecrets will be synced from the virtual cluster to the host cluster.
-	// - SecretStores will be synced from the virtual cluster to the host cluster and then bi-directionally.
-	// - ClusterSecretStores will be synced from the host cluster to the virtual cluster.
+	// ExternalSecrets reuses a host external secret operator and makes certain CRDs from it available inside the vCluster
 	ExternalSecrets ExternalSecrets `json:"externalSecrets,omitempty"`
 
 	// CertManager reuses a host cert-manager and makes its CRDs from it available inside the vCluster.
 	// - 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 +128,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
@@ -165,11 +139,11 @@ type ExternalSecrets struct {
 }
 
 type ExternalSecretsSync struct {
-	// ExternalSecrets defines if external secrets should get synced from the virtual cluster to the host cluster.
+	// ExternalSecrets defines whether to sync external secrets or not
 	ExternalSecrets EnableSwitch `json:"externalSecrets,omitempty"`
-	// Stores defines if secret stores should get synced from the virtual cluster to the host cluster and then bi-directionally.
+	// Stores defines whether to sync stores or not
 	Stores EnableSwitch `json:"stores,omitempty"`
-	// ClusterStores defines if cluster secrets stores should get synced from the host cluster to the virtual cluster.
+	// ClusterStores defines whether to sync cluster stores or not
 	ClusterStores ClusterStoresSyncConfig `json:"clusterStores,omitempty"`
 }
 
@@ -297,10 +271,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 +283,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 {
@@ -345,15 +317,15 @@ func ValidateChanges(oldCfg, newCfg *Config) error {
 
 // ValidateStoreAndDistroChanges checks whether migrating from one store to the other is allowed.
 func ValidateStoreAndDistroChanges(currentStoreType, previousStoreType StoreType, 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)
 	}
 
 	if currentStoreType != previousStoreType {
-		if currentStoreType != StoreTypeDeployedEtcd && currentStoreType != StoreTypeEmbeddedEtcd {
+		if currentStoreType != StoreTypeEmbeddedEtcd {
 			return fmt.Errorf("seems like you were using %s as a store before and now have switched to %s, please make sure to not switch between vCluster stores", previousStoreType, currentStoreType)
 		}
-		if previousStoreType != StoreTypeExternalEtcd && previousStoreType != StoreTypeDeployedEtcd && previousStoreType != StoreTypeEmbeddedDatabase {
+		if previousStoreType != StoreTypeExternalEtcd && previousStoreType != StoreTypeEmbeddedDatabase {
 			return fmt.Errorf("seems like you were using %s as a store before and now have switched to %s, please make sure to not switch between vCluster stores", previousStoreType, currentStoreType)
 		}
 	}
@@ -428,41 +400,6 @@ func UnmarshalYAMLStrict(data []byte, i any) error {
 
 // ExportKubeConfig describes how vCluster should export the vCluster kubeconfig.
 type ExportKubeConfig struct {
-	ExportKubeConfigProperties
-
-	// Declare in which host cluster secret vCluster should store the generated virtual cluster kubeconfig.
-	// If this is not defined, vCluster will create it with `vc-NAME`. If you specify another name,
-	// vCluster creates the config in this other secret.
-	//
-	// Deprecated: Use AdditionalSecrets instead.
-	Secret ExportKubeConfigSecretReference `json:"secret,omitempty"`
-
-	// AdditionalSecrets specifies the additional host cluster secrets in which vCluster will store the
-	// generated virtual cluster kubeconfigs.
-	AdditionalSecrets []ExportKubeConfigAdditionalSecretReference `json:"additionalSecrets,omitempty"`
-}
-
-// GetAdditionalSecrets returns optional additional kubeconfig Secrets.
-//
-// If the deprecated Secret property is set, GetAdditionalSecrets only returns that secret, and
-// AdditionalSecrets is ignored. On the other hand, if the AdditionalSecrets property is set,
-// GetAdditionalSecrets returns the secrets config from the AdditionalSecrets, and Secret property
-// is ignored.
-func (e *ExportKubeConfig) GetAdditionalSecrets() []ExportKubeConfigAdditionalSecretReference {
-	if e.Secret.IsSet() {
-		return []ExportKubeConfigAdditionalSecretReference{
-			{
-				ExportKubeConfigProperties: e.ExportKubeConfigProperties,
-				Namespace:                  e.Secret.Namespace,
-				Name:                       e.Secret.Name,
-			},
-		}
-	}
-
-	return e.AdditionalSecrets
-}
-
-type ExportKubeConfigProperties struct {
 	// Context is the name of the context within the generated kubeconfig to use.
 	Context string `json:"context,omitempty"`
 
@@ -474,6 +411,11 @@ type ExportKubeConfigProperties struct {
 
 	// ServiceAccount can be used to generate a service account token instead of the default certificates.
 	ServiceAccount ExportKubeConfigServiceAccount `json:"serviceAccount,omitempty"`
+
+	// Declare in which host cluster secret vCluster should store the generated virtual cluster kubeconfig.
+	// If this is not defined, vCluster will create it with `vc-NAME`. If you specify another name,
+	// vCluster creates the config in this other secret.
+	Secret ExportKubeConfigSecretReference `json:"secret,omitempty"`
 }
 
 type ExportKubeConfigServiceAccount struct {
@@ -500,24 +442,6 @@ type ExportKubeConfigSecretReference struct {
 	Namespace string `json:"namespace,omitempty"`
 }
 
-// IsSet checks if at least one ExportKubeConfigSecretReference property is set.
-func (s *ExportKubeConfigSecretReference) IsSet() bool {
-	return *s != (ExportKubeConfigSecretReference{})
-}
-
-// ExportKubeConfigAdditionalSecretReference defines the additional host cluster secret in which
-// vCluster stores the generated virtual cluster kubeconfigs.
-type ExportKubeConfigAdditionalSecretReference struct {
-	ExportKubeConfigProperties
-
-	// Name is the name of the secret where the kubeconfig is stored.
-	Name string `json:"name,omitempty"`
-
-	// Namespace where vCluster stores the kubeconfig secret. If this is not equal to the namespace
-	// where you deployed vCluster, you need to make sure vCluster has access to this other namespace.
-	Namespace string `json:"namespace,omitempty"`
-}
-
 type Sync struct {
 	// Configure resources to sync from the virtual cluster to the host cluster.
 	ToHost SyncToHost `json:"toHost,omitempty"`
@@ -1125,7 +1049,15 @@ type DistroK8s struct {
 	Enabled bool `json:"enabled,omitempty"`
 
 	// Version specifies k8s components (scheduler, kube-controller-manager & apiserver) version.
-	// It is a shortcut for controlPlane.distro.k8s.image.tag
+	// 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.
@@ -1152,12 +1084,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"`
 
@@ -1167,7 +1093,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"`
 
@@ -1179,6 +1112,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"`
 
@@ -1286,47 +1225,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) {
@@ -1818,18 +1728,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"`
 }
 
@@ -2072,6 +1973,9 @@ type Experimental struct {
 	// DenyProxyRequests denies certain requests in the vCluster proxy.
 	DenyProxyRequests []DenyRule `json:"denyProxyRequests,omitempty" product:"pro"`
 
+	// SleepMode holds the native sleep mode configuration for Pro clusters
+	SleepMode *SleepMode `json:"sleepMode,omitempty"`
+
 	// 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"`
@@ -2500,8 +2404,6 @@ type SleepMode struct {
 	TimeZone string `json:"timeZone,omitempty"`
 	// AutoSleep holds autoSleep details
 	AutoSleep SleepModeAutoSleep `json:"autoSleep,omitempty"`
-	// AutoWakeup holds configuration for waking the vCluster on a schedule rather than waiting for some activity.
-	AutoWakeup AutoWakeup `json:"autoWakeup,omitempty"`
 }
 
 // SleepModeAutoSleep holds configuration for allowing a vCluster to sleep its workloads
@@ -2513,6 +2415,9 @@ type SleepModeAutoSleep struct {
 	// Schedule represents a cron schedule for when to sleep workloads
 	Schedule string `json:"schedule,omitempty"`
 
+	// Wakeup holds configuration for waking the vCluster on a schedule rather than waiting for some activity.
+	Wakeup AutoWakeup `json:"wakeup,omitempty"`
+
 	// Exclude holds configuration for labels that, if present, will prevent a workload from going to sleep
 	Exclude AutoSleepExclusion `json:"exclude,omitempty"`
 }

config/config_test.go

@@ -415,13 +415,15 @@ func TestIfDefaultImagesVersionsAreInSync(t *testing.T) {
 	tplBytes, err := os.ReadFile(initContainersTplFilePath)
 
 	assert.NilError(t, err)
-	assert.Equal(t, defaultConfig.ControlPlane.Distro.K8S.Image.Tag, defaultConfig.ControlPlane.Distro.K8S.Image.Tag)
-	expectedDefaultTag := fmt.Sprintf("{{- $defaultTag := %q -}}", defaultConfig.ControlPlane.Distro.K8S.Image.Tag)
+	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, 1,
+		t, got, 3,
 		fmt.Sprintf("please update $defaultTag in %s so it's equal to the "+
-			".Values.controlPlane.distro.k8s.image.tag",
+			".Values.controlPlane.distro.k8s.controllerManager.image.tag",
 			initContainersTplFilePath),
 	)
 }