Skip to content

Commit 0559ea3

Browse files
author
Rahul Sharma
committed
use var and also increase timeout for certain steps
1 parent 43adf9a commit 0559ea3

File tree

29 files changed

+77
-69
lines changed

29 files changed

+77
-69
lines changed

‎e2e/bgp-test/lb-cilium-bgp/chainsaw-test.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,14 @@ spec:
6565
6666
delete_nanode() {
6767
local NANODE_RESPONSE=$(curl -s -H "Authorization: Bearer $LINODE_TOKEN" \
68-
"https://api.linode.com/v4/linode/instances")
68+
"$LINODE_URL/v4/linode/instances")
6969
7070
local NANODE_ID=$(echo "$NANODE_RESPONSE" | \
7171
jq -r --arg cluster "$CLUSTER_NAME" '.data[] | select(.label | endswith($cluster)) | .id')
7272
7373
if [ -n "$NANODE_ID" ]; then
7474
curl -s -X DELETE -H "Authorization: Bearer $LINODE_TOKEN" \
75-
"https://api.linode.com/v4/linode/instances/$NANODE_ID" || true
75+
"$LINODE_URL/v4/linode/instances/$NANODE_ID" || true
7676
fi
7777
}
7878
@@ -94,7 +94,7 @@ spec:
9494
echo "Node ID: $NODE_ID"
9595
9696
NODE_IP_RESPONSE=$(curl -s -H "Authorization: Bearer $LINODE_TOKEN" \
97-
"https://api.linode.com/v4/linode/instances/$NODE_ID/ips")
97+
"$LINODE_URL/v4/linode/instances/$NODE_ID/ips")
9898
9999
SHARED_IPS=$(echo "$NODE_IP_RESPONSE" | jq -r '.ipv4.shared[]?.address // empty')
100100
echo "shared IPs: $SHARED_IPS"
@@ -108,7 +108,7 @@ spec:
108108
109109
# Check if the nanode has the shared IP
110110
NANODE_RESPONSE=$(curl -s -H "Authorization: Bearer $LINODE_TOKEN" \
111-
"https://api.linode.com/v4/linode/instances")
111+
"$LINODE_URL/v4/linode/instances")
112112
113113
NANODE_ID=$(echo "$NANODE_RESPONSE" | \
114114
jq -r --arg cluster "$CLUSTER_NAME" '.data[] | select(.label | endswith($cluster)) | .id')
@@ -119,7 +119,7 @@ spec:
119119
fi
120120
121121
NANODE_IP_RESPONSE=$(curl -s -H "Authorization: Bearer $LINODE_TOKEN" \
122-
"https://api.linode.com/v4/linode/instances/$NANODE_ID/ips")
122+
"$LINODE_URL/v4/linode/instances/$NANODE_ID/ips")
123123
124124
NANODE_IPS=$(echo "$NANODE_IP_RESPONSE" | jq -r '.ipv4.public[]?.address // empty')
125125

‎e2e/subnet-test/chainsaw-test.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ spec:
4545
# Get interface details for this config
4646
interfaces=$(curl -s \
4747
-H "Authorization: Bearer $LINODE_TOKEN" \
48-
"https://api.linode.com/v4/linode/instances/$instance_id/configs" \
48+
"$LINODE_URL/v4/linode/instances/$instance_id/configs" \
4949
| jq -r '.data[0].interfaces')
5050
5151
# Check if pod CIDR is in the VPC interface IP ranges

