Skip to content

Commit 1cade3e

Browse files
author
Rahul Sharma
committed
fix failing e2e tests
1 parent a3dc684 commit 1cade3e

17 files changed

Lines changed: 397 additions & 60 deletions

File tree

‎cloud/linode/cloud_test.go‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,19 @@ func TestNewCloud(t *testing.T) {
8080
assert.Equal(t, "tt", Options.VPCNames, "expected vpcnames to be set to vpcname")
8181
})
8282

83+
t.Run("should fail if both nodeBalancerBackendIPv4SubnetID and nodeBalancerBackendIPv4SubnetName are set", func(t *testing.T) {
84+
Options.VPCNames = "tt"
85+
Options.NodeBalancerBackendIPv4SubnetID = 12345
86+
Options.NodeBalancerBackendIPv4SubnetName = "test-subnet"
87+
defer func() {
88+
Options.VPCNames = ""
89+
Options.NodeBalancerBackendIPv4SubnetID = 0
90+
Options.NodeBalancerBackendIPv4SubnetName = ""
91+
}()
92+
_, err := newCloud()
93+
assert.Error(t, err, "expected error when both nodeBalancerBackendIPv4SubnetID and nodeBalancerBackendIPv4SubnetName are set")
94+
})
95+
8396
t.Run("should fail if incorrect loadbalancertype is set", func(t *testing.T) {
8497
rtEnabled := Options.EnableRouteController
8598
Options.EnableRouteController = false

‎cloud/linode/vpc_test.go‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,3 +224,42 @@ func TestGetSubnetID(t *testing.T) {
224224
}
225225
})
226226
}
227+
228+
func Test_getNodeBalancerBackendIPv4SubnetID(t *testing.T) {
229+
t.Run("Subnet not found", func(t *testing.T) {
230+
ctrl := gomock.NewController(t)
231+
defer ctrl.Finish()
232+
client := mocks.NewMockClient(ctrl)
233+
currVPCNames := Options.VPCNames
234+
defer func() { Options.VPCNames = currVPCNames }()
235+
Options.VPCNames = "vpc-test1,vpc-test2,vpc-test3"
236+
vpcIDs = map[string]int{"vpc-test1": 1, "vpc-test2": 2, "vpc-test3": 3}
237+
subnetIDs = map[string]int{"test1": 1, "test2": 2, "test3": 3}
238+
client.EXPECT().ListVPCSubnets(gomock.Any(), gomock.Any(), gomock.Any()).Times(1).Return([]linodego.VPCSubnet{}, errors.New("error"))
239+
subnetID := getNodeBalancerBackendIPv4SubnetID(client)
240+
if subnetID != 0 {
241+
t.Errorf("getNodeBalancerBackendIPv4SubnetID() = %v, want %v", subnetID, 0)
242+
}
243+
})
244+
245+
t.Run("Subnet found", func(t *testing.T) {
246+
ctrl := gomock.NewController(t)
247+
defer ctrl.Finish()
248+
client := mocks.NewMockClient(ctrl)
249+
currVPCNames := Options.VPCNames
250+
currNodeBalancerBackendIPv4SubnetName := Options.NodeBalancerBackendIPv4SubnetName
251+
defer func() {
252+
Options.VPCNames = currVPCNames
253+
Options.NodeBalancerBackendIPv4SubnetName = currNodeBalancerBackendIPv4SubnetName
254+
}()
255+
Options.VPCNames = "vpc-test1,vpc-test2,vpc-test3"
256+
Options.NodeBalancerBackendIPv4SubnetName = "test4"
257+
vpcIDs = map[string]int{"vpc-test1": 1, "vpc-test2": 2, "vpc-test3": 3}
258+
subnetIDs = map[string]int{"test1": 1, "test2": 2, "test3": 3}
259+
client.EXPECT().ListVPCSubnets(gomock.Any(), gomock.Any(), gomock.Any()).Times(1).Return([]linodego.VPCSubnet{{ID: 4, Label: "test4"}}, nil)
260+
subnetID := getNodeBalancerBackendIPv4SubnetID(client)
261+
if subnetID == 0 {
262+
t.Errorf("getNodeBalancerBackendIPv4SubnetID() = %v, want %v", subnetID, 0)
263+
}
264+
})
265+
}

‎e2e/test/lb-created-with-new-nb-id/chainsaw-test.yaml‎

