Handle ip changes

.goreleaser.yml

@@ -161,6 +161,38 @@ dockers:
     build_flag_templates:
       - --platform=linux/arm/v7
 
+  - image_templates:
+      - dkron/{{ .ProjectName }}:{{ .Version }}-light-amd64
+    dockerfile: Dockerfile.release
+    use: buildx
+    goos: linux
+    goarch: amd64
+    ids: &docker-ids
+      - dkron
+    build_flag_templates:
+      - --platform=linux/amd64
+
+  - image_templates:
+      - dkron/{{ .ProjectName }}:{{ .Version }}-light-arm64
+    dockerfile: Dockerfile.release
+    use: buildx
+    goos: linux
+    goarch: arm64
+    ids: *docker-ids
+    build_flag_templates:
+      - --platform=linux/arm64/v8
+
+  - image_templates:
+      - dkron/{{ .ProjectName }}:{{ .Version }}-light-armv7
+    dockerfile: Dockerfile.release
+    use: buildx
+    goos: linux
+    goarch: arm
+    goarm: '7'
+    ids: *docker-ids
+    build_flag_templates:
+      - --platform=linux/arm/v7
+
 docker_manifests:
   - name_template: dkron/{{ .ProjectName }}:{{ .Version }}
     image_templates:
@@ -174,6 +206,12 @@ docker_manifests:
     - dkron/{{ .ProjectName }}:{{ .Version }}-arm64
     - dkron/{{ .ProjectName }}:{{ .Version }}-armv7
 
+  - name_template: dkron/{{ .ProjectName }}:{{ .Version }}-light
+    image_templates:
+    - dkron/{{ .ProjectName }}:{{ .Version }}-light-amd64
+    - dkron/{{ .ProjectName }}:{{ .Version }}-light-arm64
+    - dkron/{{ .ProjectName }}:{{ .Version }}-light-armv7
+
 changelog:
   sort: asc
   filters:

Dockerfile

@@ -1,5 +1,5 @@
-FROM golang:1.18
-LABEL maintainer="Victor Castell <victor@victorcastell.com>"
+FROM golang:1.21
+LABEL maintainer="Victor Castell <0x@vcastellm.xyz>"
 
 EXPOSE 8080 8946
 

Dockerfile.light.hub

@@ -0,0 +1,15 @@
+FROM alpine:3.19
+LABEL maintainer="Victor Castell <0x@vcastellm.xyz>"
+
+RUN set -x \
+	&& buildDeps='bash ca-certificates openssl tzdata' \
+	&& apk add --no-cache --update $buildDeps
+
+EXPOSE 8080 8946
+
+ENV SHELL /bin/bash
+COPY dkron /usr/local/bin/
+
+ENTRYPOINT ["/usr/local/bin/dkron"]
+
+CMD ["--help"]

Dockerfile.release

@@ -1,5 +1,5 @@
-FROM alpine:3.15
-LABEL maintainer="Victor Castell <victor@victorcastell.com>"
+FROM alpine:3.19
+LABEL maintainer="Victor Castell <0x@vcastellm.xyz>"
 
 RUN set -x \
 	&& buildDeps='bash ca-certificates openssl tzdata' \

cmd/plugins.go

@@ -70,33 +70,37 @@ func (p *Plugins) DiscoverPlugins() error {
 	}
 
 	for _, file := range processors {
-
 		pluginName, ok := getPluginName(file)
 		if !ok {
 			continue
 		}
 
-		raw, err := p.pluginFactory(file, dkplugin.ProcessorPluginName)
+		raw, err := p.pluginFactory(file, []string{}, dkplugin.ProcessorPluginName)
 		if err != nil {
 			return err
 		}
 		p.Processors[pluginName] = raw.(dkplugin.Processor)
 	}
 
 	for _, file := range executors {
-
 		pluginName, ok := getPluginName(file)
 		if !ok {
 			continue
 		}
 
-		raw, err := p.pluginFactory(file, dkplugin.ExecutorPluginName)
+		raw, err := p.pluginFactory(file, []string{}, dkplugin.ExecutorPluginName)
 		if err != nil {
 			return err
 		}
 		p.Executors[pluginName] = raw.(dkplugin.Executor)
 	}
 
+	raw, err := p.pluginFactory(exePath, []string{"shell"}, dkplugin.ExecutorPluginName)
+	if err != nil {
+		return err
+	}
+	p.Executors["shell"] = raw.(dkplugin.Executor)
+
 	return nil
 }
 
@@ -113,10 +117,10 @@ func getPluginName(file string) (string, bool) {
 	return name, true
 }
 
