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- diff --git a/cicd/common/sctp_socat_client b/cicd/common/sctp_socat_client index 399c0bd26..07ea00a40 100755 Binary files a/cicd/common/sctp_socat_client and b/cicd/common/sctp_socat_client differ 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; } } 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 diff --git a/go.mod b/go.mod index 840264872..fe00b93c8 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( github.com/go-openapi/validate v0.22.0 github.com/jessevdk/go-flags v1.5.0 github.com/loxilb-io/ipvs v0.1.0 - github.com/loxilb-io/loxilib v0.8.9-0.20240124072521-f37fbddfb4e8 + github.com/loxilb-io/loxilib v0.8.9-0.20240620071157-28d3880edd8f github.com/osrg/gobgp/v3 v3.5.0 github.com/prometheus-community/pro-bing v0.1.0 github.com/prometheus/client_model v0.3.0 diff --git a/go.sum b/go.sum index 3a01f0994..9be9a10d9 100644 --- a/go.sum +++ b/go.sum @@ -262,6 +262,8 @@ github.com/loxilb-io/ipvs v0.1.0 h1:TpTkwh5CLgJ7YW86rvWyqJPEpQFqs2TNbRG/IECeq+w= github.com/loxilb-io/ipvs v0.1.0/go.mod h1:EKjimnzyVL9AXMMNfPWeokxF1uNeuDrEGF5gPFMdmIo= github.com/loxilb-io/loxilib v0.8.9-0.20240124072521-f37fbddfb4e8 h1:PYkgIX2fv1UluRR82SAot3O5YnwwCbcWc7VULvPv3QM= github.com/loxilb-io/loxilib v0.8.9-0.20240124072521-f37fbddfb4e8/go.mod h1:LoQCxBz+N0fO9rGwRmPHrQPHol/jUf4MNpph63Cydkg= +github.com/loxilb-io/loxilib v0.8.9-0.20240620071157-28d3880edd8f h1:Zeas0eEF60hK+UwMp9QRqPtUuFQV6pC0X2re+yuqCEM= +github.com/loxilb-io/loxilib v0.8.9-0.20240620071157-28d3880edd8f/go.mod h1:LoQCxBz+N0fO9rGwRmPHrQPHol/jUf4MNpph63Cydkg= github.com/loxilb-io/sctp v0.0.0-20230519081703-6d1baec82fd4 h1:oDc2lsbfuQEcVP3k+Pw4v6Xdm3t4M9vBc1Y9egszv6g= github.com/loxilb-io/sctp v0.0.0-20230519081703-6d1baec82fd4/go.mod h1:1a6hv8ISVQhnW5IVpW9o+OL6BAFlWiVpC0O4d19g+wQ= github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=