Skip to content
This repository was archived by the owner on Aug 12, 2025. It is now read-only.

Commit ed51d7b

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #398 from cprivitere/cprivitere/issue373
✨ Update kube-vip version and add e2e tests
2 parents e3d940d + 57b5600 commit ed51d7b

16 files changed

+281
-18
lines changed

‎Makefile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,7 @@ e2e-test-templates-v1alpha3: $(KUSTOMIZE) ## Generate cluster templates for v1al
209209
e2e-test-templates-v1beta1: $(KUSTOMIZE) ## Generate cluster templates for v1beta1
210210
mkdir -p $(TEST_TEMPLATES_TARGET_DIR)/v1beta1/
211211
$(KUSTOMIZE) build $(REPO_ROOT)/templates/experimental-crs-cni --load-restrictor LoadRestrictionsNone > $(TEST_TEMPLATES_TARGET_DIR)/v1beta1/cluster-template.yaml
212+
$(KUSTOMIZE) build $(REPO_ROOT)/templates/experimental-kube-vip-crs-cni --load-restrictor LoadRestrictionsNone > $(TEST_TEMPLATES_TARGET_DIR)/v1beta1/cluster-template-kube-vip.yaml
212213
$(KUSTOMIZE) build $(REPO_ROOT)/test/e2e/data/v1beta1/cluster-template-kcp-scale-in --load-restrictor LoadRestrictionsNone > $(TEST_TEMPLATES_TARGET_DIR)/v1beta1/cluster-template-kcp-scale-in.yaml
213214
$(KUSTOMIZE) build $(REPO_ROOT)/test/e2e/data/v1beta1/cluster-template-node-drain --load-restrictor LoadRestrictionsNone > $(TEST_TEMPLATES_TARGET_DIR)/v1beta1/cluster-template-node-drain.yaml
214215
$(KUSTOMIZE) build $(REPO_ROOT)/test/e2e/data/v1beta1/cluster-template-md-remediation --load-restrictor LoadRestrictionsNone > $(TEST_TEMPLATES_TARGET_DIR)/v1beta1/cluster-template-md-remediation.yaml
@@ -275,6 +276,7 @@ generate: ## Generate code
275276

276277
.PHONY: generate-templates
277278
generate-templates: $(KUSTOMIZE) ## Generate cluster templates
279+
$(KUSTOMIZE) build templates/experimental-kube-vip-crs-cni --load-restrictor LoadRestrictionsNone > templates/cluster-template-kube-vip-crs-cni.yaml
278280
$(KUSTOMIZE) build templates/experimental-kube-vip --load-restrictor LoadRestrictionsNone > templates/cluster-template-kube-vip.yaml
279281
$(KUSTOMIZE) build templates/experimental-crs-cni --load-restrictor LoadRestrictionsNone > templates/cluster-template-crs-cni.yaml
280282
$(KUSTOMIZE) build templates/addons/calico > templates/addons/calico.yaml

‎templates/cluster-template-crs-cni.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ spec:
146146
systemctl restart networking
147147
if [ -f "/run/kubeadm/kubeadm.yaml" ]; then
148148
export KUBECONFIG=/etc/kubernetes/admin.conf
149-
export CPEM_YAML=https://github.com/equinix/cloud-provider-equinix-metal/releases/download/v3.4.3/deployment.yaml
149+
export CPEM_YAML=https://github.com/equinix/cloud-provider-equinix-metal/releases/download/v3.5.0/deployment.yaml
150150
export SECRET_DATA='cloud-sa.json=''{"apiKey": "{{ .apiKey }}","projectID": "${PROJECT_ID}", "eipTag": "cluster-api-provider-packet:cluster-id:${CLUSTER_NAME}", "eipHealthCheckUseHostIP": true}'''
151151
kubectl create secret generic -n kube-system metal-cloud-config --from-literal="$${SECRET_DATA}" || (sleep 1 && kubectl create secret generic -n kube-system metal-cloud-config --from-literal="$${SECRET_DATA}") || (sleep 1 && kubectl create secret generic -n kube-system metal-cloud-config --from-literal="$${SECRET_DATA}")
152152
kubectl apply -f $${CPEM_YAML} || (sleep 1 && kubectl apply -f $${CPEM_YAML}) || (sleep 1 && kubectl apply -f $${CPEM_YAML})

