gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2024-09-21 07:46:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #329 from gravitl/feature_v0.8.3_server_migrate

Browse source 
logging update
This commit is contained in:
Alex 2021-10-07 11:19:28 -04:00 committed by GitHub
parent 7dd87a19ea cf5c7f85dc
commit 9a8c9f514f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 100 additions and 94 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.dockerignore Normal file
View file

@ -0,0 +1,2 @@
config/dnsconfig/
data/

30
Dockerfile
View file

@ -1,36 +1,26 @@
#first stage - builder
FROM golang:latest as builder
COPY . /app
FROM gravitl/builder as builder
WORKDIR /app
ENV GO111MODULE=auto
RUN GOARCH=amd64 CGO_ENABLED=1 GOOS=linux go build -ldflags="-w -s" -o app main.go
WORKDIR /app/netclient
COPY . .
ENV GO111MODULE=auto
RUN GOARCH=amd64 CGO_ENABLED=0 GOOS=linux go build -ldflags="-w -s" -o netclient main.go
#second stage
FROM debian:latest
RUN apt-get update && apt-get -y install systemd procps
RUN GOOS=linux GOARCH=amd64 CGO_ENABLED=1 /usr/local/go/bin/go build -ldflags="-w -s" -o netmaker main.go
FROM alpine:3.13.6
# add a c lib
RUN apk add gcompat iptables
# set the working directory
WORKDIR /root/
COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
RUN mkdir -p /etc/netclient/config
COPY --from=builder /app .
COPY --from=builder /app/netmaker .
COPY --from=builder /app/config config
COPY --from=builder /app/netclient netclient
EXPOSE 8081
EXPOSE 50051
CMD ["./app"]
ENTRYPOINT ["./netmaker"]

36
docker/Dockerfile-full Normal file
View file

@ -0,0 +1,36 @@
#first stage - builder
FROM golang:latest as builder
COPY . /app
WORKDIR /app
ENV GO111MODULE=auto
RUN GOARCH=amd64 CGO_ENABLED=1 GOOS=linux go build -ldflags="-w -s" -o app main.go
WORKDIR /app/netclient
ENV GO111MODULE=auto
RUN GOARCH=amd64 CGO_ENABLED=0 GOOS=linux go build -ldflags="-w -s" -o netclient main.go
#second stage
FROM debian:latest
RUN apt-get update && apt-get -y install systemd procps
WORKDIR /root/
COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
COPY --from=builder /app .
COPY --from=builder /app/config config
COPY --from=builder /app/netclient netclient
EXPOSE 8081
EXPOSE 50051
CMD ["./app"]

28
docker/Dockerfile-netclient
View file

@ -1,26 +1,22 @@
#first stage - builder
FROM gravitl/builder:latest as builder
# add glib support daemon manager
WORKDIR /app
FROM golang:latest as builder
COPY . /app
WORKDIR /app/netclient
COPY . .
ENV GO111MODULE=auto
RUN CGO_ENABLED=0 GOOS=linux go build -o netclient main.go
RUN GOOS=linux GOARCH=amd64 CGO_ENABLED=0 /usr/local/go/bin/go build -ldflags="-w -s" -o netclient-app netclient/main.go
#second stage
FROM debian:latest
RUN apt-get update && apt-get -y install systemd procps
FROM alpine:3.13.6
RUN apk add gcompat iptables && mkdir -p /etc/netclient
# set the working directory
WORKDIR /root/
COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
COPY --from=builder /app/netclient-app /etc/netclient/netclient
COPY --from=builder /app/scripts/netclient.sh .
COPY --from=builder /app/netclient/netclient .
CMD ["./netclient"]
RUN chmod 0755 /etc/netclient/netclient && chmod 0755 netclient.sh
ENTRYPOINT ["./netclient.sh"]

26
docker/Dockerfile-netclient-full Normal file
View file

@ -0,0 +1,26 @@
#first stage - builder
FROM golang:latest as builder
COPY . /app
WORKDIR /app/netclient
ENV GO111MODULE=auto
RUN CGO_ENABLED=0 GOOS=linux go build -o netclient main.go
#second stage
FROM debian:latest
RUN apt-get update && apt-get -y install systemd procps
WORKDIR /root/
COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
COPY --from=builder /app/netclient/netclient .
CMD ["./netclient"]

22
docker/Dockerfile-netclient-slim-solo
View file