‎e2e/test/fw-use-specified-nb/chainsaw-test.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ spec:
2525
-H "Authorization: Bearer $LINODE_TOKEN" \
2626
-H "Content-Type: application/json" \
2727
-H "accept: application/json" \
28-
"https://api.linode.com/v4/networking/firewalls" \
28+
"$LINODE_URL/v4/networking/firewalls" \
2929
--data "
3030
{
3131
\"label\": \"$FWLABEL\",
@@ -86,7 +86,7 @@ spec:
8686
-H "Authorization: Bearer $LINODE_TOKEN" \
8787
-H "Content-Type: application/json" \
8888
-H "X-Filter: {\"label\": \"$FWLABEL\"}" \
89-
"https://api.linode.com/v4/networking/firewalls" | jq .data[].id)
89+
"$LINODE_URL/v4/networking/firewalls" | jq .data[].id)
9090
9191
if ! [[ $fwid =~ $re ]]; then
9292
echo "Firewall id [$fwid] is incorrect, failed to fetch firewall"
@@ -102,7 +102,7 @@ spec:
102102
fwconfig=$(curl -s \
103103
-H "Authorization: Bearer $LINODE_TOKEN" \
104104
-H "Content-Type: application/json" \
105-
"https://api.linode.com/v4/networking/firewalls/$fwid" || true)
105+
"$LINODE_URL/v4/networking/firewalls/$fwid" || true)
106106
107107
fw_attached_to_nb=$(echo $fwconfig | jq ".entities[] | select(.id == $nbid) | .id == $nbid")
108108
@@ -117,7 +117,7 @@ spec:
117117
curl -s -X DELETE \
118118
-H "Authorization: Bearer $LINODE_TOKEN" \
119119
-H "Content-Type: application/json" \
120-
"https://api.linode.com/v4/networking/firewalls/$fwid"
120+
"$LINODE_URL/v4/networking/firewalls/$fwid"
121121
check:
122122
($error == null): true
123123
(contains($stdout, 'Conditions met')): true

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ spec:
4646
vpcconfig=$(curl -s \
4747
-H "Authorization: Bearer $LINODE_TOKEN" \
4848
-H "Content-Type: application/json" \
49-
"https://api.linode.com/v4beta/nodebalancers/$dummy_nbid/vpcs")
49+
"$LINODE_URL/v4beta/nodebalancers/$dummy_nbid/vpcs")
5050
5151
SUBNET_ID=$(echo $vpcconfig | jq -r ".data[] | select(.nodebalancer_id == $dummy_nbid) | .subnet_id")
5252
@@ -59,7 +59,7 @@ spec:
5959
-H "Authorization: Bearer $LINODE_TOKEN" \
6060
-H "Content-Type: application/json" \
6161
-H "accept: application/json" \
62-
"https://api.linode.com/v4beta/nodebalancers" \
62+
"$LINODE_URL/v4beta/nodebalancers" \
6363
--data "$data" | jq .id)
6464
6565
if ! [[ $nbid =~ $re ]]; then
@@ -120,7 +120,7 @@ spec:
120120
vpcconfig=$(curl -s \
121121
-H "Authorization: Bearer $LINODE_TOKEN" \
122122
-H "Content-Type: application/json" \
123-
"https://api.linode.com/v4beta/nodebalancers/$old_nbid/vpcs")
123+
"$LINODE_URL/v4beta/nodebalancers/$old_nbid/vpcs")
124124
125125
echo "Old Nodebalancer ID: $old_nbid"
126126
echo "VPC config: $vpcconfig"
@@ -137,7 +137,7 @@ spec:
137137
-H "Authorization: Bearer $LINODE_TOKEN" \
138138
-H "Content-Type: application/json" \
139139
-H "accept: application/json" \
140-
"https://api.linode.com/v4beta/nodebalancers" \
140+
"$LINODE_URL/v4beta/nodebalancers" \
141141
--data "$data" | jq .id)
142142
143143
if ! [[ $nbid =~ $re ]]; then
@@ -159,7 +159,7 @@ spec:
159159
old_nb_resp=$(curl --write-out "%{http_code}\n" \
160160
--silent --output /dev/null \
161161
-H "Authorization: Bearer $LINODE_TOKEN" \
162-
"https://api.linode.com/v4/nodebalancers/$old_nbid")
162+
"$LINODE_URL/v4/nodebalancers/$old_nbid")
163163
164164
if [[ $old_nb_resp == "404" ]]; then
165165
echo "old nodebalancer not found"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ spec:
4646
vpcconfig=$(curl -s \
4747
-H "Authorization: Bearer $LINODE_TOKEN" \
4848
-H "Content-Type: application/json" \
49-
"https://api.linode.com/v4beta/nodebalancers/$dummy_nbid/vpcs")
49+
"$LINODE_URL/v4beta/nodebalancers/$dummy_nbid/vpcs")
5050
5151
SUBNET_ID=$(echo $vpcconfig | jq -r ".data[] | select(.nodebalancer_id == $dummy_nbid) | .subnet_id")
5252
@@ -59,7 +59,7 @@ spec:
5959
-H "Authorization: Bearer $LINODE_TOKEN" \
6060
-H "Content-Type: application/json" \
6161
-H "accept: application/json" \
62-
"https://api.linode.com/v4beta/nodebalancers" \
62+
"$LINODE_URL/v4beta/nodebalancers" \
6363
--data "$data" | jq .id)
6464
6565
if ! [[ $nbid =~ $re ]]; then

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ spec:
4646
vpcconfig=$(curl -s \
4747
-H "Authorization: Bearer $LINODE_TOKEN" \
4848
-H "Content-Type: application/json" \
49-
"https://api.linode.com/v4beta/nodebalancers/$dummy_nbid/vpcs")
49+
"$LINODE_URL/v4beta/nodebalancers/$dummy_nbid/vpcs")
5050
5151
SUBNET_ID=$(echo $vpcconfig | jq -r ".data[] | select(.nodebalancer_id == $dummy_nbid) | .subnet_id")
5252
@@ -59,7 +59,7 @@ spec:
5959
-H "Authorization: Bearer $LINODE_TOKEN" \
6060
-H "Content-Type: application/json" \
6161
-H "accept: application/json" \
62-
"https://api.linode.com/v4beta/nodebalancers" \
62+
"$LINODE_URL/v4beta/nodebalancers" \
6363
--data "$data" | jq .id)
6464
6565
if ! [[ $nbid =~ $re ]]; then
@@ -123,7 +123,7 @@ spec:
123123
--silent --output /dev/null \
124124
-X DELETE \
125125
-H "Authorization: Bearer $LINODE_TOKEN" \
126-
"https://api.linode.com/v4/nodebalancers/$nbid")
126+
"$LINODE_URL/v4/nodebalancers/$nbid")
127127
128128
if [[ $delete_resp == "200" ]]; then
129129
echo "nodebalancer deleted"
@@ -135,7 +135,7 @@ spec:
135135
old_nb_resp=$(curl --write-out "%{http_code}\n" \
136136
--silent --output /dev/null \
137137
-H "Authorization: Bearer $LINODE_TOKEN" \
138-
"https://api.linode.com/v4/nodebalancers/$nbid")
138+
"$LINODE_URL/v4/nodebalancers/$nbid")
139139
140140
if [[ $old_nb_resp == "404" ]]; then
141141
echo "old nodebalancer not found"