Lines changed: 67 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,24 @@ metadata:
99
spec:
1010
namespace: "lb-created-with-new-nb-id"
1111
steps:
12+
- name: Create dummy service
13+
try:
14+
- apply:
15+
file: dummy-service.yaml
16+
catch:
17+
- describe:
18+
apiVersion: v1
19+
kind: Service
20+
- name: Check that loadbalancer ip is assigned
21+
try:
22+
- assert:
23+
resource:
24+
apiVersion: v1
25+
kind: Service
26+
metadata:
27+
name: svc-dummy
28+
status:
29+
(loadBalancer.ingress[0].ip != null): true
1230
- name: Create nodebalancer and create resources
1331
try:
1432
- script:
@@ -21,12 +39,28 @@ spec:
2139
re='^[0-9]+$'
2240
LABEL="ccm-$(head /dev/urandom | tr -dc 'a-z0-9' | head -c 5)"
2341
42+
# Get existing dummy nodebalancer id to get VPC config
43+
dummy_nbid=$(KUBECONFIG=$KUBECONFIG NAMESPACE=$NAMESPACE LINODE_TOKEN=$LINODE_TOKEN ../scripts/get-nb-id.sh svc-dummy)
44+
45+
# Get VPC config if it exists
46+
vpcconfig=$(curl -s \
47+
-H "Authorization: Bearer $LINODE_TOKEN" \
48+
-H "Content-Type: application/json" \
49+
"https://api.linode.com/v4beta/nodebalancers/$dummy_nbid/vpcs")
50+
51+
SUBNET_ID=$(echo $vpcconfig | jq -r ".data[] | select(.nodebalancer_id == $dummy_nbid) | .subnet_id")
52+
53+
data="{\"label\": \"$LABEL\", \"region\": \"$REGION\", \"vpcs\": [{\"subnet_id\": $SUBNET_ID}]}"
54+
if [[ -z $SUBNET_ID ]]; then
55+
data="{\"label\": \"$LABEL\", \"region\": \"$REGION\"}"
56+
fi
57+
2458
nbid=$(curl -s --request POST \
2559
-H "Authorization: Bearer $LINODE_TOKEN" \
2660
-H "Content-Type: application/json" \
2761
-H "accept: application/json" \
28-
"https://api.linode.com/v4/nodebalancers" \
29-
--data "{\"label\": \"$LABEL\", \"region\": \"$REGION\"}" | jq .id)
62+
"https://api.linode.com/v4beta/nodebalancers" \
63+
--data "$data" | jq .id)
3064
3165
if ! [[ $nbid =~ $re ]]; then
3266
echo "Nodebalancer id [$nbid] is incorrect, failed to create nodebalancer"
@@ -82,30 +116,46 @@ spec:
82116
83117
LABEL="ccm-$(head /dev/urandom | tr -dc 'a-z0-9' | head -c 5)"
84118
119+
# Get VPC config if it exists
120+
vpcconfig=$(curl -s \
121+
-H "Authorization: Bearer $LINODE_TOKEN" \
122+
-H "Content-Type: application/json" \
123+
"https://api.linode.com/v4beta/nodebalancers/$old_nbid/vpcs")
124+
125+
echo "Old Nodebalancer ID: $old_nbid"
126+
echo "VPC config: $vpcconfig"
127+
128+
SUBNET_ID=$(echo $vpcconfig | jq -r ".data[] | select(.nodebalancer_id == $old_nbid) | .subnet_id")
129+
echo "Subnet ID: $SUBNET_ID"
130+
131+
data="{\"label\": \"$LABEL\", \"region\": \"$REGION\", \"vpcs\": [{\"subnet_id\": $SUBNET_ID}]}"
132+
if [[ -z $SUBNET_ID ]]; then
133+
data="{\"label\": \"$LABEL\", \"region\": \"$REGION\"}"
134+
fi
135+
85136
nbid=$(curl -s --request POST \
86137
-H "Authorization: Bearer $LINODE_TOKEN" \
87138
-H "Content-Type: application/json" \
88139
-H "accept: application/json" \
89-
"https://api.linode.com/v4/nodebalancers" \
90-
--data "{\"label\": \"$LABEL\", \"region\": \"$REGION\"}" | jq .id)
140+
"https://api.linode.com/v4beta/nodebalancers" \
141+
--data "$data" | jq .id)
91142
92143
if ! [[ $nbid =~ $re ]]; then
93144
echo "Nodebalancer id [$nbid] is incorrect, failed to create nodebalancer"
94-
exit 1
145+
else
146+
kubectl annotate --overwrite svc svc-test -n $NAMESPACE service.beta.kubernetes.io/linode-loadbalancer-nodebalancer-id=$nbid
147+
148+
for i in {1..10}; do
149+
nbid2=$(KUBECONFIG=$KUBECONFIG NAMESPACE=$NAMESPACE LINODE_TOKEN=$LINODE_TOKEN ../scripts/get-nb-id.sh)
150+
151+
if [[ $nbid == $nbid2 ]]; then
152+
echo "Condition met"
153+
break
154+
fi
155+
sleep 5
156+
done
95157
fi
96158
97-
kubectl annotate --overwrite svc svc-test -n $NAMESPACE service.beta.kubernetes.io/linode-loadbalancer-nodebalancer-id=$nbid
98-
99-
for i in {1..10}; do
100-
nbid2=$(KUBECONFIG=$KUBECONFIG NAMESPACE=$NAMESPACE LINODE_TOKEN=$LINODE_TOKEN ../scripts/get-nb-id.sh)
101-
102-
if [[ $nbid == $nbid2 ]]; then
103-
echo "Condition met"
104-
break
105-
fi
106-
sleep 5
107-
done
108-
109159
old_nb_resp=$(curl --write-out "%{http_code}\n" \
110160
--silent --output /dev/null \
111161
-H "Authorization: Bearer $LINODE_TOKEN" \

‎e2e/test/lb-created-with-new-nb-id/dummy-service.yaml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
---
2+
apiVersion: v1
3+
kind: Service
4+
metadata:
5+
name: svc-dummy
6+
spec:
7+
type: LoadBalancer
8+
ports:
9+
- name: http-1
10+
protocol: TCP
11+
port: 80
12+
targetPort: 8080
13+
sessionAffinity: None

‎e2e/test/lb-created-with-specified-nb-id/chainsaw-test.yaml‎

Lines changed: 36 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,24 @@ metadata:
99
spec:
1010
namespace: "lb-created-with-specified-nb-id"
1111
steps:
12+
- name: Create dummy service
13+
try:
14+
- apply:
15+
file: dummy-service.yaml
16+
catch:
17+
- describe:
18+
apiVersion: v1
19+
kind: Service
20+
- name: Check that loadbalancer ip is assigned
21+
try:
22+
- assert:
23+
resource:
24+
apiVersion: v1
25+
kind: Service
26+
metadata:
27+
name: svc-dummy
28+
status:
29+
(loadBalancer.ingress[0].ip != null): true
1230
- name: Create nodebalancer and create resources
1331
try:
1432
- script:
@@ -21,12 +39,28 @@ spec:
2139
re='^[0-9]+$'
2240
LABEL="ccm-$(head /dev/urandom | tr -dc 'a-z0-9' | head -c 5)"
2341
42+
# Get existing dummy nodebalancer id to get VPC config
43+
dummy_nbid=$(KUBECONFIG=$KUBECONFIG NAMESPACE=$NAMESPACE LINODE_TOKEN=$LINODE_TOKEN ../scripts/get-nb-id.sh svc-dummy)
44+
45+
# Get VPC config if it exists
46+
vpcconfig=$(curl -s \
47+
-H "Authorization: Bearer $LINODE_TOKEN" \
48+
-H "Content-Type: application/json" \
49+
"https://api.linode.com/v4beta/nodebalancers/$dummy_nbid/vpcs")
50+
51+
SUBNET_ID=$(echo $vpcconfig | jq -r ".data[] | select(.nodebalancer_id == $dummy_nbid) | .subnet_id")
52+
53+
data="{\"label\": \"$LABEL\", \"region\": \"$REGION\", \"vpcs\": [{\"subnet_id\": $SUBNET_ID}]}"
54+
if [[ -z $SUBNET_ID ]]; then
55+
data="{\"label\": \"$LABEL\", \"region\": \"$REGION\"}"
56+
fi
57+
2458
nbid=$(curl -s --request POST \
2559
-H "Authorization: Bearer $LINODE_TOKEN" \
2660
-H "Content-Type: application/json" \
2761
-H "accept: application/json" \
28-
"https://api.linode.com/v4/nodebalancers" \
29-
--data "{\"label\": \"$LABEL\", \"region\": \"$REGION\"}" | jq .id)
62+
"https://api.linode.com/v4beta/nodebalancers" \
63+
--data "$data" | jq .id)
3064
3165
if ! [[ $nbid =~ $re ]]; then
3266
echo "Nodebalancer id [$nbid] is incorrect, failed to create nodebalancer"

