release prep: set component versions and agent installation script

.goreleaser-iofogctl-dev.yml

@@ -34,11 +34,11 @@ builds:
       - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.commit={{ .ShortCommit }}"
       - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.date={{.Date}}"
       - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.platform={{.Os}}/{{.Arch}}"
-      - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.operatorTag=3.7.1"
+      - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.operatorTag=3.7.2"
       - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.routerTag=3.7.0"
-      - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.controllerTag=3.7.1"
+      - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.controllerTag=3.7.3"
       - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.agentTag=3.7.0"
-      - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.controllerVersion=3.7.1"
+      - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.controllerVersion=3.7.3"
       - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.agentVersion=3.7.0"
       - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.debuggerTag=latest"
       - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.natsTag=3.6.0"
@@ -62,11 +62,11 @@ builds:
       - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.commit={{ .ShortCommit }}"
       - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.date={{.Date}}"
       - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.platform={{.Os}}/{{.Arch}}"
-      - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.operatorTag=3.7.1"
+      - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.operatorTag=3.7.2"
       - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.routerTag=3.7.0"
-      - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.controllerTag=3.7.1"
+      - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.controllerTag=3.7.3"
       - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.agentTag=3.7.0"
-      - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.controllerVersion=3.7.1"
+      - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.controllerVersion=3.7.3"
       - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.agentVersion=3.7.0"
       - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.debuggerTag=latest"
       - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.natsTag=3.6.0"
@@ -87,11 +87,11 @@ builds:
       - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.commit={{ .ShortCommit }}"
       - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.date={{.Date}}"
       - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.platform={{.Os}}/{{.Arch}}"
-      - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.operatorTag=3.7.1"
+      - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.operatorTag=3.7.2"
       - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.routerTag=3.7.0"
-      - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.controllerTag=3.7.1"
+      - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.controllerTag=3.7.3"
       - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.agentTag=3.7.0"
-      - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.controllerVersion=3.7.1"
+      - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.controllerVersion=3.7.3"
       - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.agentVersion=3.7.0"
       - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.debuggerTag=latest"
       - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.natsTag=3.6.0"

.goreleaser-iofogctl.yml

@@ -37,11 +37,11 @@ builds:
       - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.commit={{ .ShortCommit }}"
       - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.date={{.Date}}"
       - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.platform={{.Os}}/{{.Arch}}"
-      - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.operatorTag=3.7.1"
+      - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.operatorTag=3.7.2"
       - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.routerTag=3.7.0"
-      - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.controllerTag=3.7.1"
+      - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.controllerTag=3.7.3"
       - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.agentTag=3.7.0"
-      - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.controllerVersion=3.7.1"
+      - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.controllerVersion=3.7.3"
       - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.agentVersion=3.7.0"
       - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.debuggerTag=latest"
       - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.natsTag=3.6.0"
@@ -63,11 +63,11 @@ builds:
       - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.commit={{ .ShortCommit }}"
       - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.date={{.Date}}"
       - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.platform={{.Os}}/{{.Arch}}"
-      - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.operatorTag=3.7.1"
+      - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.operatorTag=3.7.2"
       - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.routerTag=3.7.0"
-      - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.controllerTag=3.7.1"
+      - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.controllerTag=3.7.3"
       - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.agentTag=3.7.0"
-      - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.controllerVersion=3.7.1"
+      - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.controllerVersion=3.7.3"
       - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.agentVersion=3.7.0"
       - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.natsTag=3.6.0"
       - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.repo=ghcr.io/eclipse-iofog"
@@ -91,11 +91,11 @@ builds:
       - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.commit={{ .ShortCommit }}"
       - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.date={{.Date}}"
       - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.platform={{.Os}}/{{.Arch}}"
-      - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.operatorTag=3.7.1"
+      - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.operatorTag=3.7.2"
       - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.routerTag=3.7.0"
-      - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.controllerTag=3.7.1"
+      - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.controllerTag=3.7.3"
       - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.agentTag=3.7.0"
-      - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.controllerVersion=3.7.1"
+      - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.controllerVersion=3.7.3"
       - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.agentVersion=3.7.0"
       - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.natsTag=3.6.0"
       - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.repo=ghcr.io/eclipse-iofog"
@@ -122,11 +122,11 @@ builds:
       - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.commit={{ .ShortCommit }}"
       - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.date={{.Date}}"
       - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.platform={{.Os}}/{{.Arch}}"
