Align with Tumblebug v0.9.6

cloud-barista · Aug 21, 2024 · e85492c · e85492c
2 parents 266011f + e5cdca1
commit e85492c
Show file tree

Hide file tree

Showing 25 changed files with 185 additions and 185 deletions.
diff --git a/api/docs.go b/api/docs.go
@@ -580,23 +580,23 @@ const docTemplate = `{
                     "example": "no"
                 },
                 "label": {
-                    "description": "Label is for describing the mcis in a keyword (any string can be used)",
+                    "description": "Label is for describing the mci in a keyword (any string can be used)",
                     "type": "string",
                     "example": "DynamicVM"
                 },
                 "name": {
                     "type": "string",
-                    "example": "mcis01"
+                    "example": "mci01"
                 },
                 "systemLabel": {
-                    "description": "SystemLabel is for describing the mcis in a keyword (any string can be used) for special System purpose",
+                    "description": "SystemLabel is for describing the mci in a keyword (any string can be used) for special System purpose",
                     "type": "string",
                     "example": ""
                 },
                 "vm": {
                     "type": "array",
                     "items": {
-                        "$ref": "#/definitions/mcis.TbVmDynamicReq"
+                        "$ref": "#/definitions/mci.TbVmDynamicReq"
                     }
                 }
             }
@@ -623,23 +623,23 @@ const docTemplate = `{
                     "example": "no"
                 },
                 "label": {
-                    "description": "Label is for describing the mcis in a keyword (any string can be used)",
+                    "description": "Label is for describing the mci in a keyword (any string can be used)",
                     "type": "string",
                     "example": "DynamicVM"
                 },
                 "name": {
                     "type": "string",
-                    "example": "mcis01"
+                    "example": "mci01"
                 },
                 "systemLabel": {
-                    "description": "SystemLabel is for describing the mcis in a keyword (any string can be used) for special System purpose",
+                    "description": "SystemLabel is for describing the mci in a keyword (any string can be used) for special System purpose",
                     "type": "string",
                     "example": ""
                 },
                 "vm": {
                     "type": "array",
                     "items": {
-                        "$ref": "#/definitions/mcis.TbVmDynamicReq"
+                        "$ref": "#/definitions/mci.TbVmDynamicReq"
                     }
                 }
             }
@@ -708,23 +708,23 @@ const docTemplate = `{
                     "example": "no"
                 },
                 "label": {
-                    "description": "Label is for describing the mcis in a keyword (any string can be used)",
+                    "description": "Label is for describing the mci in a keyword (any string can be used)",
                     "type": "string",
                     "example": "DynamicVM"
                 },
                 "name": {
                     "type": "string",
-                    "example": "mcis01"
+                    "example": "mci01"
                 },
                 "systemLabel": {
-                    "description": "SystemLabel is for describing the mcis in a keyword (any string can be used) for special System purpose",
+                    "description": "SystemLabel is for describing the mci in a keyword (any string can be used) for special System purpose",
                     "type": "string",
                     "example": ""
                 },
                 "vm": {
                     "type": "array",
                     "items": {
-                        "$ref": "#/definitions/mcis.TbVmDynamicReq"
+                        "$ref": "#/definitions/mci.TbVmDynamicReq"
                     }
                 }
             }
@@ -1129,7 +1129,7 @@ const docTemplate = `{
                 }
             }
         },
