Merge pull request #707 from TrekkieCoder/main

PR - cicd : fixes for failed sctp test-cases
loxilb-io · Jun 21, 2024 · ed229ad · ed229ad
2 parents 0191359 + 2025327
commit ed229ad
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 12 deletions.
diff --git 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-

diff --git a/cicd/common/sctp_socat_client b/cicd/common/sctp_socat_client
diff --git a/cicd/common/sctp_socat_client.c b/cicd/common/sctp_socat_client.c
@@ -9,7 +9,7 @@
 #include <unistd.h>
 #include <errno.h>
 
-#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;
                 }
         } 

diff --git 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
@@ -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