Merge branch 'main' into main

Dockerfile

@@ -10,7 +10,6 @@ ENV LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/usr/lib64/"
 
 # Install loxilb related packages
 RUN mkdir -p /opt/loxilb && \
-    mkdir -p /opt/loxilb/cert/ && \
     mkdir -p /root/loxilb-io/loxilb/ && \
     mkdir -p /etc/bash_completion.d/ && \
     # Update Ubuntu Software repository
@@ -44,7 +43,6 @@ RUN mkdir -p /opt/loxilb && \
     cd /root/loxilb-io/loxilb/ && go get . && if [ "$arch" = "arm64" ] ; then DOCKER_BUILDX_ARM64=true make; \
     else make ;fi && cp loxilb-ebpf/utils/mkllb_bpffs.sh /usr/local/sbin/mkllb_bpffs && \
     cp loxilb-ebpf/utils/mkllb_cgroup.sh /usr/local/sbin/mkllb_cgroup && \
-    cp api/certification/* /opt/loxilb/cert/ && cd - && \
     cp /root/loxilb-io/loxilb/loxilb-ebpf/kernel/loxilb_dp_debug  /usr/local/sbin/loxilb_dp_debug && \
     cp /root/loxilb-io/loxilb/loxilb /usr/local/sbin/loxilb && \
     rm -fr /root/loxilb-io/loxilb/* && rm -fr /root/loxilb-io/loxilb/.git && \

api/api.go

@@ -17,6 +17,11 @@
 package api
 
 import (
+	"log"
+	"os"
+	"runtime/debug"
+	"time"
+
 	"github.com/go-openapi/loads"
 	flags "github.com/jessevdk/go-flags"
 	"github.com/loxilb-io/loxilb/api/restapi"
@@ -25,10 +30,6 @@ import (
 	cmn "github.com/loxilb-io/loxilb/common"
 	"github.com/loxilb-io/loxilb/options"
 	tk "github.com/loxilb-io/loxilib"
-	"log"
-	"os"
-	"runtime/debug"
-	"time"
 )
 
 var (
@@ -117,17 +118,23 @@ func RunAPIServer() {
 	server.ConfigureAPI()
 	// API server host list
 	server.Host = options.Opts.Host
-	server.TLSHost = options.Opts.TLSHost
-	server.TLSCertificateKey = options.Opts.TLSCertificateKey
-	server.TLSCertificate = options.Opts.TLSCertificate
 	server.Port = options.Opts.Port
-	server.TLSPort = options.Opts.TLSPort
+
+	// HTTPs List
+	if options.Opts.TLS {
+		server.TLSHost = options.Opts.TLSHost
+		server.TLSPort = options.Opts.TLSPort
+
+		server.TLSCertificateKey = options.Opts.TLSCertificateKey
+		server.TLSCertificate = options.Opts.TLSCertificate
+	}
+
 	api.ServerShutdown = func() {
 		waitApiServerShutOk()
 		os.Exit(0)
 	}
 	ApiReady = true
-
+	
 	if err := server.Serve(); err != nil {
 		log.Fatalln(err)
 	}

api/build_api.sh

@@ -0,0 +1,3 @@
+sudo docker run --rm -it  --user $(id -u):$(id -g) -e GOPATH=$(go env GOPATH):/go -v $HOME:$HOME -w $(pwd) quay.io/goswagger/swagger:0.30.3 generate server
+sed -i 's/s\.hasScheme(schemeHTTPS)/s\.hasScheme(schemeHTTPS) \&\& options\.Opts\.TLS/gi' restapi/server.go
+sed -i'' -r -e '/import/a\\t\"github.com/loxilb-io/loxilb/options\"' restapi/server.go

options/options.go

@@ -12,6 +12,7 @@ var Opts struct {
 	NoNlp             bool           `short:"n" long:"nonlp" description:"Do not register with nlp"`
 	Host              string         `long:"host" description:"the IP to listen on" default:"0.0.0.0" env:"HOST"`
 	Port              int            `long:"port" description:"the port to listen on for insecure connections" default:"11111" env:"PORT"`
+	TLS               bool           `long:"tls" description:"enable TLS " env:"TLS"`
 	TLSHost           string         `long:"tls-host" description:"the IP to listen on for tls, when not specified it's the same as --host" env:"TLS_HOST"`
 	TLSPort           int            `long:"tls-port" description:"the port to listen on for secure connections" default:"8091" env:"TLS_PORT"`
 	TLSCertificate    flags.Filename `long:"tls-certificate" description:"the certificate to use for secure connections" default:"/opt/loxilb/cert/server.crt" env:"TLS_CERTIFICATE"`