@ -1,22 +0,0 @@
FROM gravitl/builder:latest as builder
# add glib support daemon manager
WORKDIR /app
COPY . .
ENV GO111MODULE=auto
RUN GOOS=linux GOARCH=amd64 CGO_ENABLED=0 /usr/local/go/bin/go build -ldflags="-w -s" -o netclient-app netclient/main.go
FROM alpine:3.13.6
RUN apk add gcompat iptables && mkdir -p /etc/netclient
# set the working directory
WORKDIR /root/
COPY --from=builder /app/netclient-app /etc/netclient/netclient
COPY --from=builder /app/scripts/netclient.sh .
RUN chmod 0755 /etc/netclient/netclient && chmod 0755 netclient.sh
ENTRYPOINT ["./netclient.sh"]

26
docker/Dockerfile-netmaker-slim-solo
View file

@ -1,26 +0,0 @@
FROM gravitl/builder:latest as builder
# add glib support daemon manager
WORKDIR /app
COPY . .
ENV GO111MODULE=auto
RUN GOOS=linux GOARCH=amd64 CGO_ENABLED=1 /usr/local/go/bin/go build -ldflags="-w -s" -o netmaker main.go
FROM alpine:3.13.6
RUN apk add gcompat
# set the working directory
WORKDIR /root/
COPY --from=builder /app/netmaker .
COPY --from=builder /app/config .
RUN mkdir -p config/dnsconfig
RUN touch config/dnsconfig/Corefile && touch config/dnsconfig/netmaker.hosts
EXPOSE 8081
EXPOSE 50051
ENTRYPOINT ["./netmaker"]

7
netclient/command/commands.go
View file

@ -3,9 +3,10 @@ package command
import (
"log"
"os"
"strconv"
"strings"
"time"
"strconv"
nodepb "github.com/gravitl/netmaker/grpc"
"github.com/gravitl/netmaker/netclient/config"
"github.com/gravitl/netmaker/netclient/daemon"
@ -67,14 +68,14 @@ func getWindowsInterval() int {
return interval
}
netint, err := strconv.Atoi(cfg.Server.CheckinInterval)
if err == nil && netint != 0 {
if err == nil && netint != 0 {
interval = netint
}
return interval
}
func RunUserspaceDaemon() {
cfg := config.ClientConfig{
Network: "all",
}

17
serverctl/serverctl.go
View file

@ -101,7 +101,7 @@ func InitServerNetclient() error {
if os.IsNotExist(err) {
os.MkdirAll(netclientDir+"/config", 744)
} else if err != nil {
log.Println("could not find or create", netclientDir)
log.Println("[netmaker] could not find or create", netclientDir)
return err
}
return nil
@ -119,14 +119,14 @@ func HandleContainedClient() error {
log.SetFlags(log.Flags() &^ (log.Llongfile | log.Lshortfile))
err := SyncNetworks(servernets)
if err != nil && servercfg.GetVerbose() >= 1 {
log.Printf("[server netclient] error syncing networks %s \n", err)
log.Printf("[netmaker] error syncing networks %s \n", err)
}
err = nccommand.CheckIn(config.ClientConfig{Network: "all"})
if err != nil && servercfg.GetVerbose() >= 1 {
log.Printf("[server netclient] error occurred %s \n", err)
log.Printf("[netmaker] error occurred %s \n", err)
}
if servercfg.GetVerbose() >= 3 {
log.Println("[server netclient]", "completed a checkin call")
log.Println("[netmaker]", "completed a checkin call")
}
}
return nil
@ -152,7 +152,9 @@ func SyncNetworks(servernets []models.Network) error {
if err == nil {
err = errors.New("network add failed for " + servernet.NetID)
}
log.Printf("[server] error adding network %s during sync %s \n", servernet.NetID, err)
if servercfg.GetVerbose() >= 1 {
log.Printf("[netmaker] error adding network %s during sync %s \n", servernet.NetID, err)
}
}
}
}
@ -170,7 +172,7 @@ func SyncNetworks(servernets []models.Network) error {
if err == nil {
err = errors.New("network delete failed for " + localnet)
}
log.Printf("[server] error removing network %s during sync %s \n", localnet, err)
log.Printf("[netmaker] error removing network %s during sync %s \n", localnet, err)
}
}
}
@ -184,9 +186,10 @@ func AddNetwork(network string) (bool, error) {
Node: models.Node{
Network: network,
IsServer: "yes",
DNSOn: "no",
Name: models.NODE_SERVER_NAME,
},
}, "")
log.Println("Server added to network " + network)
log.Println("[netmaker] Server added to network " + network)
return true, err
}