‎templates/cluster-template-kube-vip-crs-cni.yaml‎

Lines changed: 231 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,231 @@
1+
apiVersion: v1
2+
data: ${CNI_RESOURCES}
3+
kind: ConfigMap
4+
metadata:
5+
name: ${CLUSTER_NAME}-crs-cni
6+
---
7+
apiVersion: addons.cluster.x-k8s.io/v1beta1
8+
kind: ClusterResourceSet
9+
metadata:
10+
name: ${CLUSTER_NAME}-crs-cni
11+
spec:
12+
clusterSelector:
13+
matchLabels:
14+
cni: ${CLUSTER_NAME}-crs-cni
15+
resources:
16+
- kind: ConfigMap
17+
name: ${CLUSTER_NAME}-crs-cni
18+
strategy: ApplyOnce
19+
---
20+
apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
21+
kind: KubeadmConfigTemplate
22+
metadata:
23+
name: ${CLUSTER_NAME}-worker-a
24+
spec:
25+
template:
26+
spec:
27+
joinConfiguration:
28+
nodeRegistration:
29+
kubeletExtraArgs:
30+
cloud-provider: external
31+
provider-id: equinixmetal://{{ `{{ v1.instance_id }}` }}
32+
preKubeadmCommands:
33+
- |-
34+
sed -ri '/\sswap\s/s/^#?/#/' /etc/fstab
35+
swapoff -a
36+
mount -a
37+
cat <<EOF > /etc/modules-load.d/containerd.conf
38+
overlay
39+
br_netfilter
40+
EOF
41+
modprobe overlay
42+
modprobe br_netfilter
43+
cat <<EOF > /etc/sysctl.d/99-kubernetes-cri.conf
44+
net.bridge.bridge-nf-call-iptables = 1
45+
net.ipv4.ip_forward = 1
46+
net.bridge.bridge-nf-call-ip6tables = 1
47+
EOF
48+
sysctl --system
49+
apt-get -y update
50+
DEBIAN_FRONTEND=noninteractive apt-get install -y apt-transport-https ca-certificates curl gnupg lsb-release linux-generic jq
51+
curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add -
52+
echo "deb https://apt.kubernetes.io/ kubernetes-xenial main" > /etc/apt/sources.list.d/kubernetes.list
53+
apt-get update -y
54+
TRIMMED_KUBERNETES_VERSION=$(echo {{ .kubernetesVersion }} | sed 's/\./\\\\./g' | sed 's/^v//')
55+
RESOLVED_KUBERNETES_VERSION=$(apt-cache madison kubelet | awk -v VERSION=$${TRIMMED_KUBERNETES_VERSION} '$3~ VERSION { print $3 }' | head -n1)
56+
DEBIAN_FRONTEND=noninteractive apt-get install -y containerd kubelet=$${RESOLVED_KUBERNETES_VERSION} kubeadm=$${RESOLVED_KUBERNETES_VERSION} kubectl=$${RESOLVED_KUBERNETES_VERSION}
57+
---
58+
apiVersion: cluster.x-k8s.io/v1beta1
59+
kind: Cluster
60+
metadata:
61+
labels:
62+
cni: ${CLUSTER_NAME}-crs-cni
63+
name: ${CLUSTER_NAME}
64+
spec:
65+
clusterNetwork:
66+
pods:
67+
cidrBlocks:
68+
- ${POD_CIDR:=192.168.0.0/16}
69+
services:
70+
cidrBlocks:
71+
- ${SERVICE_CIDR:=172.26.0.0/16}
72+
controlPlaneRef:
73+
apiVersion: controlplane.cluster.x-k8s.io/v1beta1
74+
kind: KubeadmControlPlane
75+
name: ${CLUSTER_NAME}-control-plane
76+
infrastructureRef:
77+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
78+
kind: PacketCluster
79+
name: ${CLUSTER_NAME}
80+
---
81+
apiVersion: cluster.x-k8s.io/v1beta1
82+
kind: MachineDeployment
83+
metadata:
84+
labels:
85+
cluster.x-k8s.io/cluster-name: ${CLUSTER_NAME}
86+
pool: worker-a
87+
name: ${CLUSTER_NAME}-worker-a
88+
spec:
89+
clusterName: ${CLUSTER_NAME}
90+
replicas: ${WORKER_MACHINE_COUNT}
91+
selector:
92+
matchLabels:
93+
cluster.x-k8s.io/cluster-name: ${CLUSTER_NAME}
94+
pool: worker-a
95+
template:
96+
metadata:
97+
labels:
98+
cluster.x-k8s.io/cluster-name: ${CLUSTER_NAME}
99+
pool: worker-a
100+
spec:
101+
bootstrap:
102+
configRef:
103+
apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
104+
kind: KubeadmConfigTemplate
105+
name: ${CLUSTER_NAME}-worker-a
106+
clusterName: ${CLUSTER_NAME}
107+
infrastructureRef:
108+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
109+
kind: PacketMachineTemplate
110+
name: ${CLUSTER_NAME}-worker-a
111+
version: ${KUBERNETES_VERSION}
112+
---
113+
apiVersion: controlplane.cluster.x-k8s.io/v1beta1
114+
kind: KubeadmControlPlane
115+
metadata:
116+
name: ${CLUSTER_NAME}-control-plane
117+
spec:
118+
kubeadmConfigSpec:
119+
clusterConfiguration:
120+
apiServer:
121+
extraArgs:
122+
cloud-provider: external
123+
controllerManager:
124+
extraArgs:
125+
cloud-provider: external
126+
initConfiguration:
127+
nodeRegistration:
128+
kubeletExtraArgs:
129+
cloud-provider: external
130+
provider-id: equinixmetal://{{ `{{ v1.instance_id }}` }}
131+
joinConfiguration:
132+
nodeRegistration:
133+
ignorePreflightErrors:
134+
- DirAvailable--etc-kubernetes-manifests
135+
kubeletExtraArgs:
136+
cloud-provider: external
137+
provider-id: equinixmetal://{{ `{{ v1.instance_id }}` }}
138+
postKubeadmCommands:
139+
- |-
140+
if [ -f "/run/kubeadm/kubeadm.yaml" ]; then
141+
export KUBECONFIG=/etc/kubernetes/admin.conf
142+
export CPEM_YAML=https://github.com/equinix/cloud-provider-equinix-metal/releases/download/v3.5.0/deployment.yaml
143+
export SECRET_DATA='cloud-sa.json=''{"apiKey": "{{ .apiKey }}","projectID": "${PROJECT_ID}", "loadbalancer": "kube-vip://", "facility": "${FACILITY}"}'''
144+
kubectl create secret generic -n kube-system metal-cloud-config --from-literal="$${SECRET_DATA}" || (sleep 1 && kubectl create secret generic -n kube-system metal-cloud-config --from-literal="$${SECRET_DATA}") || (sleep 1 && kubectl create secret generic -n kube-system metal-cloud-config --from-literal="$${SECRET_DATA}")
145+
kubectl apply -f $${CPEM_YAML} || (sleep 1 && kubectl apply -f $${CPEM_YAML}) || (sleep 1 && kubectl apply -f $${CPEM_YAML})
146+
fi
147+
preKubeadmCommands:
148+
- |
149+
sed -ri '/\sswap\s/s/^#?/#/' /etc/fstab
150+
swapoff -a
151+
mount -a
152+
cat <<EOF > /etc/modules-load.d/containerd.conf
153+
overlay
154+
br_netfilter
155+
EOF
156+
modprobe overlay
157+
modprobe br_netfilter
158+
cat <<EOF > /etc/sysctl.d/99-kubernetes-cri.conf
159+
net.bridge.bridge-nf-call-iptables = 1
160+
net.ipv4.ip_forward = 1
161+
net.bridge.bridge-nf-call-ip6tables = 1
162+
EOF
163+
sysctl --system
164+
apt-get -y update
165+
DEBIAN_FRONTEND=noninteractive apt-get install -y apt-transport-https ca-certificates curl gnupg lsb-release linux-generic jq
166+
curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add -
167+
echo "deb https://apt.kubernetes.io/ kubernetes-xenial main" > /etc/apt/sources.list.d/kubernetes.list
168+
apt-get update -y
169+
TRIMMED_KUBERNETES_VERSION=$(echo {{ .kubernetesVersion }} | sed 's/\./\\\\./g' | sed 's/^v//')
170+
RESOLVED_KUBERNETES_VERSION=$(apt-cache madison kubelet | awk -v VERSION=$${TRIMMED_KUBERNETES_VERSION} '$3~ VERSION { print $3 }' | head -n1)
171+
DEBIAN_FRONTEND=noninteractive apt-get install -y containerd kubelet=$${RESOLVED_KUBERNETES_VERSION} kubeadm=$${RESOLVED_KUBERNETES_VERSION} kubectl=$${RESOLVED_KUBERNETES_VERSION}
172+
curl -o /run/metadata.json -fsSL https://metadata.platformequinix.com/metadata
173+
for i in $(cat /run/metadata.json | jq -r '.bgp_neighbors[0].peer_ips[]'); do
174+
ip route add $i via $(cat /run/metadata.json | jq -r '.network.addresses[] | select(.public == false and .address_family == 4) | .gateway')
175+
done
176+
KVVERSION="${KUBE_VIP_VERSION:=v0.5.0}"
177+
ctr image pull ghcr.io/kube-vip/kube-vip:$${KVVERSION}
178+
ctr run --rm --net-host ghcr.io/kube-vip/kube-vip:$KVVERSION vip /kube-vip manifest pod \
179+
--interface "lo" \
180+
--vip "{{ .controlPlaneEndpoint }}" \
181+
--controlplane \
182+
--bgp \
183+
--peerAS $(cat /run/metadata.json | jq -r '.bgp_neighbors[0].peer_as') \
184+
--peerAddress $(cat /run/metadata.json | jq -r '.bgp_neighbors[0].peer_ips[0]') \
185+
--localAS $(cat /run/metadata.json | jq -r '.bgp_neighbors[0].customer_as') \
186+
--bgpRouterID $(cat /run/metadata.json | jq -r '.bgp_neighbors[0].customer_ip') > /etc/kubernetes/manifests/vip.yaml
187+
rm /run/metadata.json
188+
machineTemplate:
189+
infrastructureRef:
190+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
191+
kind: PacketMachineTemplate
192+
name: ${CLUSTER_NAME}-control-plane
193+
replicas: ${CONTROL_PLANE_MACHINE_COUNT}
194+
version: ${KUBERNETES_VERSION}
195+
---
196+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
197+
kind: PacketCluster
198+
metadata:
199+
name: ${CLUSTER_NAME}
200+
spec:
201+
facility: ${FACILITY}
202+
projectID: ${PROJECT_ID}
203+
vipManager: KUBE_VIP
204+
---
205+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
206+
kind: PacketMachineTemplate
207+
metadata:
208+
name: ${CLUSTER_NAME}-control-plane
209+
spec:
210+
template:
211+
spec:
212+
billingCycle: hourly
213+
machineType: ${CONTROLPLANE_NODE_TYPE}
214+
os: ${NODE_OS:=ubuntu_18_04}
215+
sshKeys:
216+
- ${SSH_KEY}
217+
tags: []
218+
---
219+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
220+
kind: PacketMachineTemplate
221+
metadata:
222+
name: ${CLUSTER_NAME}-worker-a
223+
spec:
224+
template:
225+
spec:
226+
billingCycle: hourly
227+
machineType: ${WORKER_NODE_TYPE}
228+
os: ${NODE_OS:=ubuntu_18_04}
229+
sshKeys:
230+
- ${SSH_KEY}
231+
tags: []

