refactor: rename embeddedSqlite to embedded

chart/templates/_backingstore.tpl

@@ -9,15 +9,15 @@
 {{- if .Values.controlPlane.backingStore.etcd.deploy.enabled -}}
 {{- $backingStores = add1 $backingStores -}}
 {{- end -}}
-{{- if .Values.controlPlane.backingStore.database.embeddedSqlite.enabled -}}
+{{- if .Values.controlPlane.backingStore.database.embedded.enabled -}}
 {{- $backingStores = add1 $backingStores -}}
 {{- end -}}
 {{- if .Values.controlPlane.backingStore.database.external.enabled -}}
 {{- $backingStores = add1 $backingStores -}}
 {{- end -}}
 {{- if gt $backingStores 1 -}}
 {{- fail "you can only enable one backingStore at the same time" -}}
-{{- else if or (eq $backingStores 0) .Values.controlPlane.backingStore.database.embeddedSqlite.enabled -}}
+{{- else if or (eq $backingStores 0) .Values.controlPlane.backingStore.database.embedded.enabled -}}
 {{- true -}}
 {{- end -}}
 {{- end -}}

chart/tests/headless-service_test.yaml

@@ -86,7 +86,7 @@ tests:
       controlPlane:
         backingStore:
           database:
-            embeddedSqlite:
+            embedded:
               enabled: true
     asserts:
       - hasDocuments:

chart/tests/statefulset_test.yaml

@@ -133,7 +133,7 @@ tests:
             enabled: true
         backingStore:
           database:
-            embeddedSqlite:
+            embedded:
               enabled: true
     asserts:
       - equal:

chart/values.schema.json

