Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .goreleaser-potctl-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ builds:
- -s -w -X "github.com/datasance/potctl/pkg/util.commit={{ .ShortCommit }}"
- -s -w -X "github.com/datasance/potctl/pkg/util.date={{.Date}}"
- -s -w -X "github.com/datasance/potctl/pkg/util.platform={{.Os}}/{{.Arch}}"
- -s -w -X "github.com/datasance/potctl/pkg/util.operatorTag=3.7.0"
- -s -w -X "github.com/datasance/potctl/pkg/util.operatorTag=3.7.1"
- -s -w -X "github.com/datasance/potctl/pkg/util.routerTag=3.7.0"
- -s -w -X "github.com/datasance/potctl/pkg/util.controllerTag=3.7.0"
- -s -w -X "github.com/datasance/potctl/pkg/util.agentTag=3.7.0"
Expand Down Expand Up @@ -62,7 +62,7 @@ builds:
- -s -w -X "github.com/datasance/potctl/pkg/util.commit={{ .ShortCommit }}"
- -s -w -X "github.com/datasance/potctl/pkg/util.date={{.Date}}"
- -s -w -X "github.com/datasance/potctl/pkg/util.platform={{.Os}}/{{.Arch}}"
- -s -w -X "github.com/datasance/potctl/pkg/util.operatorTag=3.7.0"
- -s -w -X "github.com/datasance/potctl/pkg/util.operatorTag=3.7.1"
- -s -w -X "github.com/datasance/potctl/pkg/util.routerTag=3.7.0"
- -s -w -X "github.com/datasance/potctl/pkg/util.controllerTag=3.7.0"
- -s -w -X "github.com/datasance/potctl/pkg/util.agentTag=3.7.0"
Expand All @@ -87,7 +87,7 @@ builds:
- -s -w -X "github.com/datasance/potctl/pkg/util.commit={{ .ShortCommit }}"
- -s -w -X "github.com/datasance/potctl/pkg/util.date={{.Date}}"
- -s -w -X "github.com/datasance/potctl/pkg/util.platform={{.Os}}/{{.Arch}}"
- -s -w -X "github.com/datasance/potctl/pkg/util.operatorTag=3.7.0"
- -s -w -X "github.com/datasance/potctl/pkg/util.operatorTag=3.7.1"
- -s -w -X "github.com/datasance/potctl/pkg/util.routerTag=3.7.0"
- -s -w -X "github.com/datasance/potctl/pkg/util.controllerTag=3.7.0"
- -s -w -X "github.com/datasance/potctl/pkg/util.agentTag=3.7.0"
Expand Down
10 changes: 5 additions & 5 deletions .goreleaser-potctl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ builds:
- -s -w -X "github.com/datasance/potctl/pkg/util.commit={{ .ShortCommit }}"
- -s -w -X "github.com/datasance/potctl/pkg/util.date={{.Date}}"
- -s -w -X "github.com/datasance/potctl/pkg/util.platform={{.Os}}/{{.Arch}}"
- -s -w -X "github.com/datasance/potctl/pkg/util.operatorTag=3.7.0"
- -s -w -X "github.com/datasance/potctl/pkg/util.operatorTag=3.7.1"
- -s -w -X "github.com/datasance/potctl/pkg/util.routerTag=3.7.0"
- -s -w -X "github.com/datasance/potctl/pkg/util.controllerTag=3.7.0"
- -s -w -X "github.com/datasance/potctl/pkg/util.agentTag=3.7.0"
Expand All @@ -63,7 +63,7 @@ builds:
- -s -w -X "github.com/datasance/potctl/pkg/util.commit={{ .ShortCommit }}"
- -s -w -X "github.com/datasance/potctl/pkg/util.date={{.Date}}"
- -s -w -X "github.com/datasance/potctl/pkg/util.platform={{.Os}}/{{.Arch}}"
- -s -w -X "github.com/datasance/potctl/pkg/util.operatorTag=3.7.0"
- -s -w -X "github.com/datasance/potctl/pkg/util.operatorTag=3.7.1"
- -s -w -X "github.com/datasance/potctl/pkg/util.routerTag=3.7.0"
- -s -w -X "github.com/datasance/potctl/pkg/util.controllerTag=3.7.0"
- -s -w -X "github.com/datasance/potctl/pkg/util.agentTag=3.7.0"
Expand Down Expand Up @@ -91,7 +91,7 @@ builds:
- -s -w -X "github.com/datasance/potctl/pkg/util.commit={{ .ShortCommit }}"
- -s -w -X "github.com/datasance/potctl/pkg/util.date={{.Date}}"
- -s -w -X "github.com/datasance/potctl/pkg/util.platform={{.Os}}/{{.Arch}}"
- -s -w -X "github.com/datasance/potctl/pkg/util.operatorTag=3.7.0"
- -s -w -X "github.com/datasance/potctl/pkg/util.operatorTag=3.7.1"
- -s -w -X "github.com/datasance/potctl/pkg/util.routerTag=3.7.0"
- -s -w -X "github.com/datasance/potctl/pkg/util.controllerTag=3.7.0"
- -s -w -X "github.com/datasance/potctl/pkg/util.agentTag=3.7.0"
Expand Down Expand Up @@ -122,7 +122,7 @@ builds:
- -s -w -X "github.com/datasance/potctl/pkg/util.commit={{ .ShortCommit }}"
- -s -w -X "github.com/datasance/potctl/pkg/util.date={{.Date}}"
- -s -w -X "github.com/datasance/potctl/pkg/util.platform={{.Os}}/{{.Arch}}"
- -s -w -X "github.com/datasance/potctl/pkg/util.operatorTag=3.7.0"
- -s -w -X "github.com/datasance/potctl/pkg/util.operatorTag=3.7.1"
- -s -w -X "github.com/datasance/potctl/pkg/util.routerTag=3.7.0"
- -s -w -X "github.com/datasance/potctl/pkg/util.controllerTag=3.7.0"
- -s -w -X "github.com/datasance/potctl/pkg/util.agentTag=3.7.0"
Expand All @@ -148,7 +148,7 @@ builds:
- -s -w -X "github.com/datasance/potctl/pkg/util.commit={{ .ShortCommit }}"
- -s -w -X "github.com/datasance/potctl/pkg/util.date={{.Date}}"
- -s -w -X "github.com/datasance/potctl/pkg/util.platform={{.Os}}/{{.Arch}}"
- -s -w -X "github.com/datasance/potctl/pkg/util.operatorTag=3.7.0"
- -s -w -X "github.com/datasance/potctl/pkg/util.operatorTag=3.7.1"
- -s -w -X "github.com/datasance/potctl/pkg/util.routerTag=3.7.0"
- -s -w -X "github.com/datasance/potctl/pkg/util.controllerTag=3.7.0"
- -s -w -X "github.com/datasance/potctl/pkg/util.agentTag=3.7.0"
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ COMMIT ?= $(shell git rev-parse HEAD 2>/dev/null)
BUILD_DATE ?= $(shell date -u +%Y-%m-%dT%H:%M:%SZ)
PREFIX = github.com/datasance/potctl/pkg/util
LDFLAGS += -X $(PREFIX).versionNumber=$(VERSION) -X $(PREFIX).commit=$(COMMIT) -X $(PREFIX).date=$(BUILD_DATE) -X $(PREFIX).platform=$(GOOS)/$(GOARCH)
LDFLAGS += -X $(PREFIX).operatorTag=3.7.0
LDFLAGS += -X $(PREFIX).operatorTag=3.7.1
LDFLAGS += -X $(PREFIX).routerTag=3.7.0
LDFLAGS += -X $(PREFIX).controllerTag=3.7.0
LDFLAGS += -X $(PREFIX).agentTag=3.7.0
Expand All @@ -29,7 +29,7 @@ LDFLAGS += -X $(PREFIX).debuggerTag=latest
LDFLAGS += -X $(PREFIX).natsTag=2.12.4
LDFLAGS += -X $(PREFIX).repo=ghcr.io/datasance
GO_SDK_MODULE = iofog-go-sdk/v3@v3.7.0
OPERATOR_MODULE = iofog-operator/v3@v3.7.0
OPERATOR_MODULE = iofog-operator/v3@v3.7.1
REPORTS_DIR ?= reports
TEST_RESULTS ?= TEST-potctl.txt
TEST_REPORT ?= TEST-potctl.xml
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ require (
github.com/briandowns/spinner v1.23.1
github.com/containers/image/v5 v5.32.1
github.com/datasance/iofog-go-sdk/v3 v3.7.0
github.com/datasance/iofog-operator/v3 v3.7.1-beta.0
github.com/datasance/iofog-operator/v3 v3.7.1
github.com/docker/docker v27.4.1+incompatible
github.com/docker/go-connections v0.5.0
github.com/gorilla/websocket v1.5.3
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ github.com/daaku/go.zipexe v1.0.1 h1:wV4zMsDOI2SZ2m7Tdz1Ps96Zrx+TzaK15VbUaGozw0M
github.com/daaku/go.zipexe v1.0.1/go.mod h1:5xWogtqlYnfBXkSB1o9xysukNP9GTvaNkqzUZbt3Bw8=
github.com/datasance/iofog-go-sdk/v3 v3.7.0 h1:j9ceWQdOXVvF2xAjAtZ+19/28c2WUuM5g4kKG+LVYQQ=
github.com/datasance/iofog-go-sdk/v3 v3.7.0/go.mod h1:mLHD3oHazNzKsV8HoWDsI4g613fHs+rKPUFtYf0tB/U=
github.com/datasance/iofog-operator/v3 v3.7.1-beta.0 h1:gcpa9Kj8y0dMNQMSJH9zVDvTTieYLAyGRLfGXaeWSfs=
github.com/datasance/iofog-operator/v3 v3.7.1-beta.0/go.mod h1:X0UeJqm9Hocc3//krrpEoBD+G2/tiqEK/qeWMMk/z54=
github.com/datasance/iofog-operator/v3 v3.7.1 h1:pQ59Qo8KEMR99hE8MBXVS5Je3lBcxb82DVXBx5iORTM=
github.com/datasance/iofog-operator/v3 v3.7.1/go.mod h1:w8mOjk8OohyybU2NgK1qGAvg5sVsuWevz3DySrZ3Kf4=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
Expand Down
3 changes: 3 additions & 0 deletions internal/deploy/execute.go
Original file line number Diff line number Diff line change
Expand Up @@ -447,6 +447,9 @@ func sortAndExecute(namespace string, executors []deployagentconfig.AgentConfigE
// Add default router
agentByName[iofog.VanillaRouterAgentName] = &client.AgentInfo{Name: iofog.VanillaRouterAgentName}

// Add default nats server
agentByName[iofog.VanillaNatsAgentName] = &client.AgentInfo{Name: iofog.VanillaNatsAgentName}

// Agent config are the representation of agents in Controller. They need to be deployed sequentially because of router dependencies
// First create the acyclic graph of dependencies
g := graph.New(graph.Directed)
Expand Down
Loading