‎e2e/test/lb-delete-svc-use-new-nbid/chainsaw-test.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ spec:
4646
vpcconfig=$(curl -s \
4747
-H "Authorization: Bearer $LINODE_TOKEN" \
4848
-H "Content-Type: application/json" \
49-
"https://api.linode.com/v4beta/nodebalancers/$dummy_nbid/vpcs")
49+
"$LINODE_URL/v4beta/nodebalancers/$dummy_nbid/vpcs")
5050
5151
SUBNET_ID=$(echo $vpcconfig | jq -r ".data[] | select(.nodebalancer_id == $dummy_nbid) | .subnet_id")
5252
@@ -59,7 +59,7 @@ spec:
5959
-H "Authorization: Bearer $LINODE_TOKEN" \
6060
-H "Content-Type: application/json" \
6161
-H "accept: application/json" \
62-
"https://api.linode.com/v4beta/nodebalancers" \
62+
"$LINODE_URL/v4beta/nodebalancers" \
6363
--data "$data" | jq .id)
6464
6565
if ! [[ $nbid =~ $re ]]; then
@@ -120,7 +120,7 @@ spec:
120120
vpcconfig=$(curl -s \
121121
-H "Authorization: Bearer $LINODE_TOKEN" \
122122
-H "Content-Type: application/json" \
123-
"https://api.linode.com/v4beta/nodebalancers/$old_nbid/vpcs")
123+
"$LINODE_URL/v4beta/nodebalancers/$old_nbid/vpcs")
124124
125125
echo "Old Nodebalancer ID: $old_nbid"
126126
echo "VPC config: $vpcconfig"
@@ -137,7 +137,7 @@ spec:
137137
-H "Authorization: Bearer $LINODE_TOKEN" \
138138
-H "Content-Type: application/json" \
139139
-H "accept: application/json" \
140-
"https://api.linode.com/v4beta/nodebalancers" \
140+
"$LINODE_URL/v4beta/nodebalancers" \
141141
--data "$data" | jq .id)
142142
143143
if ! [[ $nbid =~ $re ]]; then
@@ -160,7 +160,7 @@ spec:
160160
old_nb_resp=$(curl --write-out "%{http_code}\n" \
161161
--silent --output /dev/null \
162162
-H "Authorization: Bearer $LINODE_TOKEN" \
163-
"https://api.linode.com/v4/nodebalancers/$old_nbid")
163+
"$LINODE_URL/v4/nodebalancers/$old_nbid")
164164
165165
if [[ $old_nb_resp == "404" ]]; then
166166
echo "old nodebalancer not found"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ spec:
4646
vpcconfig=$(curl -s \
4747
-H "Authorization: Bearer $LINODE_TOKEN" \
4848
-H "Content-Type: application/json" \
49-
"https://api.linode.com/v4beta/nodebalancers/$dummy_nbid/vpcs")
49+
"$LINODE_URL/v4beta/nodebalancers/$dummy_nbid/vpcs")
5050
5151
SUBNET_ID=$(echo $vpcconfig | jq -r ".data[] | select(.nodebalancer_id == $dummy_nbid) | .subnet_id")
5252
@@ -59,7 +59,7 @@ spec:
5959
-H "Authorization: Bearer $LINODE_TOKEN" \
6060
-H "Content-Type: application/json" \
6161
-H "accept: application/json" \
62-
"https://api.linode.com/v4beta/nodebalancers" \
62+
"$LINODE_URL/v4beta/nodebalancers" \
6363
--data "$data" | jq .id)
6464
6565
if ! [[ $nbid =~ $re ]]; then

‎e2e/test/lb-fw-delete-acl/chainsaw-test.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ spec:
4343
-H "Authorization: Bearer $LINODE_TOKEN" \
4444
-H "Content-Type: application/json" \
4545
-H "accept: application/json" \
46-
"https://api.linode.com/v4/nodebalancers/${nbid}/firewalls" || true)
46+
"$LINODE_URL/v4/nodebalancers/${nbid}/firewalls" || true)
4747
4848
fwCount=$(echo $fw | jq '.data | length')
4949
ips=$(echo $fw | jq '.data[].rules.inbound[].addresses.ipv4[]')
@@ -69,7 +69,7 @@ spec:
6969
-H "Authorization: Bearer $LINODE_TOKEN" \
7070
-H "Content-Type: application/json" \
7171
-H "accept: application/json" \
72-
"https://api.linode.com/v4/nodebalancers/${nbid}/firewalls" || true)
72+
"$LINODE_URL/v4/nodebalancers/${nbid}/firewalls" || true)
7373
7474
fwid=$(echo $fw | jq -r '.data[].id')
7575
@@ -82,7 +82,7 @@ spec:
8282
-H "Authorization: Bearer $LINODE_TOKEN" \
8383
-H "Content-Type: application/json" \
8484
-H "accept: application/json" \
85-
"https://api.linode.com/v4/nodebalancers/${nbid}/firewalls" || true)
85+
"$LINODE_URL/v4/nodebalancers/${nbid}/firewalls" || true)
8686
8787
fwCount=$(echo $fw | jq -r '.data | length')
8888
@@ -91,7 +91,7 @@ spec:
9191
--request GET \
9292
-H "Authorization: Bearer $LINODE_TOKEN" \
9393
-H "accept: application/json" \
94-
"https://api.linode.com/v4/networking/firewalls/${fwid}" || true)
94+
"$LINODE_URL/v4/networking/firewalls/${fwid}" || true)
9595
9696
if [[ $fwCount -eq 0 && $fwRespCode -eq "404" ]]; then
9797
echo "firewall detatched and deleted"
@@ -126,7 +126,7 @@ spec:
126126
-H "Authorization: Bearer $LINODE_TOKEN" \
127127
-H "Content-Type: application/json" \
128128
-H "accept: application/json" \
129-
"https://api.linode.com/v4/nodebalancers/${nbid}/firewalls" || true)
129+
"$LINODE_URL/v4/nodebalancers/${nbid}/firewalls" || true)
130130
131131
fwid=$(echo $fw | jq -r '.data[].id')
132132
@@ -151,14 +151,14 @@ spec:
151151
--request GET \
152152
-H "Authorization: Bearer $LINODE_TOKEN" \
153153
-H "accept: application/json" \
154-
"https://api.linode.com/v4/nodebalancers/${nbid}" || true)
154+
"$LINODE_URL/v4/nodebalancers/${nbid}" || true)
155155
156156
# Check if firewall is deleted
157157
fwRespCode=$(curl -s -o /dev/null -w "%{http_code}" \
158158
--request GET \
159159
-H "Authorization: Bearer $LINODE_TOKEN" \
160160
-H "accept: application/json" \
161-
"https://api.linode.com/v4/networking/firewalls/${fwid}" || true)
161+
"$LINODE_URL/v4/networking/firewalls/${fwid}" || true)
162162
163163
if [[ $nbRespCode == "404" && $fwRespCode == "404" ]]; then
164164
echo "nb and fw deleted"

‎e2e/test/lb-fw-update-acl/chainsaw-test.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ spec:
4343
-H "Authorization: Bearer $LINODE_TOKEN" \
4444
-H "Content-Type: application/json" \
4545
-H "accept: application/json" \
46-
"https://api.linode.com/v4/nodebalancers/${nbid}/firewalls" || true)
46+
"$LINODE_URL/v4/nodebalancers/${nbid}/firewalls" || true)
4747
4848
fwCount=$(echo $fw | jq '.data | length')
4949
ips=$(echo $fw | jq '.data[].rules.inbound[].addresses.ipv4[]')
@@ -77,7 +77,7 @@ spec:
7777
-H "Authorization: Bearer $LINODE_TOKEN" \
7878
-H "Content-Type: application/json" \
7979
-H "accept: application/json" \
80-
"https://api.linode.com/v4/nodebalancers/${nbid}/firewalls" || true)
80+
"$LINODE_URL/v4/nodebalancers/${nbid}/firewalls" || true)
8181
8282
fwCount=$(echo $fw | jq -r '.data | length')
8383
ips=$(echo $fw | jq -r '.data[].rules.inbound[].addresses.ipv4[]')

0 commit comments

Comments
 (0)