‎e2e/test/lb-created-with-specified-nb-id/dummy-service.yaml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
---
2+
apiVersion: v1
3+
kind: Service
4+
metadata:
5+
name: svc-dummy
6+
spec:
7+
type: LoadBalancer
8+
ports:
9+
- name: http-1
10+
protocol: TCP
11+
port: 80
12+
targetPort: 8080
13+
sessionAffinity: None

‎e2e/test/lb-delete-svc-no-nb/chainsaw-test.yaml‎

Lines changed: 38 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,24 @@ metadata:
99
spec:
1010
namespace: "lb-delete-svc-no-nb"
1111
steps:
12+
- name: Create dummy service
13+
try:
14+
- apply:
15+
file: dummy-service.yaml
16+
catch:
17+
- describe:
18+
apiVersion: v1
19+
kind: Service
20+
- name: Check that loadbalancer ip is assigned
21+
try:
22+
- assert:
23+
resource:
24+
apiVersion: v1
25+
kind: Service
26+
metadata:
27+
name: svc-dummy
28+
status:
29+
(loadBalancer.ingress[0].ip != null): true
1230
- name: Create nodebalancer and create resources
1331
try:
1432
- script:
@@ -21,12 +39,28 @@ spec:
2139
re='^[0-9]+$'
2240
LABEL="ccm-$(head /dev/urandom | tr -dc 'a-z0-9' | head -c 5)"
2341
42+
# Get existing dummy nodebalancer id to get VPC config
43+
dummy_nbid=$(KUBECONFIG=$KUBECONFIG NAMESPACE=$NAMESPACE LINODE_TOKEN=$LINODE_TOKEN ../scripts/get-nb-id.sh svc-dummy)
44+
45+
# Get VPC config if it exists
46+
vpcconfig=$(curl -s \
47+
-H "Authorization: Bearer $LINODE_TOKEN" \
48+
-H "Content-Type: application/json" \
49+
"https://api.linode.com/v4beta/nodebalancers/$dummy_nbid/vpcs")
50+
51+
SUBNET_ID=$(echo $vpcconfig | jq -r ".data[] | select(.nodebalancer_id == $dummy_nbid) | .subnet_id")
52+
53+
data="{\"label\": \"$LABEL\", \"region\": \"$REGION\", \"vpcs\": [{\"subnet_id\": $SUBNET_ID}]}"
54+
if [[ -z $SUBNET_ID ]]; then
55+
data="{\"label\": \"$LABEL\", \"region\": \"$REGION\"}"
56+
fi
57+
2458
nbid=$(curl -s --request POST \
2559
-H "Authorization: Bearer $LINODE_TOKEN" \
2660
-H "Content-Type: application/json" \
2761
-H "accept: application/json" \
28-
"https://api.linode.com/v4/nodebalancers" \
29-
--data "{\"label\": \"$LABEL\", \"region\": \"$REGION\"}" | jq .id)
62+
"https://api.linode.com/v4beta/nodebalancers" \
63+
--data "$data" | jq .id)
3064
3165
if ! [[ $nbid =~ $re ]]; then
3266
echo "Nodebalancer id [$nbid] is incorrect, failed to create nodebalancer"
@@ -93,6 +127,8 @@ spec:
93127
94128
if [[ $delete_resp == "200" ]]; then
95129
echo "nodebalancer deleted"
130+
else
131+
echo "Failed to delete nodebalancer, response code: $delete_resp"
96132
fi
97133
98134
# Check to make sure nodebalancer is deleted

‎e2e/test/lb-delete-svc-no-nb/dummy-service.yaml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
---
2+
apiVersion: v1
3+
kind: Service
4+
metadata:
5+
name: svc-dummy
6+
spec:
7+
type: LoadBalancer
8+
ports:
9+
- name: http-1
10+
protocol: TCP
11+
port: 80
12+
targetPort: 8080
13+
sessionAffinity: None

0 commit comments

Comments
 (0)