Skip to content

Commit 91134ff

Browse files
johannesfreyjohannesfrey
committed
chore: change to 0.20.0-beta.9 in e2e tests and cluster template
1 parent dd6b366 commit 91134ff

File tree

6 files changed

+66
-46
lines changed

6 files changed

+66
-46
lines changed

‎.github/workflows/e2e.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
sudo mv clusterctl /usr/local/bin/
6464
6565
#Install Kind
66-
curl -Lo ./kind https://kind.sigs.k8s.io/dl/v0.22.0/kind-linux-amd64
66+
curl -Lo ./kind https://kind.sigs.k8s.io/dl/v0.23.0/kind-linux-amd64
6767
chmod +x ./kind
6868
sudo mv ./kind /usr/local/bin/kind
6969
@@ -82,7 +82,7 @@ jobs:
8282
8383
- name: Create and Start Kind Cluster
8484
run: |
85-
kind create cluster
85+
kind create cluster --image=kindest/node:v1.28.9@sha256:dca54bc6a6079dd34699d53d7d4ffa2e853e46a20cd12d619a09207e35300bd0
8686
echo "=== cluster-info ==="
8787
kubectl cluster-info --context kind-kind
8888
@@ -113,7 +113,7 @@ jobs:
113113
run: |
114114
export CLUSTER_NAME=vcluster-k3s
115115
export CLUSTER_NAMESPACE=vcluster-k3s
116-
export CHART_VERSION=0.19.0
116+
export CHART_VERSION=0.20.0-beta.9
117117
export HELM_VALUES=$(cat ./test/e2e/k3s-values.yaml | sed -z 's/\n/\\n/g')
118118
kubectl create namespace ${CLUSTER_NAMESPACE}
119119
cat templates/cluster-template.yaml | ./bin/envsubst | kubectl apply -n ${CLUSTER_NAMESPACE} -f -
@@ -129,8 +129,8 @@ jobs:
129129
run: |
130130
export CLUSTER_NAME=vcluster-k0s
131131
export CLUSTER_NAMESPACE=vcluster-k0s
132-
export CHART_VERSION=0.19.0
133-
export CHART_NAME=vcluster-k0s
132+
export CHART_VERSION=0.20.0-beta.9
133+
export CHART_NAME=vcluster
134134
export HELM_VALUES=$(cat ./test/e2e/k0s-values.yaml | sed -z 's/\n/\\n/g')
135135
kubectl create namespace ${CLUSTER_NAMESPACE}
136136
cat templates/cluster-template.yaml | ./bin/envsubst | kubectl apply -n ${CLUSTER_NAMESPACE} -f -
@@ -146,8 +146,8 @@ jobs:
146146
run: |
147147
export CLUSTER_NAME=vcluster-k8s
148148
export CLUSTER_NAMESPACE=vcluster-k8s
149-
export CHART_VERSION=0.19.0
150-
export CHART_NAME=vcluster-k8s
149+
export CHART_VERSION=0.20.0-beta.9
150+
export CHART_NAME=vcluster
151151
export HELM_VALUES=$(cat ./test/e2e/k8s-values.yaml | sed -z 's/\n/\\n/g')
152152
kubectl create namespace ${CLUSTER_NAMESPACE}
153153
cat templates/cluster-template.yaml | ./bin/envsubst | kubectl apply -n ${CLUSTER_NAMESPACE} -f -
@@ -163,8 +163,8 @@ jobs:
163163
run: |
164164
export CLUSTER_NAME=vcluster-eks
165165
export CLUSTER_NAMESPACE=vcluster-eks
166-
export CHART_VERSION=0.19.0
167-
export CHART_NAME=vcluster-eks
166+
export CHART_VERSION=0.20.0-beta.9
167+
export CHART_NAME=vcluster
168168
export HELM_VALUES=$(cat ./test/e2e/eks-values.yaml | sed -z 's/\n/\\n/g')
169169
kubectl create namespace ${CLUSTER_NAMESPACE}
170170
cat templates/cluster-template.yaml | ./bin/envsubst | kubectl apply -n ${CLUSTER_NAMESPACE} -f -

‎templates/cluster-template.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ spec:
2222
chart:
2323
name: ${CHART_NAME:=vcluster}
2424
repo: ${CHART_REPO:=https://charts.loft.sh}
25-
version: ${CHART_VERSION:=0.19.5}
25+
version: ${CHART_VERSION:=0.20.0-beta.9}
2626
controlPlaneEndpoint:
2727
host: ${VCLUSTER_HOST:=""}
2828
port: ${VCLUSTER_PORT:=0}

‎test/e2e/eks-values.yaml

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,22 @@
1-
# EKS
2-
---
3-
service:
4-
type: NodePort
5-
api:
6-
image: public.ecr.aws/eks-distro/kubernetes/kube-apiserver:v1.28.2-eks-1-28-6
7-
controller:
8-
image: public.ecr.aws/eks-distro/kubernetes/kube-controller-manager:v1.28.2-eks-1-28-6
9-
etcd:
10-
image: public.ecr.aws/eks-distro/etcd-io/etcd:v3.5.9-eks-1-28-6
11-
coredns:
12-
image: public.ecr.aws/eks-distro/coredns/coredns:v1.10.1-eks-1-28-6
1+
controlPlane:
2+
backingStore:
3+
etcd:
4+
deploy:
5+
enabled: true
6+
statefulSet:
7+
image:
8+
registry: public.ecr.aws
9+
repository: eks-distro/etcd-io/etcd
10+
tag: v3.5.9-eks-1-28-6
11+
coredns:
12+
deployment:
13+
image: public.ecr.aws/eks-distro/coredns/coredns:v1.10.1-eks-1-28-6
14+
distro:
15+
eks:
16+
enabled: true
17+
service:
18+
spec:
19+
type: NodePort
20+
statefulSet:
21+
scheduling:
22+
podManagementPolicy: OrderedReady

‎test/e2e/k0s-values.yaml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1-
# K0S
2-
---
3-
service:
4-
type: NodePort
5-
vcluster:
6-
image: k0sproject/k0s:v1.29.1-k0s.0
1+
controlPlane:
2+
distro:
3+
k0s:
4+
enabled: true
5+
service:
6+
spec:
7+
type: NodePort
8+
statefulSet:
9+
scheduling:
10+
podManagementPolicy: OrderedReady

‎test/e2e/k3s-values.yaml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1-
# K3S
2-
---
3-
service:
4-
type: NodePort
5-
vcluster:
6-
image: rancher/k3s:v1.29.0-k3s1
1+
controlPlane:
2+
distro:
3+
k3s:
4+
enabled: true
5+
service:
6+
spec:
7+
type: NodePort
8+
statefulSet:
9+
scheduling:
10+
podManagementPolicy: OrderedReady

‎test/e2e/k8s-values.yaml

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
1-
# K8S
2-
---
3-
service:
4-
type: NodePort
5-
api:
6-
image: registry.k8s.io/kube-apiserver:v1.29.0
7-
scheduler:
8-
image: registry.k8s.io/kube-scheduler:v1.29.0
9-
controller:
10-
image: registry.k8s.io/kube-controller-manager:v1.29.0
11-
etcd:
12-
image: registry.k8s.io/etcd:3.5.10-0
1+
controlPlane:
2+
backingStore:
3+
etcd:
4+
deploy:
5+
enabled: true
6+
distro:
7+
k8s:
8+
enabled: true
9+
service:
10+
spec:
11+
type: NodePort
12+
statefulSet:
13+
scheduling:
14+
podManagementPolicy: OrderedReady

0 commit comments

Comments
 (0)