Cleanup (#169)

* removed node abstraction, and added --filter to executor ls

* Add cleanup process submission on blueprint deletion and fix executor location config

* improved conr

* fixing test

* fixing test

Author: johankristianss

Makefile

@@ -2,7 +2,7 @@ all: build
 .PHONY: all build
 
 BUILD_IMAGE ?= colonyos/colonies
-PUSH_IMAGE ?= colonyos/colonies:v1.9.3
+PUSH_IMAGE ?= colonyos/colonies:v1.9.4
 
 VERSION := $(shell git rev-parse --short HEAD)
 BUILDTIME := $(shell date -u '+%Y-%m-%dT%H:%M:%SZ')

deployment/blueprints/README.md

@@ -18,15 +18,15 @@ Deploys a docker executor specifically on the **local/main node**.
 
 **Key Settings:**
 - `executorType`: `docker-reconciler` - Requires a docker-reconciler
-- `executorName`: `local-node-docker-reconciler` - Targets the main node
+- `executorName`: `local-docker-reconciler` - Targets the main node
 - `replicas`: 1 - Single executor instance
 
 **Deploy:**
 ```bash
 colonies blueprint add --spec local-docker-executor-deployment.json
 ```
 
-**Result:** The deployment will run specifically on the `local-node-docker-reconciler` (main node from colonies docker-compose).
+**Result:** The deployment will run specifically on the `local-docker-reconciler` (main node from colonies docker-compose).
 
 ## Executor Targeting Examples
 
@@ -39,7 +39,7 @@ colonies blueprint add --spec local-docker-executor-deployment.json
   },
   "spec": {
     "executorType": "docker-reconciler",
-    "executorName": "local-node-docker-reconciler"  // Main node
+    "executorName": "local-docker-reconciler"  // Main node
   }
 }
 ```
@@ -72,15 +72,15 @@ colonies blueprint add --spec local-docker-executor-deployment.json
   },
   "spec": {
     "executorType": "docker-reconciler",
-    "executorName": "local-node-docker-reconciler"  // Specific node
+    "executorName": "local-docker-reconciler"  // Specific node
   }
 }
 ```
 ✅ Guaranteed deployment on specific node
 ⚠️ Fails if that reconciler is down
 
 **Available reconcilers in default setup:**
-- `local-node-docker-reconciler` - Main node (in colonies docker-compose)
+- `local-docker-reconciler` - Main node (in colonies docker-compose)
 - `docker-reconciler-edge` - Edge node (in docker-reconciler docker-compose)
 
 ### Example 3: Target Edge Node

deployment/blueprints/local-docker-executor-deployment.json

