From c152f0a7dd49b5573a5e058dd29510721b1fed1a Mon Sep 17 00:00:00 2001 From: Trekkie <111065900+TrekkieCoder@users.noreply.github.com> Date: Fri, 21 Jun 2024 00:03:54 +0900 Subject: [PATCH 1/3] Update k3s-calico-ubuntu-22.yml --- .github/workflows/k3s-calico-ubuntu-22.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/k3s-calico-ubuntu-22.yml b/.github/workflows/k3s-calico-ubuntu-22.yml index bd39ca7f3..069af6203 100644 --- a/.github/workflows/k3s-calico-ubuntu-22.yml +++ b/.github/workflows/k3s-calico-ubuntu-22.yml @@ -23,10 +23,10 @@ jobs: - run: curl -sfL https://get.k3s.io | INSTALL_K3S_VERSION=v1.22.9+k3s1 INSTALL_K3S_EXEC="server --disable traefik --disable servicelb --disable-cloud-controller --kubelet-arg cloud-provider=external --flannel-backend=none --cluster-cidr=10.42.0.0/16" K3S_KUBECONFIG_MODE="644" sh - - run: | sleep 10 - kubectl "${{ env.KUBECONFIG }}" create -f https://raw.githubusercontent.com/projectcalico/calico/v3.26.0/manifests/tigera-operator.yaml + kubectl "${{ env.KUBECONFIG }}" create -f https://raw.githubusercontent.com/projectcalico/calico/v3.26.1/manifests/tigera-operator.yaml - run: | sleep 10 - kubectl "${{ env.KUBECONFIG }}" create -f https://raw.githubusercontent.com/projectcalico/calico/v3.26.0/manifests/custom-resources.yaml + kubectl "${{ env.KUBECONFIG }}" create -f https://raw.githubusercontent.com/projectcalico/calico/v3.26.1/manifests/custom-resources.yaml - run: | sleep 10 kubectl "${{ env.KUBECONFIG }}" taint nodes --all node.cloudprovider.kubernetes.io/uninitialized=false:NoSchedule- From 64bea00c18d679284889af52264ee3354e0cfbe5 Mon Sep 17 00:00:00 2001 From: Trekkie Coder Date: Fri, 21 Jun 2024 14:19:34 +0900 Subject: [PATCH 2/3] cicd : updated calico version --- cicd/k8s-calico-ubuntu22/yaml/settings.yaml | 2 +- cicd/k8s-calico/yaml/settings.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cicd/k8s-calico-ubuntu22/yaml/settings.yaml b/cicd/k8s-calico-ubuntu22/yaml/settings.yaml index 393756990..244cf5fb1 100644 --- a/cicd/k8s-calico-ubuntu22/yaml/settings.yaml +++ b/cicd/k8s-calico-ubuntu22/yaml/settings.yaml @@ -37,7 +37,7 @@ software: cluster: box: bento/ubuntu-22.04 version: 202401.31.0 - calico: 3.26.0 + calico: 3.26.1 # To skip the dashboard installation, set its version to an empty value or comment it out: kubernetes: 1.29.2 os: xUbuntu_22.04 diff --git a/cicd/k8s-calico/yaml/settings.yaml b/cicd/k8s-calico/yaml/settings.yaml index b24cbda3d..97af7bdff 100644 --- a/cicd/k8s-calico/yaml/settings.yaml +++ b/cicd/k8s-calico/yaml/settings.yaml @@ -39,7 +39,7 @@ software: cluster: box: bento/ubuntu-22.04 version: 202401.31.0 - calico: 3.26.0 + calico: 3.26.1 # To skip the dashboard installation, set its version to an empty value or comment it out: kubernetes: 1.29.2 os: xUbuntu_22.04 From 20253278fbf9557db6a9a9f59992b1a12901a2f6 Mon Sep 17 00:00:00 2001 From: Trekkie Coder Date: Fri, 21 Jun 2024 23:18:15 +0900 Subject: [PATCH 3/3] cicd : updated sctp_client for sctp-tests --- cicd/common/sctp_socat_client | Bin 17256 -> 17256 bytes cicd/common/sctp_socat_client.c | 13 +++++-------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/cicd/common/sctp_socat_client b/cicd/common/sctp_socat_client index 399c0bd26aa1dc783fb64cc5d5721e6c98cec8e4..07ea00a40c9deebedd5ac97ba84e2883aa0f1d28 100755 GIT binary patch delta 2012 zcmZuyZ){Ul6u0QYp-zaFsAN$S<%3B@q8on{81s4Veecm2d`Zte=l*{8 z+;i?Zy*ImyW_Qu9OhLv;_?L0+`5_=S<{MTc6w_tUP0Pi8!I(+GPAXNjRvA`n?SIEn zYS^PRIY0x{-(>QdOrACNn%;Urv^AHubgXi#`&OMk{M&uUu0FV;{`IdiXW%7U3n=z- zS_@}w68!*r@+3Ng>k^j{E;n$ga@oY?FlR31`jcF`xtz}B2t)Ux+d^jAH)FUJ@R3jo zqxKbf&#rswd64sC1r19UFRX741;Pa0n>!0WwO85*5#Zf???VC+2<1OQTt>2_bmPX! zgxJV_wAtL&X&Xi4lO7YdvNn&Hq}&Fu27-?H)CQX!lE=arlC3jvR)hk0$05-o=yNns z0VW*H)B#U8B`U&JXEU9W{N8!D1AJoaW7l6)d?1eyB{BIM8|cMn9=8*s4IaCu>x$NQ z7>5=mo;RZseJa|bE5VeKR(<2T&bC6eGN;z$)VZdbR=-3CoSN7d8;9zWsmpRKXHIqH z)bgBq(OjHX$4%{osxu8YK4;FrP)T+BDKyv#4!nZmGuBMUS*K*jCUjj>Gl(j2mF1#z zrd&!KGf8LnaqK&sT%T51>;lP=oF-{GCxsF19As3|=8mgODf%RZJ}AP!+xy#bFS1@! zL&#GS3Fa)$cO76sDcaXamAEH%9G!#wP}=Uv9=eW1g5W#^743wQsNG&jNI!FzJ%ZqI zmP+3RmiJCgXzyvRnl4h>(xMI9dFi}=Ify6n<$e|7w zVeAzw_PF60BYKRxy2D6_ExIY8Z7ixp-zZ`c13b$18X(wA=-?>MYwAxtUna?pZ+8wd zKD78jDDlQCEz0at-hyrR>?Q<;KVKgx^0HzR zaYoSF`T)Tw&$@#WR!X$^2+>cZ5 zwmvkM*YD$t_{{BLA;sK?~2ivR4iDRCyTyZ|Ksa2=S%_`mFO*Sc8*k0iRCFKcqRG_&)9bSi{iW+ePqgDTI5dp z2gniWt_GZRk!i#gGg;=a(j*U?SL=iTZ$*~UH=rjXc@D811kX*2KIBp0gAtMF&k)3j z#*=HKQCiF%f>_LY1ww&2$^COr(&V;zTWIpv`G+XI0H?8R2WoE>JIpe7z))>;x>a;* ztTDr5y+NUD!R-YjCLg0HBWbP=Yj@G*THaIwP-b+0yOqFY?oc&lxsw*vRHdL c>b~*vnlCKAxUb1OD83Y8eU!cma{bJI0efPhsQ>@~ delta 2127 zcmZ`)eQZ-z6u-A0Yu^~GUAMgsg>@(bN?TUC70_+%ChShfmlGsJEnk8&8W2-xz<8c}-z(J^U(@q(&+nXj zKJL3Oy_cr<((d#54vC1zAsx8rlaA!++7WQlr4`JpYpmwqeAuMx=V3RMVGVV|g&Id< zfX<}<>(Xzy^n+xM7DvC_S(@|(eslI7Ubp0p<+DGnpT7ilnm5o7;fh(NlfY?_=^i0( z7qmyvK|y~O^thmpawIq`7Wma%OizooHco+A-E_W)Ga~fMW;cC>OV$)7KMjtViVI$C zUDv+8V~ekSv#%1K$XisvwdmHD)^C5UeG_zBTOe(%o4Ru0GcD0d(%9To-w+M>g7>9> zuZj>*^2$3c#DqWoQ1K(gfwBkx6+4bv39*ndl=(vuw+1=4^QXAAbs`~Vl0liTZJXSR z1HovNTM5aw-ma@;phy>%86y$vFrMe9Ch*$iGMj?2p-wJ8n|xT?=j+pIB}I%{j6fb5WD0Z)zG-PkfGS1B+Rv&%}64 zU6`pHU@66OOVju^D9+4@b8_N5Lrf{(VE_S*_k?eO-&NX~L)mkpBPY6Z;&sD0rQ9*3 zvx>$g-1v`d;FNML=aI>Z@g9=Vw0^$z7rS_>>V@mX@wT7g zqf8HtYnrN@M=Ogdymr<#;9xQIPNi1~+fTT-F{SWYO(X}h8z7ee1<~4-K+-l?>3%i-BT;`?RugKGBWV;W6sxr!raWPcJ-xEI9 zusCB_C?B6B$`{>QhfP|Hi`{yX7DZHzLnQ)VnKK+*^RlEzPsWc>(Fq68B1uOYeAI zmag8=w5!!ITy=iVG(>_L>?d=9!-|7uf9NNnH8_{~4H7(P;4?9>(Ul65SPp z6JV9s0|)EvbPcq5%bmTY2*amLXN18aZ#i8CgWjd4Nfe5FFBXj&mw~~E+Xip>mQ)NI zcf6))o4K=bGm~qE-Unm8O%M(g!+^<>*y8V{v=1sOOUx1(MlR!ZzZ|s*WEA<^v=^>a zMk#|xK*sGOffBP!RzX|fFVxn~^`qs$+}F#p_mz3B<+c%TGLf)e zr>TtC!`Uc0F9m0{oIf3{MR>wIr4Xoor0f#9arLrO2l)-3Drl>g%OVE&oN+0Oi6UYV z9IBS#U^Sx$fQDrH5nRDUPV!aj_vpjFJ}&w@*Xg~)+E9olj?Vjry8iL?35WI1PGakV zcA7{(evtC1?yvDlea86uV6Y}MB|FS4UuGo8XKsR$+K2Mp#`tmi^|jSf_E3x_cGosi zdIHYX`K9b(>IE9UC1t-k3}_@IWhaNTjf5Z*cHqY;u|Kkl(jt%=LUcbw8fN?rPnhB% diff --git a/cicd/common/sctp_socat_client.c b/cicd/common/sctp_socat_client.c index 784136cb6..96278a8e3 100644 --- a/cicd/common/sctp_socat_client.c +++ b/cicd/common/sctp_socat_client.c @@ -9,7 +9,7 @@ #include #include -#define RECVBUFSIZE 4096 +#define RECVBUFSIZE 1024 #define PPID 1234 int main(int argc, char* argv[]) @@ -24,8 +24,7 @@ int main(int argc, char* argv[]) struct sctp_sndrcvinfo sndrcvinfo = {0}; struct sctp_event_subscribe events = {0}; struct sctp_initmsg initmsg = {0}; - char msg[1024] = {0}; - char buff[1024] = {0}; + char msg[RECVBUFSIZE] = {0}; socklen_t opt_len; socklen_t slen = (socklen_t) sizeof(struct sockaddr_in); @@ -56,13 +55,11 @@ int main(int argc, char* argv[]) while(1) { - in = sctp_recvmsg(sockfd, (void*)buff, RECVBUFSIZE, - (struct sockaddr *)&servaddr, - &slen, &sndrcvinfo, &flags); + in = recv(sockfd, (void*)msg, RECVBUFSIZE, 0); if (in > 0 && in < RECVBUFSIZE - 1) { - buff[in] = 0; - printf("%s",buff); + msg[in] = 0; + printf("%s",msg); break; } }