‎templates/cluster-template-kube-vip.yaml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@ spec:
3939
apiVersion: cluster.x-k8s.io/v1beta1
4040
kind: Cluster
4141
metadata:
42-
labels:
43-
cni: ${CLUSTER_NAME}-kube-vip
4442
name: ${CLUSTER_NAME}
4543
spec:
4644
clusterNetwork:
@@ -120,7 +118,7 @@ spec:
120118
- |-
121119
if [ -f "/run/kubeadm/kubeadm.yaml" ]; then
122120
export KUBECONFIG=/etc/kubernetes/admin.conf
123-
export CPEM_YAML=https://github.com/equinix/cloud-provider-equinix-metal/releases/download/v3.4.0/deployment.yaml
121+
export CPEM_YAML=https://github.com/equinix/cloud-provider-equinix-metal/releases/download/v3.5.0/deployment.yaml
124122
export SECRET_DATA='cloud-sa.json=''{"apiKey": "{{ .apiKey }}","projectID": "${PROJECT_ID}", "loadbalancer": "kube-vip://", "facility": "${FACILITY}"}'''
125123
kubectl create secret generic -n kube-system metal-cloud-config --from-literal="$${SECRET_DATA}" || (sleep 1 && kubectl create secret generic -n kube-system metal-cloud-config --from-literal="$${SECRET_DATA}") || (sleep 1 && kubectl create secret generic -n kube-system metal-cloud-config --from-literal="$${SECRET_DATA}")
126124
kubectl apply -f $${CPEM_YAML} || (sleep 1 && kubectl apply -f $${CPEM_YAML}) || (sleep 1 && kubectl apply -f $${CPEM_YAML})
@@ -154,7 +152,7 @@ spec:
154152
for i in $(cat /run/metadata.json | jq -r '.bgp_neighbors[0].peer_ips[]'); do
155153
ip route add $i via $(cat /run/metadata.json | jq -r '.network.addresses[] | select(.public == false and .address_family == 4) | .gateway')
156154
done
157-
KVVERSION="${KUBE_VIP_VERSION:=v0.4.2}"
155+
KVVERSION="${KUBE_VIP_VERSION:=v0.5.0}"
158156
ctr image pull ghcr.io/kube-vip/kube-vip:$${KVVERSION}
159157
ctr run --rm --net-host ghcr.io/kube-vip/kube-vip:$KVVERSION vip /kube-vip manifest pod \
160158
--interface "lo" \

‎templates/cluster-template.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ spec:
6767
systemctl restart networking
6868
if [ -f "/run/kubeadm/kubeadm.yaml" ]; then
6969
export KUBECONFIG=/etc/kubernetes/admin.conf
70-
export CPEM_YAML=https://github.com/equinix/cloud-provider-equinix-metal/releases/download/v3.4.3/deployment.yaml
70+
export CPEM_YAML=https://github.com/equinix/cloud-provider-equinix-metal/releases/download/v3.5.0/deployment.yaml
7171
export SECRET_DATA='cloud-sa.json=''{"apiKey": "{{ .apiKey }}","projectID": "${PROJECT_ID}", "eipTag": "cluster-api-provider-packet:cluster-id:${CLUSTER_NAME}", "eipHealthCheckUseHostIP": true}'''
7272
kubectl create secret generic -n kube-system metal-cloud-config --from-literal="$${SECRET_DATA}" || (sleep 1 && kubectl create secret generic -n kube-system metal-cloud-config --from-literal="$${SECRET_DATA}") || (sleep 1 && kubectl create secret generic -n kube-system metal-cloud-config --from-literal="$${SECRET_DATA}")
7373
kubectl apply -f $${CPEM_YAML} || (sleep 1 && kubectl apply -f $${CPEM_YAML}) || (sleep 1 && kubectl apply -f $${CPEM_YAML})

‎templates/experimental-kube-vip-crs-cni/kustomization.yaml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
3+
4+
resources:
5+
- ../experimental-kube-vip
6+
- ../bases/crs-cni.yaml
7+
patches:
8+
- patch: |-
9+
kind: Cluster
10+
apiVersion: cluster.x-k8s.io/v1beta1
11+
metadata:
12+
name: not-used
13+
labels:
14+
cni: "${CLUSTER_NAME}-crs-cni"
15+
target:
16+
kind: Cluster

‎templates/experimental-kube-vip/kustomization.yaml‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,6 @@ kind: Kustomization
44
resources:
55
- ../cluster-template.yaml
66
patches:
7-
- patch: |-
8-
kind: Cluster
9-
apiVersion: cluster.x-k8s.io/v1beta1
10-
metadata:
11-
name: not-used
12-
labels:
13-
cni: "${CLUSTER_NAME}-kube-vip"
14-
target:
15-
kind: Cluster
167
- patch: |-
178
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
189
kind: PacketCluster
@@ -56,7 +47,7 @@ patches:
5647
for i in $(cat /run/metadata.json | jq -r '.bgp_neighbors[0].peer_ips[]'); do
5748
ip route add $i via $(cat /run/metadata.json | jq -r '.network.addresses[] | select(.public == false and .address_family == 4) | .gateway')
5849
done
59-
KVVERSION="${KUBE_VIP_VERSION:=v0.4.2}"
50+
KVVERSION="${KUBE_VIP_VERSION:=v0.5.0}"
6051
ctr image pull ghcr.io/kube-vip/kube-vip:$${KVVERSION}
6152
ctr run --rm --net-host ghcr.io/kube-vip/kube-vip:$KVVERSION vip /kube-vip manifest pod \
6253
--interface "lo" \
@@ -72,7 +63,7 @@ patches:
7263
- |
7364
if [ -f "/run/kubeadm/kubeadm.yaml" ]; then
7465
export KUBECONFIG=/etc/kubernetes/admin.conf
75-
export CPEM_YAML=https://github.com/equinix/cloud-provider-equinix-metal/releases/download/v3.4.0/deployment.yaml
66+
export CPEM_YAML=https://github.com/equinix/cloud-provider-equinix-metal/releases/download/v3.5.0/deployment.yaml
7667
export SECRET_DATA='cloud-sa.json=''{"apiKey": "{{ .apiKey }}","projectID": "${PROJECT_ID}", "loadbalancer": "kube-vip://", "facility": "${FACILITY}"}'''
7768
kubectl create secret generic -n kube-system metal-cloud-config --from-literal="$${SECRET_DATA}" || (sleep 1 && kubectl create secret generic -n kube-system metal-cloud-config --from-literal="$${SECRET_DATA}") || (sleep 1 && kubectl create secret generic -n kube-system metal-cloud-config --from-literal="$${SECRET_DATA}")
7869
kubectl apply -f $${CPEM_YAML} || (sleep 1 && kubectl apply -f $${CPEM_YAML}) || (sleep 1 && kubectl apply -f $${CPEM_YAML})