@@ -601,7 +601,7 @@
     },
     "Database": {
       "properties": {
-        "embeddedSqlite": {
+        "embedded": {
           "$ref": "#/$defs/DatabaseKine",
           "description": "Embedded defines that an embedded database (sqlite) should be used as the backend for the virtual cluster"
         },

chart/values.yaml

@@ -170,7 +170,7 @@ controlPlane:
 
   backingStore:
     database:
-      embeddedSqlite:
+      embedded:
         enabled: false
         # Optional sqlite dataSource
         # dataSource: ""

config/config.go

@@ -634,7 +634,7 @@ type BackingStore struct {
 
 type Database struct {
 	// Embedded defines that an embedded database (sqlite) should be used as the backend for the virtual cluster
-	Embedded DatabaseKine `json:"embeddedSqlite,omitempty"`
+	Embedded DatabaseKine `json:"embedded,omitempty"`
 
 	// External defines that an external database should be used as the backend for the virtual cluster
 	External DatabaseKine `json:"external,omitempty"`

config/values.yaml

@@ -170,7 +170,7 @@ controlPlane:
 
   backingStore:
     database:
-      embeddedSqlite:
+      embedded:
         enabled: false
         # Optional sqlite dataSource
         # dataSource: ""

pkg/k0s/k0s.go

@@ -76,11 +76,11 @@ spec:
     type: kine
     kine:
       dataSource: {{ .Values.controlPlane.backingStore.database.external.dataSource }}
-  {{- else if .Values.controlPlane.backingStore.database.embeddedSqlite.dataSource }}
+  {{- else if .Values.controlPlane.backingStore.database.embedded.dataSource }}
   storage:
     type: kine
     kine:
-      dataSource: {{ .Values.controlPlane.backingStore.database.embeddedSqlite.dataSource }}
+      dataSource: {{ .Values.controlPlane.backingStore.database.embedded.dataSource }}
   {{- end }}`
 
 func StartK0S(ctx context.Context, cancel context.CancelFunc, vConfig *config.VirtualClusterConfig) error {

test/e2e/k8sdefaultendpoint/k8sdefaultendpoint.go

@@ -1,11 +1,15 @@
 package k8sdefaultendpoint
 
 import (
+	"context"
+	"fmt"
 	"reflect"
+	"time"
 
 	"github.com/loft-sh/vcluster/test/framework"
 	"github.com/onsi/ginkgo/v2"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/util/wait"
 )
 
 var _ = ginkgo.Describe("map default/kubernetes endpoint to physical vcluster endpoint", func() {
@@ -21,40 +25,49 @@ var _ = ginkgo.Describe("map default/kubernetes endpoint to physical vcluster en
 	ginkgo.It("Test default/kubernetes endpoints matches with vcluster service endpoint", func() {
 		ctx := f.Context
 
-		hostClusterEndpoint, err := f.HostClient.CoreV1().Endpoints(f.VclusterNamespace).Get(ctx, "vcluster", v1.GetOptions{})
-		framework.ExpectNoError(err)
+		waitErr := wait.PollUntilContextTimeout(ctx, time.Millisecond*500, framework.PollTimeout*2, true, func(ctx context.Context) (done bool, err error) {
+			hostClusterEndpoint, err := f.HostClient.CoreV1().Endpoints(f.VclusterNamespace).Get(ctx, "vcluster", v1.GetOptions{})
+			if err != nil {
+				return false, err
+			}
 
-		vclusterEndpoint, err := f.VclusterClient.CoreV1().Endpoints("default").Get(ctx, "kubernetes", v1.GetOptions{})
-		framework.ExpectNoError(err)
+			vclusterEndpoint, err := f.VclusterClient.CoreV1().Endpoints("default").Get(ctx, "kubernetes", v1.GetOptions{})
+			if err != nil {
+				return false, err
+			}
 
-		hostClusterIps := make([]string, 0)
-		hostClusterPorts := make([]int32, 0)
-		vClusterIps := make([]string, 0)
-		vClusterPorts := make([]int32, 0)
+			hostClusterIps := make([]string, 0)
+			hostClusterPorts := make([]int32, 0)
+			vClusterIps := make([]string, 0)
+			vClusterPorts := make([]int32, 0)
 
-		for _, address := range hostClusterEndpoint.Subsets[0].Addresses {
-			hostClusterIps = append(hostClusterIps, address.IP)
-		}
+			for _, address := range hostClusterEndpoint.Subsets[0].Addresses {
+				hostClusterIps = append(hostClusterIps, address.IP)
+			}
 
-		for _, port := range hostClusterEndpoint.Subsets[0].Ports {
-			if port.Name == "kubelet" {
-				continue
+			for _, port := range hostClusterEndpoint.Subsets[0].Ports {
+				if port.Name == "kubelet" {
+					continue
+				}
+				hostClusterPorts = append(hostClusterPorts, port.Port)
 			}
-			hostClusterPorts = append(hostClusterPorts, port.Port)
-		}
 
-		for _, address := range vclusterEndpoint.Subsets[0].Addresses {
-			vClusterIps = append(vClusterIps, address.IP)
-		}
+			for _, address := range vclusterEndpoint.Subsets[0].Addresses {
+				vClusterIps = append(vClusterIps, address.IP)
+			}
 
-		for _, port := range vclusterEndpoint.Subsets[0].Ports {
-			vClusterPorts = append(vClusterPorts, port.Port)
-		}
+			for _, port := range vclusterEndpoint.Subsets[0].Ports {
+				vClusterPorts = append(vClusterPorts, port.Port)
+			}
 
-		ok := reflect.DeepEqual(hostClusterIps, vClusterIps)
-		framework.ExpectEqual(ok, true)
-		ok = reflect.DeepEqual(hostClusterPorts, vClusterPorts)
-		framework.ExpectEqual(ok, true)
+			if !reflect.DeepEqual(hostClusterIps, vClusterIps) || !reflect.DeepEqual(hostClusterPorts, vClusterPorts) {
+				fmt.Println("IPs", hostClusterIps, vClusterIps)
+				fmt.Println("Ports", hostClusterPorts, vClusterPorts)
+				return false, nil
+			}
 
+			return true, nil
+		})
+		framework.ExpectNoError(waitErr, "error after waiting")
 	})
 })

test/e2e/manifests/chart.go

@@ -2,6 +2,7 @@ package manifests
 
 import (
 	"context"
+	"fmt"
 	"time"
 
 	"github.com/loft-sh/vcluster/pkg/controllers/deploy"
@@ -36,7 +37,7 @@ var _ = ginkgo.Describe("Helm charts (regular and OCI) are synced and applied as
 	)
 
 	ginkgo.It("Test if configmap for both charts gets applied", func() {
-		err := wait.PollUntilContextTimeout(f.Context, time.Millisecond*500, framework.PollTimeout, true, func(ctx context.Context) (bool, error) {
+		err := wait.PollUntilContextTimeout(f.Context, time.Millisecond*500, framework.PollTimeout*2, true, func(ctx context.Context) (bool, error) {
 			cm, err := f.VclusterClient.CoreV1().ConfigMaps(deploy.VClusterDeployConfigMapNamespace).
 				Get(ctx, deploy.VClusterDeployConfigMap, metav1.GetOptions{})
 			if err != nil {
@@ -50,6 +51,7 @@ var _ = ginkgo.Describe("Helm charts (regular and OCI) are synced and applied as
 			status := deploy.ParseStatus(cm)
 			for _, chart := range status.Charts {
 				if chart.Phase != string(deploy.StatusSuccess) {
+					fmt.Println(chart.Name, chart.Phase, chart.Reason, chart.Message)
 					return false, nil
 				}
 			}

test/e2e/servicesync/servicesync.go

@@ -331,6 +331,10 @@ func checkEndpointsSync(ctx context.Context, fromClient kubernetes.Interface, fr
 
 		_, err = fromClient.AppsV1().Deployments(fromNamespace).Update(ctx, deployment, metav1.UpdateOptions{})
 		if err != nil {
+			if kerrors.IsConflict(err) {
+				return false, nil
+			}
+
 			return false, err
 		}