@@ -1,10 +1,10 @@
 {
   "kind": "ExecutorDeployment",
   "metadata": {
-    "name": "docker-executor"
+    "name": "local-docker-executor"
   },
   "handler": {
-    "executorName": "local-node-docker-reconciler"
+    "executorName": "local-docker-reconciler"
   },
   "spec": {
     "image": "colonyos/dockerexecutor:v1.0.7",

docker-compose.env

@@ -30,7 +30,6 @@ export COLONIES_SERVER_BACKENDS="http"
 # Configuration for the HTTP/REST API server backend
 export COLONIES_SERVER_HTTP_HOST="0.0.0.0"       # Host to bind HTTP server (0.0.0.0 = all interfaces)
 export COLONIES_SERVER_HTTP_PORT="50080"         # HTTP server port
-export COLONIES_SERVER_HTTP_TLS="false"          # Enable TLS for HTTP
 # export COLONIES_SERVER_HTTP_TLS_CERT="/path/to/cert.pem"  # TLS certificate (if TLS enabled)
 # export COLONIES_SERVER_HTTP_TLS_KEY="/path/to/key.pem"    # TLS key (if TLS enabled)
 # ============================================================================
@@ -61,7 +60,6 @@ export COLONIES_CLIENT_LIBP2P_BOOTSTRAP_PEERS="/ip4/46.62.173.145/udp/4002/quic-
 # ============================================================================
 # Configuration for the gRPC server backend
 export COLONIES_SERVER_GRPC_PORT="50051"         # gRPC server port
-export COLONIES_SERVER_GRPC_INSECURE="true"      # Run without TLS (set to false for production)
 # export COLONIES_SERVER_GRPC_TLS_CERT="/path/to/cert.pem"  # TLS certificate (required if INSECURE=false)
 # export COLONIES_SERVER_GRPC_TLS_KEY="/path/to/key.pem"    # TLS key (required if INSECURE=false)
 # ============================================================================
@@ -96,10 +94,11 @@ export COLONIES_MONITOR_INTERVAL="1"
 export COLONIES_CLIENT_BACKENDS="http"
 export COLONIES_CLIENT_HTTP_HOST="localhost"
 export COLONIES_CLIENT_HTTP_PORT="50080"
-export COLONIES_CLIENT_HTTP_INSECURE="true"
 export COLONIES_CLIENT_GRPC_HOST="localhost"
 export COLONIES_CLIENT_GRPC_PORT="50051"
-export COLONIES_CLIENT_GRPC_INSECURE="true"
+
+# TLS configuration (false = HTTP, true = HTTPS)
+export COLONIES_TLS="false"
 
 # DHT discovery:
 # - Client will automatically find servers advertising on the DHT

docker-compose.yml

@@ -51,17 +51,14 @@ services:
       "
 
   colonies-server:
-    image: colonyos/colonies:v1.9.3
+    image: colonyos/colonies:v1.9.4
     depends_on:
       - timescaledb
     environment:
       COLONIES_SERVER_BACKENDS: ${COLONIES_SERVER_BACKENDS}
-      COLONIES_SERVER_HTTP_TLS: ${COLONIES_SERVER_HTTP_TLS}
       COLONIES_SERVER_HTTP_PORT: ${COLONIES_SERVER_HTTP_PORT}
       COLONIES_SERVER_GRPC_PORT: ${COLONIES_SERVER_GRPC_PORT}
-      COLONIES_SERVER_GRPC_INSECURE: ${COLONIES_SERVER_GRPC_INSECURE}
-      COLONIES_SERVER_GRPC_TLS_CERT: ${COLONIES_SERVER_GRPC_TLS_CERT:-}
-      COLONIES_SERVER_GRPC_TLS_KEY: ${COLONIES_SERVER_GRPC_TLS_KEY:-}
+      COLONIES_TLS: "false"
       COLONIES_SERVER_LIBP2P_PORT: ${COLONIES_SERVER_LIBP2P_PORT}
       COLONIES_SERVER_LIBP2P_IDENTITY: ${COLONIES_SERVER_LIBP2P_IDENTITY}
       COLONIES_SERVER_COAP_PORT: ${COLONIES_SERVER_COAP_PORT}
@@ -97,26 +94,23 @@ services:
     command: sh -c "colonies server start --initdb --port ${COLONIES_SERVER_HTTP_PORT} --relayport 25100 --etcdname server1 --etcdhost colonies-server --etcdclientport 23100 --etcdpeerport 24100 --initial-cluster server1=colonies-server:24100:25100:${COLONIES_SERVER_HTTP_PORT} --etcddatadir /var/colonies/etcd --insecure"
 
   colonies-setup:
-    image: colonyos/colonies:v1.9.3
+    image: colonyos/colonies:v1.9.4
     depends_on:
       - colonies-server
     environment:
       COLONIES_CLIENT_BACKENDS: "http"
       # HTTP client config (inside docker, always use colonies-server as host)
       COLONIES_CLIENT_HTTP_HOST: "colonies-server"
       COLONIES_CLIENT_HTTP_PORT: ${COLONIES_SERVER_HTTP_PORT}
-      COLONIES_CLIENT_HTTP_INSECURE: "true"
       # gRPC client config (inside docker, always use colonies-server as host)
       COLONIES_CLIENT_GRPC_HOST: "colonies-server"
       COLONIES_CLIENT_GRPC_PORT: ${COLONIES_SERVER_GRPC_PORT}
-      COLONIES_CLIENT_GRPC_INSECURE: "true"
       # LibP2P client config
       COLONIES_CLIENT_LIBP2P_HOST: "/dns/colonies-server/tcp/${COLONIES_SERVER_LIBP2P_PORT}/p2p/12D3KooWSBx1mxbu7rJ8AMsSGHDhG8GRhwqHSVnHPbhZypPLFjgK"
       COLONIES_CLIENT_LIBP2P_BOOTSTRAP_PEERS: ${COLONIES_CLIENT_LIBP2P_BOOTSTRAP_PEERS}
       # Backward compatibility (hardcode colonies-server for docker containers)
       COLONIES_SERVER_HOST: "colonies-server"
       COLONIES_SERVER_PORT: ${COLONIES_SERVER_HTTP_PORT}
-      COLONIES_SERVER_TLS: "false"
       COLONIES_TLS: "false"
       # Server and auth config
       COLONIES_SERVER_ID: ${COLONIES_SERVER_ID}
@@ -147,7 +141,7 @@ services:
       "
 
   docker-reconciler:
-    image: colonyos/docker-reconciler:v1.0.5
+    image: colonyos/docker-reconciler:v1.0.6
     container_name: docker-reconciler
     restart: unless-stopped
     depends_on:
@@ -158,28 +152,22 @@ services:
       # HTTP client config (inside docker, always use colonies-server as host)
       COLONIES_CLIENT_HTTP_HOST: "colonies-server"
       COLONIES_CLIENT_HTTP_PORT: ${COLONIES_SERVER_HTTP_PORT}
-      COLONIES_CLIENT_HTTP_INSECURE: "true"
       # gRPC client config (inside docker, always use colonies-server as host)
       COLONIES_CLIENT_GRPC_HOST: "colonies-server"
       COLONIES_CLIENT_GRPC_PORT: ${COLONIES_SERVER_GRPC_PORT}
-      COLONIES_CLIENT_GRPC_INSECURE: "true"
       # LibP2P client config
       COLONIES_CLIENT_LIBP2P_HOST: "/dns/colonies-server/tcp/${COLONIES_SERVER_LIBP2P_PORT}/p2p/12D3KooWSBx1mxbu7rJ8AMsSGHDhG8GRhwqHSVnHPbhZypPLFjgK"
       COLONIES_CLIENT_LIBP2P_BOOTSTRAP_PEERS: ${COLONIES_CLIENT_LIBP2P_BOOTSTRAP_PEERS}
       # Backward compatibility (hardcode colonies-server for docker containers)
       COLONIES_SERVER_HOST: "colonies-server"
       COLONIES_SERVER_PORT: ${COLONIES_SERVER_HTTP_PORT}
-      COLONIES_SERVER_TLS: "false"
       COLONIES_TLS: "false"
       # Auth config
       COLONIES_COLONY_NAME: ${COLONIES_COLONY_NAME}
       COLONIES_COLONY_PRVKEY: ${COLONIES_COLONY_PRVKEY}
       COLONIES_EXECUTOR_TYPE: "docker-reconciler"
-      COLONIES_EXECUTOR_NAME: "local-node-docker-reconciler"
-      COLONIES_INSECURE: "true"
-      # Node config - Fixed node name to prevent new nodes on restart
-      COLONIES_NODE_NAME: "local-node"
-      COLONIES_NODE_LOCATION: "local-node"
+      COLONIES_EXECUTOR_NAME: "local-docker-reconciler"
+      COLONIES_EXECUTOR_LOCATION: "local"
       # S3/MinIO config for auto-injection into deployed containers
       AWS_S3_ENDPOINT: "minio:9000"
       AWS_S3_ACCESSKEY: "RrXN2vcLeHjBptG8a3Ay"

internal/cli/blueprint.go

@@ -113,14 +113,14 @@ var addBlueprintDefinitionCmd = &cobra.Command{
 		CheckError(err)
 
 		// Set colony name if not specified
-		if sd.Metadata.Namespace == "" {
-			sd.Metadata.Namespace = ColonyName
+		if sd.Metadata.ColonyName == "" {
+			sd.Metadata.ColonyName = ColonyName
 		}
 
 		addedSD, err := client.AddBlueprintDefinition(&sd, ColonyPrvKey)
 		if err != nil {
 			if strings.Contains(err.Error(), "duplicate key") {
-				CheckError(errors.New("BlueprintDefinition with name '" + sd.Metadata.Name + "' already exists in colony '" + sd.Metadata.Namespace + "'"))
+				CheckError(errors.New("BlueprintDefinition with name '" + sd.Metadata.Name + "' already exists in colony '" + sd.Metadata.ColonyName + "'"))
 			}
 			CheckError(err)
 		}
@@ -131,7 +131,7 @@ var addBlueprintDefinitionCmd = &cobra.Command{
 			"Kind":                 addedSD.Spec.Names.Kind,
 			"Group":                addedSD.Spec.Group,
 			"Version":              addedSD.Spec.Version,
-			"ColonyName":           addedSD.Metadata.Namespace,
+			"ColonyName":           addedSD.Metadata.ColonyName,
 		}).Info("BlueprintDefinition added")
 
 	},
@@ -155,7 +155,7 @@ var getBlueprintDefinitionCmd = &cobra.Command{
 			"BlueprintDefinitionID": sd.ID,
 			"Name":                 sd.Metadata.Name,
 			"Kind":                 sd.Spec.Names.Kind,
-			"ColonyName":           sd.Metadata.Namespace,
+			"ColonyName":           sd.Metadata.ColonyName,
 		}).Info("BlueprintDefinition retrieved")
 
 		if JSON {
@@ -232,8 +232,8 @@ var addBlueprintCmd = &cobra.Command{
 		CheckError(err)
 
 		// Set namespace (colony name) if not specified
-		if blueprint.Metadata.Namespace == "" {
-			blueprint.Metadata.Namespace = ColonyName
+		if blueprint.Metadata.ColonyName == "" {
+			blueprint.Metadata.ColonyName = ColonyName
 		}
 
 		addedBlueprint, err := client.AddBlueprint(&blueprint, PrvKey)
@@ -243,7 +243,7 @@ var addBlueprintCmd = &cobra.Command{
 			"BlueprintID": addedBlueprint.ID,
 			"Name":       addedBlueprint.Metadata.Name,
 			"Kind":       addedBlueprint.Kind,
-			"Namespace":  addedBlueprint.Metadata.Namespace,
+			"Namespace":  addedBlueprint.Metadata.ColonyName,
 		}).Info("Blueprint added")
 
 	},
@@ -267,7 +267,7 @@ var getBlueprintCmd = &cobra.Command{
 			"BlueprintID": blueprint.ID,
 			"Name":       blueprint.Metadata.Name,
 			"Kind":       blueprint.Kind,
-			"Namespace":  blueprint.Metadata.Namespace,
+			"Namespace":  blueprint.Metadata.ColonyName,
 		}).Info("Blueprint retrieved")
 
 		if JSON {
@@ -328,8 +328,8 @@ var updateBlueprintCmd = &cobra.Command{
 		CheckError(err)
 
 		// Set namespace (colony name) if not specified
-		if blueprint.Metadata.Namespace == "" {
-			blueprint.Metadata.Namespace = ColonyName
+		if blueprint.Metadata.ColonyName == "" {
+			blueprint.Metadata.ColonyName = ColonyName
 		}
 
 		updatedBlueprint, err := client.UpdateBlueprint(&blueprint, PrvKey)

internal/cli/blueprint_table.go

@@ -179,14 +179,47 @@ func printBlueprintsTableWithClient(c *client.ColoniesClient, blueprints []*core
 	var cols = []table.Column{
 		{ID: "name", Name: "Name", SortIndex: 1},
 		{ID: "kind", Name: "Kind", SortIndex: 2},
-		{ID: "replicas", Name: "Replicas", SortIndex: 3},
-		{ID: "reconciling", Name: "Reconciling", SortIndex: 4},
-		{ID: "oldgen", Name: "OldGen", SortIndex: 5},
-		{ID: "generation", Name: "Gen", SortIndex: 6},
+		{ID: "reconciler", Name: "Reconciler", SortIndex: 3},
+		{ID: "replicas", Name: "Replicas", SortIndex: 4},
+		{ID: "reconciling", Name: "Reconciling", SortIndex: 5},
+		{ID: "oldgen", Name: "OldGen", SortIndex: 6},
+		{ID: "generation", Name: "Gen", SortIndex: 7},
 	}
 	t.SetCols(cols)
 
+	// Build map of Kind -> ExecutorType from BlueprintDefinitions
+	kindToExecutorType := make(map[string]string)
+	if c != nil && len(blueprints) > 0 {
+		defs, err := c.GetBlueprintDefinitions(ColonyName, PrvKey)
+		if err == nil {
+			for _, def := range defs {
+				if def.Spec.Handler.ExecutorType != "" {
+					kindToExecutorType[def.Spec.Names.Kind] = def.Spec.Handler.ExecutorType
+				}
+			}
+		}
+	}
+
 	for _, blueprint := range blueprints {
+		// Get reconciler name from handler or definition
+		reconcilerStr := "-"
+		if blueprint.Handler != nil {
+			if blueprint.Handler.ExecutorName != "" {
+				reconcilerStr = blueprint.Handler.ExecutorName
+			} else if len(blueprint.Handler.ExecutorNames) > 0 {
+				reconcilerStr = blueprint.Handler.ExecutorNames[0]
+				if len(blueprint.Handler.ExecutorNames) > 1 {
+					reconcilerStr += "..."
+				}
+			}
+		}
+		// Fall back to executor type from definition
+		if reconcilerStr == "-" {
+			if execType, ok := kindToExecutorType[blueprint.Kind]; ok {
+				reconcilerStr = "[" + execType + "]"
+			}
+		}
+
 		// Get replica information
 		replicasStr := "-"
 		reconcilingStr := "-"
@@ -325,6 +358,7 @@ func printBlueprintsTableWithClient(c *client.ColoniesClient, blueprints []*core
 		row := []interface{}{
 			termenv.String(blueprint.Metadata.Name).Foreground(theme.ColorCyan),
 			termenv.String(blueprint.Kind).Foreground(theme.ColorViolet),
+			termenv.String(reconcilerStr).Foreground(theme.ColorBlue),
 			termenv.String(replicasStr).Foreground(theme.ColorMagenta),
 			termenv.String(reconcilingStr).Foreground(getReconcilingColor(reconcilingStr, theme)),
 			termenv.String(oldGenStr).Foreground(getOldGenColor(oldGenStr, theme)),

internal/cli/common.go

@@ -198,7 +198,8 @@ func parseEnv() {
 		CheckError(err)
 	}
 
-	TLSEnv := os.Getenv("COLONIES_SERVER_TLS")
+	// COLONIES_TLS controls whether to use HTTPS (true) or HTTP (false)
+	TLSEnv := os.Getenv("COLONIES_TLS")
 	if TLSEnv == "true" {
 		UseTLS = true
 		Insecure = false