chore: sync config/*.go and values.schema.json to vCluster version v0.27.0-beta.3

Author: loft-bot

config/config.go

@@ -12,6 +12,7 @@ import (
 	"time"
 
 	"github.com/invopop/jsonschema"
+	yamlv3 "gopkg.in/yaml.v3"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -382,8 +383,9 @@ type AutoUpgrade struct {
 }
 
 type Kubelet struct {
-	// CgroupDriver defines the cgroup driver to use for the kubelet.
-	CgroupDriver string `json:"cgroupDriver,omitempty"`
+	// Config is the config for the kubelet that will be merged into the default kubelet config. More information can be found here:
+	// https://kubernetes.io/docs/reference/config-api/kubelet-config.v1beta1/#kubelet-config-k8s-io-v1beta1-KubeletConfiguration
+	Config map[string]interface{} `json:"config,omitempty"`
 }
 
 type KubeProxy struct {
@@ -410,6 +412,10 @@ type KubeProxy struct {
 
 	// ExtraArgs are additional arguments to pass to the kube-proxy.
 	ExtraArgs []string `json:"extraArgs,omitempty"`
+
+	// Config is the config for the kube-proxy that will be merged into the default kube-proxy config. More information can be found here:
+	// https://kubernetes.io/docs/reference/config-api/kube-proxy-config.v1alpha1/#kubeproxy-config-k8s-io-v1alpha1-KubeProxyConfiguration
+	Config map[string]interface{} `json:"config,omitempty"`
 }
 
 type Konnectivity struct {
@@ -1668,7 +1674,7 @@ type DistroK8s struct {
 	// ControllerManager holds configuration specific to starting the controller manager.
 	ControllerManager DistroContainerEnabled `json:"controllerManager,omitempty"`
 
-	// Scheduler holds configuration specific to starting the scheduler. Enable this via controlPlane.advanced.virtualScheduler.enabled
+	// Scheduler holds configuration specific to starting the scheduler.
 	Scheduler DistroContainerEnabled `json:"scheduler,omitempty"`
 
 	DistroCommon `json:",inline"`
@@ -1721,7 +1727,44 @@ type Image struct {
 	Tag string `json:"tag,omitempty"`
 }
 
-func (i Image) String() (ref string) {
+// UnmarshalJSON makes the schema change from string to Image backwards compatible
+func (i *Image) UnmarshalJSON(data []byte) error {
+	var str string
+	if err := json.Unmarshal(data, &str); err == nil {
+		ParseImageRef(str, i)
+		return nil
+	}
+
+	type Alias Image
+	var aux Alias
+	if err := json.Unmarshal(data, &aux); err != nil {
+		return err
+	}
+	*i = Image(aux)
+	return nil
+}
+
+// UnmarshalYAML makes the schema change from string to Image backwards compatible
+func (i *Image) UnmarshalYAML(node *yamlv3.Node) error {
+	if node.Kind == yamlv3.ScalarNode {
+		ParseImageRef(node.Value, i)
+		return nil
+	}
+
+	type Alias Image
+	var aux Alias
+	if err := node.Decode(&aux); err != nil {
+		return err
+	}
+	*i = Image(aux)
+	return nil
+}
+
+func (i *Image) String() (ref string) {
+	if i == nil {
+		return
+	}
+
 	if i.Registry != "" {
 		ref = i.Registry + "/"
 	}

config/config_test.go

@@ -7,6 +7,7 @@ import (
 
 	"gotest.tools/assert"
 	"gotest.tools/assert/cmp"
+	"sigs.k8s.io/yaml"
 )
 
 func TestConfig_Diff(t *testing.T) {
@@ -387,6 +388,46 @@ 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

config/experimental_helper.go

@@ -5,8 +5,6 @@ import (
 
 	"github.com/ghodss/yaml"
 	"github.com/loft-sh/log"
-	"github.com/loft-sh/vcluster/pkg/upgrade"
-	"golang.org/x/mod/semver"
 )
 
 type (
@@ -15,11 +13,7 @@ type (
 	}
 )
 
-var advisors = map[string]func() (warning string){
-	"sleepMode": SleepModeWarning,
-}
-
-func ExperimentalWarning(logger log.Logger, currentValues []byte) string {
+func ExperimentalWarning(logger log.Logger, currentValues []byte, advisors map[string]func() string) string {
 	exp := &ExperimentalConfig{}
 	if err := yaml.Unmarshal(currentValues, exp); err != nil {
 		logger.Warn(err)
@@ -42,25 +36,3 @@ func ExperimentalWarning(logger log.Logger, currentValues []byte) string {
 	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/values.yaml

@@ -433,6 +433,8 @@ controlPlane:
 privateNodes:
   enabled: false
   importNodeBinaries: true
+  kubelet:
+    config: {}
   autoUpgrade:
     enabled: true
     concurrency: 1
@@ -454,6 +456,7 @@ deploy:
     tolerations: []
     extraEnv: []
     extraArgs: []
+    config: {}
   metallb:
     enabled: false
     ipAddressPool:

go.mod

@@ -6,9 +6,8 @@ require (
 	github.com/ghodss/yaml v1.0.0
 	github.com/invopop/jsonschema v0.12.0
 	github.com/loft-sh/log v0.0.0-20240219160058-26d83ffb46ac
-	github.com/loft-sh/vcluster v0.23.0
 	github.com/xeipuuv/gojsonschema v1.2.0
-	golang.org/x/mod v0.24.0
+	gopkg.in/yaml.v3 v3.0.1
 	gotest.tools v2.2.0+incompatible
 	k8s.io/apimachinery v0.32.1
 	sigs.k8s.io/controller-runtime v0.20.1
@@ -20,8 +19,8 @@ require (
 	github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
 	github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d // indirect
 	github.com/bahlo/generic-list-go v0.2.0 // indirect
-	github.com/blang/semver v3.5.1+incompatible // indirect
 	github.com/buger/jsonparser v1.1.1 // indirect
+	github.com/creack/pty v1.1.21 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/emicklei/go-restful/v3 v3.12.1 // indirect
 	github.com/evanphx/json-patch/v5 v5.9.0 // indirect
@@ -34,11 +33,8 @@ require (
 	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
-	github.com/google/go-github/v30 v30.1.0 // indirect
-	github.com/google/go-querystring v1.1.0 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/google/uuid v1.6.0 // indirect
-	github.com/inconshreveable/go-update v0.0.0-20160112193335-8152e7eb6ccf // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/k0kubun/go-ansi v0.0.0-20180517002512-3bf9e2903213 // indirect
@@ -52,15 +48,11 @@ require (
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/rhysd/go-github-selfupdate v1.2.3 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
-	github.com/tcnksm/go-gitconfig v0.1.2 // indirect
-	github.com/ulikunitz/xz v0.5.11 // indirect
 	github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
 	github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
 	github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
-	golang.org/x/crypto v0.32.0 // indirect
 	golang.org/x/net v0.34.0 // indirect
 	golang.org/x/oauth2 v0.23.0 // indirect
 	golang.org/x/sys v0.29.0 // indirect
@@ -71,8 +63,8 @@ require (
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/api v0.32.1 // indirect
+	k8s.io/apiextensions-apiserver v0.32.1 // indirect
 	k8s.io/client-go v0.32.1 // indirect
 	k8s.io/klog/v2 v2.130.1 // indirect
 	k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect