@@ -7,7 +7,7 @@ OVN_NB_POD=
7
7
OVN_SB_POD=
8
8
OVN_NORTHD_POD=
9
9
KUBE_OVN_VERSION=
10
- REGISTRY=" kubeovn"
10
+ REGISTRY=" docker.io/ kubeovn"
11
11
PERF_TIMES=5
12
12
PERF_LABEL=" PerfTest"
13
13
CONN_CHECK_LABEL=" conn-check"
@@ -36,7 +36,7 @@ showHelp(){
36
36
echo " tuning {install-fastpath|local-install-fastpath|remove-fastpath|install-stt|local-install-stt|remove-stt} {centos7|centos8}} [kernel-devel-version] deploy kernel optimisation components to the system"
37
37
echo " reload restart all kube-ovn components"
38
38
echo " log {kube-ovn|ovn|ovs|linux|all} save log to ./kubectl-ko-log/"
39
- echo " perf [image] performance test default image is kubeovn/test:v1.12 .0"
39
+ echo " perf [image] performance test default image is docker.io/ kubeovn/test:v1.13 .0"
40
40
}
41
41
42
42
# usage: ipv4_to_hex 192.168.0.1
@@ -509,8 +509,7 @@ applyConnServerDaemonset(){
509
509
fi
510
510
511
511
imageID=$( kubectl get ds -n $KUBE_OVN_NS kube-ovn-pinger -o jsonpath={.spec.template.spec.containers[0].image})
512
- tmpFileName=" conn-server.yaml"
513
- cat << EOF > $tmpFileName
512
+ cat << EOF | kubectl apply -f -
514
513
kind: DaemonSet
515
514
apiVersion: apps/v1
516
515
metadata:
@@ -544,8 +543,6 @@ spec:
544
543
fieldRef:
545
544
fieldPath: metadata.name
546
545
EOF
547
- kubectl apply -f $tmpFileName
548
- rm $tmpFileName
549
546
550
547
isfailed=true
551
548
for i in {0..59}
565
562
566
563
applyTestNodePortService () {
567
564
local svcName=" test-node-port"
568
- tmpFileName=" $svcName .yaml"
569
-
570
- cat << EOF > $tmpFileName
565
+ cat << EOF | kubectl apply -f -
571
566
apiVersion: v1
572
567
kind: Service
573
568
metadata:
@@ -585,12 +580,9 @@ spec:
585
580
selector:
586
581
app: kube-ovn-pinger
587
582
EOF
588
- kubectl apply -f $tmpFileName
589
- rm $tmpFileName
590
583
}
591
584
592
585
getTestNodePortServiceIPPorts () {
593
-
594
586
targetIPPorts=" "
595
587
nodeIPs=($( kubectl get node -o wide | grep -v " INTERNAL-IP" | awk ' {print $6}' ) )
596
588
nodePort=$( kubectl get svc test-node-port -n $KUBE_OVN_NS -o ' jsonpath={.spec.ports[0].nodePort}' )
@@ -1253,9 +1245,7 @@ applyTestServer() {
1253
1245
podName=" test-server"
1254
1246
nodeID=$1
1255
1247
imageID=$2
1256
- tmpFileName=" $podName .yaml"
1257
-
1258
- cat << EOF > $tmpFileName
1248
+ cat << EOF | kubectl apply -f -
1259
1249
apiVersion: v1
1260
1250
kind: Pod
1261
1251
metadata:
@@ -1277,18 +1267,13 @@ spec:
1277
1267
nodeSelector:
1278
1268
kubernetes.io/hostname: $nodeID
1279
1269
EOF
1280
-
1281
- kubectl apply -f $tmpFileName
1282
- rm $tmpFileName
1283
1270
}
1284
1271
1285
1272
applyTestHostServer () {
1286
1273
podName=" test-host-server"
1287
1274
nodeID=$1
1288
1275
imageID=$2
1289
- tmpFileName=" $podName .yaml"
1290
-
1291
- cat << EOF > $tmpFileName
1276
+ cat << EOF | kubectl apply -f -
1292
1277
apiVersion: v1
1293
1278
kind: Pod
1294
1279
metadata:
@@ -1310,19 +1295,13 @@ spec:
1310
1295
nodeSelector:
1311
1296
kubernetes.io/hostname: $nodeID
1312
1297
EOF
1313
-
1314
- kubectl apply -f $tmpFileName
1315
- rm $tmpFileName
1316
1298
}
1317
1299
1318
-
1319
1300
applyTestClient () {
1320
1301
local podName=" test-client"
1321
1302
local nodeID=$1
1322
1303
local imageID=$2
1323
- tmpFileName=" $podName .yaml"
1324
-
1325
- cat << EOF > $tmpFileName
1304
+ cat << EOF | kubectl apply -f -
1326
1305
apiVersion: v1
1327
1306
kind: Pod
1328
1307
metadata:
@@ -1339,17 +1318,13 @@ spec:
1339
1318
nodeSelector:
1340
1319
kubernetes.io/hostname: $nodeID
1341
1320
EOF
1342
- kubectl apply -f $tmpFileName
1343
- rm $tmpFileName
1344
1321
}
1345
1322
1346
1323
applyTestHostClient () {
1347
1324
local podName=" test-host-client"
1348
1325
local nodeID=$1
1349
1326
local imageID=$2
1350
- tmpFileName=" $podName .yaml"
1351
-
1352
- cat << EOF > $tmpFileName
1327
+ cat << EOF | kubectl apply -f -
1353
1328
apiVersion: v1
1354
1329
kind: Pod
1355
1330
metadata:
@@ -1367,15 +1342,11 @@ spec:
1367
1342
nodeSelector:
1368
1343
kubernetes.io/hostname: $nodeID
1369
1344
EOF
1370
- kubectl apply -f $tmpFileName
1371
- rm $tmpFileName
1372
1345
}
1373
1346
1374
1347
applyTestServerService () {
1375
1348
local svcName=" test-server"
1376
- tmpFileName=" $svcName .yaml"
1377
-
1378
- cat << EOF > $tmpFileName
1349
+ cat << EOF | kubectl apply -f -
1379
1350
apiVersion: v1
1380
1351
kind: Service
1381
1352
metadata:
@@ -1404,8 +1375,6 @@ spec:
1404
1375
selector:
1405
1376
env: server
1406
1377
EOF
1407
- kubectl apply -f $tmpFileName
1408
- rm $tmpFileName
1409
1378
}
1410
1379
1411
1380
addHeaderDecoration () {
@@ -1456,7 +1425,7 @@ quitPerfTest() {
1456
1425
1457
1426
perf (){
1458
1427
addHeaderDecoration " Prepareing Performance Test Resources"
1459
- imageID=${1:- " kubeovn/test:v1.12 .0" }
1428
+ imageID=${1:- " docker.io/ kubeovn/test:v1.13 .0" }
1460
1429
1461
1430
nodes=($( kubectl get node --no-headers -o custom-columns=NAME:.metadata.name) )
1462
1431
if [[ ${# nodes} -eq 1 ]]; then
@@ -1601,7 +1570,7 @@ genMulticastPerfResult() {
1601
1570
tmpFileName=" multicast-$serverName .log"
1602
1571
PERF_GC_COMMAND+=(" rm -f $tmpFileName " )
1603
1572
LAST_PERF_FAILED_LOG=$tmpFileName
1604
-
1573
+
1605
1574
start_server_cmd=" iperf -s -B 224.0.0.100 -i 1 -u"
1606
1575
kubectl exec $serverName -n $KUBE_OVN_NS -- $start_server_cmd > $tmpFileName &
1607
1576
sleep 1
@@ -1627,7 +1596,6 @@ checkLeaderRecover() {
1627
1596
sleep 5
1628
1597
getOvnCentralPod
1629
1598
getPodRecoverTime " northd"
1630
-
1631
1599
}
1632
1600
1633
1601
getPodRecoverTime (){
@@ -1663,25 +1631,27 @@ fi
1663
1631
1664
1632
subcommand=" $1 " ; shift
1665
1633
1666
- getOvnCentralPod
1667
-
1668
1634
case $subcommand in
1669
1635
nbctl)
1636
+ getOvnCentralPod
1670
1637
kubectl exec " $OVN_NB_POD " -n $KUBE_OVN_NS -c ovn-central -- ovn-nbctl " $@ "
1671
1638
;;
1672
1639
sbctl)
1640
+ getOvnCentralPod
1673
1641
kubectl exec " $OVN_SB_POD " -n $KUBE_OVN_NS -c ovn-central -- ovn-sbctl " $@ "
1674
1642
;;
1675
1643
vsctl|ofctl|dpctl|appctl)
1676
1644
xxctl " $subcommand " " $@ "
1677
1645
;;
1678
1646
nb|sb)
1647
+ getOvnCentralPod
1679
1648
dbtool " $subcommand " " $@ "
1680
1649
;;
1681
1650
tcpdump)
1682
1651
tcpdump " $@ "
1683
1652
;;
1684
1653
trace)
1654
+ getOvnCentralPod
1685
1655
trace " $@ "
1686
1656
;;
1687
1657
diagnose)
@@ -1700,6 +1670,7 @@ case $subcommand in
1700
1670
log " $@ "
1701
1671
;;
1702
1672
perf)
1673
+ getOvnCentralPod
1703
1674
perf " $@ "
1704
1675
;;
1705
1676
* )
0 commit comments