-        "mcis.TbVmDynamicReq": {
+        "mci.TbVmDynamicReq": {
             "type": "object",
             "required": [
                 "commonImage",
@@ -1176,7 +1176,7 @@ const docTemplate = `{
                     "example": "default, TYPE1, ..."
                 },
                 "subGroupSize": {
-                    "description": "if subGroupSize is (not empty) \u0026\u0026 (\u003e 0), subGroup will be gernetad. VMs will be created accordingly.",
+                    "description": "if subGroupSize is (not empty) \u0026\u0026 (\u003e 0), subGroup will be generated. VMs will be created accordingly.",
                     "type": "string",
                     "default": "1",
                     "example": "3"

diff --git a/api/swagger.json b/api/swagger.json
@@ -573,23 +573,23 @@
                     "example": "no"
                 },
                 "label": {
-                    "description": "Label is for describing the mcis in a keyword (any string can be used)",
+                    "description": "Label is for describing the mci in a keyword (any string can be used)",
                     "type": "string",
                     "example": "DynamicVM"
                 },
                 "name": {
                     "type": "string",
-                    "example": "mcis01"
+                    "example": "mci01"
                 },
                 "systemLabel": {
-                    "description": "SystemLabel is for describing the mcis in a keyword (any string can be used) for special System purpose",
+                    "description": "SystemLabel is for describing the mci in a keyword (any string can be used) for special System purpose",
                     "type": "string",
                     "example": ""
                 },
                 "vm": {
                     "type": "array",
                     "items": {
-                        "$ref": "#/definitions/mcis.TbVmDynamicReq"
+                        "$ref": "#/definitions/mci.TbVmDynamicReq"
                     }
                 }
             }
@@ -616,23 +616,23 @@
                     "example": "no"
                 },
                 "label": {
-                    "description": "Label is for describing the mcis in a keyword (any string can be used)",
+                    "description": "Label is for describing the mci in a keyword (any string can be used)",
                     "type": "string",
                     "example": "DynamicVM"
                 },
                 "name": {
                     "type": "string",
-                    "example": "mcis01"
+                    "example": "mci01"
                 },
                 "systemLabel": {
-                    "description": "SystemLabel is for describing the mcis in a keyword (any string can be used) for special System purpose",
+                    "description": "SystemLabel is for describing the mci in a keyword (any string can be used) for special System purpose",
                     "type": "string",
                     "example": ""
                 },
                 "vm": {
                     "type": "array",
                     "items": {
-                        "$ref": "#/definitions/mcis.TbVmDynamicReq"
+                        "$ref": "#/definitions/mci.TbVmDynamicReq"
                     }
                 }
             }
@@ -701,23 +701,23 @@
                     "example": "no"
                 },
                 "label": {
-                    "description": "Label is for describing the mcis in a keyword (any string can be used)",
+                    "description": "Label is for describing the mci in a keyword (any string can be used)",
                     "type": "string",
                     "example": "DynamicVM"
                 },
                 "name": {
                     "type": "string",
-                    "example": "mcis01"
+                    "example": "mci01"
                 },
                 "systemLabel": {
-                    "description": "SystemLabel is for describing the mcis in a keyword (any string can be used) for special System purpose",
+                    "description": "SystemLabel is for describing the mci in a keyword (any string can be used) for special System purpose",
                     "type": "string",
                     "example": ""
                 },
                 "vm": {
                     "type": "array",
                     "items": {
-                        "$ref": "#/definitions/mcis.TbVmDynamicReq"
+                        "$ref": "#/definitions/mci.TbVmDynamicReq"
                     }
                 }
             }
@@ -1122,7 +1122,7 @@
                 }
             }
         },
-        "mcis.TbVmDynamicReq": {
+        "mci.TbVmDynamicReq": {
             "type": "object",
             "required": [
                 "commonImage",
@@ -1169,7 +1169,7 @@
                     "example": "default, TYPE1, ..."
                 },
                 "subGroupSize": {
-                    "description": "if subGroupSize is (not empty) \u0026\u0026 (\u003e 0), subGroup will be gernetad. VMs will be created accordingly.",
+                    "description": "if subGroupSize is (not empty) \u0026\u0026 (\u003e 0), subGroup will be generated. VMs will be created accordingly.",
                     "type": "string",
                     "default": "1",
                     "example": "3"

diff --git a/api/swagger.yaml b/api/swagger.yaml
@@ -46,21 +46,21 @@ definitions:
         example: "no"
         type: string
       label:
-        description: Label is for describing the mcis in a keyword (any string can
+        description: Label is for describing the mci in a keyword (any string can
           be used)
         example: DynamicVM
         type: string
       name:
-        example: mcis01
+        example: mci01
         type: string
       systemLabel:
-        description: SystemLabel is for describing the mcis in a keyword (any string
+        description: SystemLabel is for describing the mci in a keyword (any string
           can be used) for special System purpose
         example: ""
         type: string
       vm:
         items:
-          $ref: '#/definitions/mcis.TbVmDynamicReq'
+          $ref: '#/definitions/mci.TbVmDynamicReq'
         type: array
     required:
     - name
@@ -81,21 +81,21 @@ definitions:
         example: "no"
         type: string
       label:
-        description: Label is for describing the mcis in a keyword (any string can
+        description: Label is for describing the mci in a keyword (any string can
           be used)
         example: DynamicVM
         type: string
       name:
-        example: mcis01
+        example: mci01
         type: string
       systemLabel:
-        description: SystemLabel is for describing the mcis in a keyword (any string
+        description: SystemLabel is for describing the mci in a keyword (any string
           can be used) for special System purpose
         example: ""
         type: string
       vm:
         items:
-          $ref: '#/definitions/mcis.TbVmDynamicReq'
+          $ref: '#/definitions/mci.TbVmDynamicReq'
         type: array
     required:
     - name
@@ -143,21 +143,21 @@ definitions:
         example: "no"
         type: string
       label:
-        description: Label is for describing the mcis in a keyword (any string can
+        description: Label is for describing the mci in a keyword (any string can
           be used)
         example: DynamicVM
         type: string
       name:
-        example: mcis01
+        example: mci01
         type: string
       systemLabel:
-        description: SystemLabel is for describing the mcis in a keyword (any string
+        description: SystemLabel is for describing the mci in a keyword (any string
           can be used) for special System purpose
         example: ""
         type: string
       vm:
         items:
-          $ref: '#/definitions/mcis.TbVmDynamicReq'
+          $ref: '#/definitions/mci.TbVmDynamicReq'
         type: array
     required:
     - name
@@ -429,7 +429,7 @@ definitions:
     required:
     - os
     type: object
-  mcis.TbVmDynamicReq:
+  mci.TbVmDynamicReq:
     properties:
       commonImage:
         description: CommonImage is field for id of a image in common namespace
@@ -470,7 +470,7 @@ definitions:
         type: string
       subGroupSize:
         default: "1"
-        description: if subGroupSize is (not empty) && (> 0), subGroup will be gernetad.
+        description: if subGroupSize is (not empty) && (> 0), subGroup will be generated.
           VMs will be created accordingly.
         example: "3"
         type: string

diff --git a/conf/config.yaml b/conf/config.yaml
@@ -42,7 +42,7 @@ beetle:
   logfile:
     # Set log file path (default logfile path: ./log/beetle.log)
     path: ./log/beetle.log
-    maxsize: 10
+    maxsize: 1000
     maxbackups: 3
     maxage: 30
     compress: false

diff --git a/conf/setup.env b/conf/setup.env
@@ -30,7 +30,7 @@ export BEETLE_SQLITE_PASSWORD=cm_beetle
 ## Logger configuration
 # Set log file path (default logfile path: ./log/beetle.log) 
 export BEETLE_LOGFILE_PATH=log/beetle.log
-export BEETLE_LOGFILE_MAXSIZE=10
+export BEETLE_LOGFILE_MAXSIZE=1000
 export BEETLE_LOGFILE_MAXBACKUPS=3
 export BEETLE_LOGFILE_MAXAGE=30
 export BEETLE_LOGFILE_COMPRESS=false

diff --git a/conf/template-config.yaml b/conf/template-config.yaml
@@ -42,7 +42,7 @@ beetle:
   logfile:
     # Set log file path (default logfile path: ./log/beetle.log)
     path: ./log/beetle.log
-    maxsize: 10
+    maxsize: 100
     maxbackups: 3
     maxage: 30
     compress: false

diff --git a/conf/template-setup.env b/conf/template-setup.env
@@ -30,7 +30,7 @@ export BEETLE_SQLITE_PASSWORD=cm_beetle
 ## Logger configuration
 # Set log file path (default logfile path: ./beetle.log) 
 export BEETLE_LOGFILE_PATH=beetle.log
-export BEETLE_LOGFILE_MAXSIZE=10
+export BEETLE_LOGFILE_MAXSIZE=100
 export BEETLE_LOGFILE_MAXBACKUPS=3
 export BEETLE_LOGFILE_MAXAGE=30
 export BEETLE_LOGFILE_COMPRESS=false

diff --git a/deployments/docker-compose/docker-compose.yaml b/deployments/docker-compose/docker-compose.yaml
@@ -73,7 +73,8 @@ services:
 
   # CB-Spider
   cb-spider:
-    image: cloudbaristaorg/cb-spider:0.9.0
+    # image: cloudbaristaorg/cb-spider:0.9.0
+    image: cloudbaristaorg/cb-spider:edge
     container_name: cb-spider
     platform: linux/amd64
     ports:
@@ -103,7 +104,7 @@ services:
 
   # CB-Tumblebug
   cb-tumblebug:
-    image: cloudbaristaorg/cb-tumblebug:0.9.2
+    image: cloudbaristaorg/cb-tumblebug:0.9.6
     container_name: cb-tumblebug
     platform: linux/amd64
     ports:
@@ -138,7 +139,7 @@ services:
       # - TB_DEFAULT_NAMESPACE=ns01
       # - TB_DEFAULT_CREDENTIALHOLDER=admin
       # - TB_LOGFILE_PATH=/app/log/tumblebug.log
-      # - TB_LOGFILE_MAXSIZE=10
+      - TB_LOGFILE_MAXSIZE=1000
       # - TB_LOGFILE_MAXBACKUPS=3
       # - TB_LOGFILE_MAXAGE=30
       # - TB_LOGFILE_COMPRESS=false
@@ -201,7 +202,7 @@ services:
 
   # cb-mapui (optionally use)
   cb-mapui:
-    image: cloudbaristaorg/cb-mapui:0.9.0
+    image: cloudbaristaorg/cb-mapui:0.9.3
     container_name: cb-mapui
     ports:
       - target: 1324