‎test/e2e/capi_e2e_clusterctl_upgrade_test.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build e2e
12
// +build e2e
23

34
/*

‎test/e2e/capi_e2e_conformance_test.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build e2e
12
// +build e2e
23

34
/*

‎test/e2e/capi_e2e_quickstart_test.go‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build e2e
12
// +build e2e
23

34
/*
@@ -22,13 +23,14 @@ import (
2223
"context"
2324

2425
. "github.com/onsi/ginkgo"
26+
"k8s.io/utils/pointer"
2527
capi_e2e "sigs.k8s.io/cluster-api/test/e2e"
2628
)
2729

2830
var _ = Describe("[QuickStart] Running the Cluster API E2E QuickStart tests", func() {
2931
ctx := context.TODO()
3032

31-
Context("Running the quickstart spec", func() {
33+
Context("Running the [CPEM] quickstart spec", func() {
3234
capi_e2e.QuickStartSpec(ctx, func() capi_e2e.QuickStartSpecInput {
3335
return capi_e2e.QuickStartSpecInput{
3436
E2EConfig: e2eConfig,
@@ -39,4 +41,17 @@ var _ = Describe("[QuickStart] Running the Cluster API E2E QuickStart tests", fu
3941
}
4042
})
4143
})
44+
45+
Context("Running the [kube-vip] quickstart spec", func() {
46+
capi_e2e.QuickStartSpec(ctx, func() capi_e2e.QuickStartSpecInput {
47+
return capi_e2e.QuickStartSpecInput{
48+
E2EConfig: e2eConfig,
49+
ClusterctlConfigPath: clusterctlConfigPath,
50+
BootstrapClusterProxy: bootstrapClusterProxy,
51+
ArtifactFolder: artifactFolder,
52+
SkipCleanup: skipCleanup,
53+
Flavor: pointer.String("kube-vip"),
54+
}
55+
})
56+
})
4257
})

0 commit comments

Comments
 (0)