-      - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.operatorTag=3.7.1"
+      - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.operatorTag=3.7.2"
       - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.routerTag=3.7.0"
-      - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.controllerTag=3.7.1"
+      - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.controllerTag=3.7.3"
       - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.agentTag=3.7.0"
-      - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.controllerVersion=3.7.1"
+      - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.controllerVersion=3.7.3"
       - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.agentVersion=3.7.0"
       - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.debuggerTag=latest"
       - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.natsTag=3.6.0"
@@ -148,11 +148,11 @@ builds:
       - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.commit={{ .ShortCommit }}"
       - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.date={{.Date}}"
       - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.platform={{.Os}}/{{.Arch}}"
-      - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.operatorTag=3.7.1"
+      - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.operatorTag=3.7.2"
       - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.routerTag=3.7.0"
-      - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.controllerTag=3.7.1"
+      - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.controllerTag=3.7.3"
       - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.agentTag=3.7.0"
-      - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.controllerVersion=3.7.1"
+      - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.controllerVersion=3.7.3"
       - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.agentVersion=3.7.0"
       - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.debuggerTag=latest"
       - -s -w -X "github.com/eclipse-iofog/iofogctl/pkg/util.natsTag=3.6.0"

Makefile

@@ -19,17 +19,17 @@ COMMIT ?= $(shell git rev-parse HEAD 2>/dev/null)
 BUILD_DATE ?= $(shell date -u +%Y-%m-%dT%H:%M:%SZ)
 PREFIX = github.com/eclipse-iofog/iofogctl/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.1
+LDFLAGS += -X $(PREFIX).operatorTag=3.7.2
 LDFLAGS += -X $(PREFIX).routerTag=3.7.0
-LDFLAGS += -X $(PREFIX).controllerTag=3.7.1
+LDFLAGS += -X $(PREFIX).controllerTag=3.7.3
 LDFLAGS += -X $(PREFIX).agentTag=3.7.0
-LDFLAGS += -X $(PREFIX).controllerVersion=3.7.1
+LDFLAGS += -X $(PREFIX).controllerVersion=3.7.3
 LDFLAGS += -X $(PREFIX).agentVersion=3.7.0
 LDFLAGS += -X $(PREFIX).debuggerTag=latest
 LDFLAGS += -X $(PREFIX).natsTag=2.12.4
 LDFLAGS += -X $(PREFIX).repo=ghcr.io/eclipse-iofog
 GO_SDK_MODULE = iofog-go-sdk/v3@v3.7.0
-OPERATOR_MODULE = iofog-operator/v3@v3.7.1
+OPERATOR_MODULE = iofog-operator/v3@v3.7.2
 REPORTS_DIR ?= reports
 TEST_RESULTS ?= TEST-iofogctl.txt
 TEST_REPORT ?= TEST-iofogctl.xml

README.md

@@ -57,10 +57,11 @@ Current options include:
 
 
 
-Welcome to the cool new iofogctl Cli!
+Iofogctl is the CLI for ioFog. Think of it as a mix between terraform and kubectl.
 
 Use `iofogctl version` to display the current version.
-
+
+
 Usage:
   iofogctl [flags]
   iofogctl [command]
@@ -82,6 +83,7 @@ Available Commands:
   legacy        Execute commands using legacy CLI
   logs          Get log contents of deployed resource
   move          Move an existing resources inside the current Namespace
+  nats          Manage NATS resources
   prune         prune ioFog resources
   rebuild       Rebuilds a microservice or system-microservice
   rename        Rename the iofog resources that are currently deployed
@@ -93,7 +95,6 @@ Available Commands:
   view          Open ECN Viewer
 
 Flags:
-      --detached           Use/Show detached resources
       --debug              Toggle for displaying verbose output of API clients (HTTP and SSH)
   -h, --help               help for iofogctl
   -n, --namespace string   Namespace to execute respective command within (default "default")

assets/agent/install_iofog.sh

@@ -18,7 +18,29 @@ do_stop_iofog() {
 	fi
 }
 
