chore: change to 0.20.0-beta.7 in e2e tests and cluster template

loft-sh · Jun 19, 2024 · cccd2fb · cccd2fb
1 parent dd6b366
commit cccd2fb
Show file tree

Hide file tree

Showing 6 changed files with 66 additions and 46 deletions.
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
@@ -63,7 +63,7 @@ jobs:
           sudo mv clusterctl /usr/local/bin/
 
           #Install Kind
-          curl -Lo ./kind https://kind.sigs.k8s.io/dl/v0.22.0/kind-linux-amd64
+          curl -Lo ./kind https://kind.sigs.k8s.io/dl/v0.23.0/kind-linux-amd64
           chmod +x ./kind
           sudo mv ./kind /usr/local/bin/kind
 
@@ -82,7 +82,7 @@ jobs:
 
       - name: Create and Start Kind Cluster
         run: |
-          kind create cluster
+          kind create cluster --image=kindest/node:v1.28.9@sha256:dca54bc6a6079dd34699d53d7d4ffa2e853e46a20cd12d619a09207e35300bd0
           echo "=== cluster-info ==="
           kubectl cluster-info --context kind-kind
 
@@ -113,7 +113,7 @@ jobs:
         run: |
           export CLUSTER_NAME=vcluster-k3s
           export CLUSTER_NAMESPACE=vcluster-k3s
-          export CHART_VERSION=0.19.0
+          export CHART_VERSION=0.20.0-beta.9
           export HELM_VALUES=$(cat ./test/e2e/k3s-values.yaml | sed -z 's/\n/\\n/g')
           kubectl create namespace ${CLUSTER_NAMESPACE}
           cat templates/cluster-template.yaml | ./bin/envsubst | kubectl apply -n ${CLUSTER_NAMESPACE} -f -
@@ -129,8 +129,8 @@ jobs:
         run: |
           export CLUSTER_NAME=vcluster-k0s
           export CLUSTER_NAMESPACE=vcluster-k0s
-          export CHART_VERSION=0.19.0
-          export CHART_NAME=vcluster-k0s
+          export CHART_VERSION=0.20.0-beta.9
+          export CHART_NAME=vcluster
           export HELM_VALUES=$(cat ./test/e2e/k0s-values.yaml | sed -z 's/\n/\\n/g')
           kubectl create namespace ${CLUSTER_NAMESPACE}
           cat templates/cluster-template.yaml | ./bin/envsubst | kubectl apply -n ${CLUSTER_NAMESPACE} -f -
@@ -146,8 +146,8 @@ jobs:
         run: |
           export CLUSTER_NAME=vcluster-k8s
           export CLUSTER_NAMESPACE=vcluster-k8s
-          export CHART_VERSION=0.19.0
-          export CHART_NAME=vcluster-k8s
+          export CHART_VERSION=0.20.0-beta.9
+          export CHART_NAME=vcluster
           export HELM_VALUES=$(cat ./test/e2e/k8s-values.yaml | sed -z 's/\n/\\n/g')
           kubectl create namespace ${CLUSTER_NAMESPACE}
           cat templates/cluster-template.yaml | ./bin/envsubst | kubectl apply -n ${CLUSTER_NAMESPACE} -f -
@@ -163,8 +163,8 @@ jobs:
         run: |
           export CLUSTER_NAME=vcluster-eks
           export CLUSTER_NAMESPACE=vcluster-eks
-          export CHART_VERSION=0.19.0
-          export CHART_NAME=vcluster-eks
+          export CHART_VERSION=0.20.0-beta.9
+          export CHART_NAME=vcluster
           export HELM_VALUES=$(cat ./test/e2e/eks-values.yaml | sed -z 's/\n/\\n/g')
           kubectl create namespace ${CLUSTER_NAMESPACE}
           cat templates/cluster-template.yaml | ./bin/envsubst | kubectl apply -n ${CLUSTER_NAMESPACE} -f -

diff --git a/templates/cluster-template.yaml b/templates/cluster-template.yaml
@@ -22,7 +22,7 @@ spec:
     chart: 
       name: ${CHART_NAME:=vcluster}
       repo: ${CHART_REPO:=https://charts.loft.sh}
-      version: ${CHART_VERSION:=0.19.5}
+      version: ${CHART_VERSION:=0.20.0-beta.9}
   controlPlaneEndpoint:
     host: ${VCLUSTER_HOST:=""}
     port: ${VCLUSTER_PORT:=0}
diff --git a/test/e2e/eks-values.yaml b/test/e2e/eks-values.yaml
@@ -1,12 +1,22 @@
-# EKS
----
-service:
-  type: NodePort
-api:
-  image: public.ecr.aws/eks-distro/kubernetes/kube-apiserver:v1.28.2-eks-1-28-6
-controller:
-  image: public.ecr.aws/eks-distro/kubernetes/kube-controller-manager:v1.28.2-eks-1-28-6
-etcd:
-  image: public.ecr.aws/eks-distro/etcd-io/etcd:v3.5.9-eks-1-28-6
-coredns:
-  image: public.ecr.aws/eks-distro/coredns/coredns:v1.10.1-eks-1-28-6
+controlPlane:
+  backingStore:
+    etcd:
+      deploy:
+        enabled: true
+        statefulSet:
+          image:
+            registry: public.ecr.aws
+            repository: eks-distro/etcd-io/etcd
+            tag: v3.5.9-eks-1-28-6
+  coredns:
+    deployment:
+      image: public.ecr.aws/eks-distro/coredns/coredns:v1.10.1-eks-1-28-6
+  distro:
+    eks:
+      enabled: true
+  service:
+    spec:
+      type: NodePort
+  statefulSet:
+    scheduling:
+      podManagementPolicy: OrderedReady
diff --git a/test/e2e/k0s-values.yaml b/test/e2e/k0s-values.yaml
@@ -1,6 +1,10 @@
-# K0S
----
-service:
-  type: NodePort
-vcluster:
-  image: k0sproject/k0s:v1.29.1-k0s.0
+controlPlane:
+  distro:
+    k0s:
+      enabled: true
+  service:
+    spec:
+      type: NodePort
+  statefulSet:
+    scheduling:
+      podManagementPolicy: OrderedReady
diff --git a/test/e2e/k3s-values.yaml b/test/e2e/k3s-values.yaml
@@ -1,6 +1,10 @@
-# K3S
----
-service:
-  type: NodePort
-vcluster:
-  image: rancher/k3s:v1.29.0-k3s1
+controlPlane:
+  distro:
+    k3s:
+      enabled: true
+  service:
+    spec:
+      type: NodePort
+  statefulSet:
+    scheduling:
+      podManagementPolicy: OrderedReady
diff --git a/test/e2e/k8s-values.yaml b/test/e2e/k8s-values.yaml
@@ -1,12 +1,14 @@
-# K8S
----
-service:
-  type: NodePort
-api:
-  image: registry.k8s.io/kube-apiserver:v1.29.0
-scheduler:
-  image: registry.k8s.io/kube-scheduler:v1.29.0
-controller:
-  image: registry.k8s.io/kube-controller-manager:v1.29.0
-etcd:
-  image: registry.k8s.io/etcd:3.5.10-0
+controlPlane:
+  backingStore:
+    etcd:
+      deploy:
+        enabled: true
+  distro:
+    k8s:
+      enabled: true
+  service:
+    spec:
+      type: NodePort
+  statefulSet:
+    scheduling:
+      podManagementPolicy: OrderedReady