-func (p *Plugins) pluginFactory(path string, pluginType string) (interface{}, error) {
+func (p *Plugins) pluginFactory(path string, args []string, pluginType string) (interface{}, error) {
 	// Build the plugin client configuration and init the plugin
 	var config plugin.ClientConfig
-	config.Cmd = exec.Command(path)
+	config.Cmd = exec.Command(path, args...)
 	config.HandshakeConfig = dkplugin.Handshake
 	config.Managed = true
 	config.Plugins = dkplugin.PluginMap

cmd/shell.go

@@ -0,0 +1,30 @@
+package cmd
+
+import (
+	dkplugin "github.com/distribworks/dkron/v3/plugin"
+	"github.com/distribworks/dkron/v3/plugin/shell"
+	"github.com/hashicorp/go-plugin"
+	"github.com/spf13/cobra"
+)
+
+var shellCmd = &cobra.Command{
+	Hidden: true,
+	Use:    "shell",
+	Short:  "Shell plugin for dkron",
+	Long:   ``,
+	Run: func(cmd *cobra.Command, args []string) {
+		plugin.Serve(&plugin.ServeConfig{
+			HandshakeConfig: dkplugin.Handshake,
+			Plugins: map[string]plugin.Plugin{
+				"executor": &dkplugin.ExecutorPlugin{Executor: &shell.Shell{}},
+			},
+
+			// A non-nil value here enables gRPC serving for this plugin...
+			GRPCServer: plugin.DefaultGRPCServer,
+		})
+	},
+}
+
+func init() {
+	dkronCmd.AddCommand(shellCmd)
+}

dkron/agent.go

@@ -113,9 +113,10 @@ type Agent struct {
 
 	// peers is used to track the known Dkron servers. This is
 	// used for region forwarding and clustering.
-	peers      map[string][]*ServerParts
-	localPeers map[raft.ServerAddress]*ServerParts
-	peerLock   sync.RWMutex
+	peers        map[string][]*ServerParts
+	localPeers   map[raft.ServerAddress]*ServerParts
+	peerLock     sync.RWMutex
+	serverLookup *ServerLookup
 
 	activeExecutions sync.Map
 
@@ -142,8 +143,9 @@ type AgentOption func(agent *Agent)
 // and running a Dkron instance.
 func NewAgent(config *Config, options ...AgentOption) *Agent {
 	agent := &Agent{
-		config:      config,
-		retryJoinCh: make(chan error),
+		config:       config,
+		retryJoinCh:  make(chan error),
+		serverLookup: NewServerLookup(),
 	}
 
 	for _, option := range options {
@@ -316,7 +318,13 @@ func (a *Agent) setupRaft() error {
 		logger = a.logger.Logger.Writer()
 	}
 
-	transport := raft.NewNetworkTransport(a.raftLayer, 3, raftTimeout, logger)
+	transConfig := &raft.NetworkTransportConfig{
+		Stream:                a.raftLayer,
+		MaxPool:               3,
+		Timeout:               raftTimeout,
+		ServerAddressProvider: a.serverLookup,
+	}
+	transport := raft.NewNetworkTransportWithConfig(transConfig)
 	a.raftTransport = transport
 
 	config := raft.DefaultConfig()
@@ -710,7 +718,10 @@ func (a *Agent) eventLoop() {
 					a.localMemberEvent(me)
 				case serf.EventMemberReap:
 					a.localMemberEvent(me)
-				case serf.EventMemberUpdate, serf.EventUser, serf.EventQuery: // Ignore
+				case serf.EventMemberUpdate:
+					a.lanNodeUpdate(me)
+					a.localMemberEvent(me)
+				case serf.EventUser, serf.EventQuery: // Ignore
 				default:
 					a.logger.WithField("event", e.String()).Warn("agent: Unhandled serf event")
 				}

dkron/agent_test.go

@@ -16,7 +16,7 @@ import (
 )
 
 var (
-	logLevel = "error"
+	logLevel = "info"
 )
 
 func TestAgentCommand_runForElection(t *testing.T) {

dkron/api.go

@@ -48,7 +48,6 @@ func NewTransport(a *Agent, log *logrus.Entry) *HTTPTransport {
 
 func (h *HTTPTransport) ServeHTTP() {
 	h.Engine = gin.Default()
-	h.Engine.HTMLRender = CreateMyRender(h.logger)
 	h.Engine.Use(h.Options)
 
 	rootPath := h.Engine.Group("/")
@@ -66,8 +65,6 @@ func (h *HTTPTransport) ServeHTTP() {
 	h.APIRoutes(rootPath)
 	if h.agent.config.UI {
 		h.UI(rootPath)
-	} else {
-		h.agent.DashboardRoutes(rootPath)
 	}
 
 	h.logger.WithFields(logrus.Fields{