-
+do_set_iofog_repo() {
+    echo "# Setting up Eclipse ioFog repository for $lsb_dist..."
+
+    case "$lsb_dist" in
+        fedora|centos|rhel|ol|sles|opensuse*)
+            # RPM-based distros
+            $sh_c "cd /etc/yum.repos.d && curl -s https://iofog.datasance.com/iofog.repo -LO"
+            if [ "$lsb_dist" = "fedora" ] || [ "$lsb_dist" = "centos" ] || [ "$lsb_dist" = "rhel" ] || [ "$lsb_dist" = "ol" ]; then
+                $sh_c "yum update -y"
+            else
+                $sh_c "zypper refresh"
+            fi
+        ;;
+        debian|ubuntu|raspbian|*)
+            # DEB-based distros
+            $sh_c "apt update -qy"
+            $sh_c "apt install -qy debian-archive-keyring apt-transport-https"
+            $sh_c "wget -qO- https://iofog.datasance.com/iofog.gpg | tee /etc/apt/trusted.gpg.d/iofog.gpg >/dev/null"
+            $sh_c "echo 'deb [arch=all signed-by=/etc/apt/trusted.gpg.d/iofog.gpg] https://iofog.datasance.com/deb stable main' | tee /etc/apt/sources.list.d/iofog.list >/dev/null"
+            $sh_c "apt update -qy"
+        ;;
+    esac
+}
 
 do_install_iofog() {
 	AGENT_CONFIG_FOLDER=/etc/iofog-agent
@@ -98,5 +120,9 @@ fi
 
 do_check_install
 do_stop_iofog
+# Set up Datasance repository and WASM only on package-managed OSes
+if [ "$PACKAGE_TYPE" = "deb" ] || [ "$PACKAGE_TYPE" = "rpm" ]; then
+    do_set_iofog_repo
+fi
 do_install_iofog
 do_start_iofog

go.mod

@@ -10,8 +10,8 @@ require (
 	github.com/containers/image/v5 v5.32.1
 	github.com/docker/docker v27.4.1+incompatible
 	github.com/docker/go-connections v0.5.0
-	github.com/eclipse-iofog/iofog-go-sdk/v3 v3.7.0-beta.0
-	github.com/eclipse-iofog/iofog-operator/v3 v3.7.1-beta.1
+	github.com/eclipse-iofog/iofog-go-sdk/v3 v3.7.0
+	github.com/eclipse-iofog/iofog-operator/v3 v3.7.2
 	github.com/gorilla/websocket v1.5.3
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/opencontainers/go-digest v1.0.0

go.sum

@@ -78,10 +78,10 @@ github.com/docker/go-metrics v0.0.1 h1:AgB/0SvBxihN0X8OR4SjsblXkbMvalQ8cjmtKQ2rQ
 github.com/docker/go-metrics v0.0.1/go.mod h1:cG1hvH2utMXtqgqqYE9plW6lDxS3/5ayHzueweSI3Vw=
 github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
 github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
-github.com/eclipse-iofog/iofog-go-sdk/v3 v3.7.0-beta.0 h1:wjzFAC/XeqCnlJNT6T+5wQRcevUed46eiPChQxsKnHI=
-github.com/eclipse-iofog/iofog-go-sdk/v3 v3.7.0-beta.0/go.mod h1:QMKVbhVHxFNCVTDgfg/bMsi8ZFxG1/yZgpn1RymlSQc=
-github.com/eclipse-iofog/iofog-operator/v3 v3.7.1-beta.1 h1:h6JuTQY6D9kp1JxamE9I7eCRYkhrzqqwE865yfLhxEU=
-github.com/eclipse-iofog/iofog-operator/v3 v3.7.1-beta.1/go.mod h1:r5Jp1ToVbxH1jTz7yHi9yUmdQGSzaUuF3+UR0/x9RmY=
+github.com/eclipse-iofog/iofog-go-sdk/v3 v3.7.0 h1:uxShVC0dxiDVAphCn6cNlV5m1T+ZV6aMOMVjHsPhuwE=
+github.com/eclipse-iofog/iofog-go-sdk/v3 v3.7.0/go.mod h1:QMKVbhVHxFNCVTDgfg/bMsi8ZFxG1/yZgpn1RymlSQc=
+github.com/eclipse-iofog/iofog-operator/v3 v3.7.2 h1:zIL8xM4X1wrbbPnzu/mrJ0Q5l2xN9PCjqYVo/J+xIFo=
+github.com/eclipse-iofog/iofog-operator/v3 v3.7.2/go.mod h1:9XGWMGrjCiBoSA772L1bDvjPmBX2W5j4aJI303t1NPc=
 github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g=
 github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=