Update-2024-06-11_20:37:08

netrisai · Jun 11, 2024 · d540abf · d540abf
1 parent beed29f
commit d540abf
Show file tree

Hide file tree

Showing 4 changed files with 83 additions and 32 deletions.
diff --git a/charts/netris-controller/Chart.yaml b/charts/netris-controller/Chart.yaml
@@ -15,13 +15,13 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 2.3.0-alpha.6
+version: 2.3.0-alpha.7
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: 4.3.0-alpha.6
+appVersion: 4.3.0-alpha.7
 home: https://netris.ai
 icon: https://www.netris.ai/wp-content/uploads/2021/01/logo-300.png  # [todo] Change url to permalink
 keywords:

diff --git a/charts/netris-controller/README.md b/charts/netris-controller/README.md
@@ -89,7 +89,7 @@ The following table lists the configurable parameters of the netris-controller c
 | ------------------------------------------------------------------| --------------------------------------------------------------------------------------------------------- | --------------------------------- |
 | `web-service-backend.replicaCount`                                | Number of replicas in web-service-backend deployment                                                      | `1`                               |
 | `web-service-backend.image.repository`                            | Image repository                                                                                          | `netrisai/controller-web-service-backend` |
-| `web-service-backend.image.tag`                                   | Image tag. Overrides the image tag whose default is the chart appVersion                                  | `"4.3.0-014"`                         |
+| `web-service-backend.image.tag`                                   | Image tag. Overrides the image tag whose default is the chart appVersion                                  | `"4.3.0-015"`                         |
 | `web-service-backend.image.pullPolicy`                            | Image pull policy                                                                                         | `IfNotPresent`                    |
 | `web-service-backend.imagePullSecrets`                            | Reference to one or more secrets to be used when pulling images                                           | `[]`                              |
 | `web-service-backend.service.type`                                | Kubernetes service type 	                                                                                | `ClusterIP`                       |
@@ -105,7 +105,7 @@ The following table lists the configurable parameters of the netris-controller c
 | ------------------------------------------------------------------| --------------------------------------------------------------------------------------------------------- | --------------------------------- |
 | `web-service-frontend.replicaCount`                               | Number of replicas in web-service-frontend deployment                                                     | `1`                               |
 | `web-service-frontend.image.repository`                           | Image repository                                                                                          | `netrisai/controller-web-service-frontend` |
-| `web-service-frontend.image.tag`                                  | Image tag. Overrides the image tag whose default is the chart appVersion                                  | `"4.3.0-024"`                         |
+| `web-service-frontend.image.tag`                                  | Image tag. Overrides the image tag whose default is the chart appVersion                                  | `"4.3.0-026"`                         |
 | `web-service-frontend.image.pullPolicy`                           | Image pull policy                                                                                         | `IfNotPresent`                    |
 | `web-service-frontend.imagePullSecrets`                           | Reference to one or more secrets to be used when pulling images                                           | `[]`                              |
 | `web-service-frontend.service.type`                               | Kubernetes service type 	                                                                                | `ClusterIP`                       |
@@ -139,7 +139,7 @@ The following table lists the configurable parameters of the netris-controller c
 | ------------------------------------- | --------------------------------------------------------------------------------------------------------- | -------------------------- |
 | `telescope.replicaCount`                    | Number of replicas in telescope deployment                                                          | `1`                        |
 | `telescope.image.repository`                | Image repository                                                                                          | `netrisai/controller-telescope` |
-| `telescope.image.tag`                       | Image tag. Overrides the image tag whose default is the chart appVersion                                  | `"4.3.0.001"`                       |
+| `telescope.image.tag`                       | Image tag. Overrides the image tag whose default is the chart appVersion                                  | `"4.3.0.002"`                       |
 | `telescope.image.pullPolicy`                | Image pull policy                                                                                         | `IfNotPresent`             |
 | `telescope.imagePullSecrets`                | Reference to one or more secrets to be used when pulling images                                           | `[]`                       |
 | `telescope.service.type`                    | Kubernetes service type 	                                                                                | `ClusterIP`                |

diff --git a/charts/netris-controller/templates/netris-controller-initdb.yaml b/charts/netris-controller/templates/netris-controller-initdb.yaml
@@ -1411,11 +1411,11 @@ data:
     SET @saved_cs_client     = @@character_set_client */;\n/*!40101 SET character_set_client
     = utf8 */;\nCREATE TABLE `tag_reservation` (\n  `id` bigint(20) unsigned NOT NULL
     AUTO_INCREMENT,\n  `tag_id` bigint(20) unsigned NOT NULL,\n  `resource_id` bigint(20)
-    unsigned NOT NULL,\n  `resource_type` enum('hw','vnet','roh','bgp','vpc') DEFAULT
-    NULL,\n  `meta` longtext NOT NULL DEFAULT '{}' CHECK (json_valid(`meta`)),\n  PRIMARY
-    KEY (`id`),\n  KEY `pairs_idx` (`tag_id`,`resource_id`) USING BTREE,\n  CONSTRAINT
-    `fk1` FOREIGN KEY (`tag_id`) REFERENCES `tag` (`id`) ON DELETE RESTRICT ON UPDATE
-    CASCADE\n) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;\n/*!40101 SET character_set_client
+    unsigned NOT NULL,\n  `resource_type` enum('hw','vnet','roh','bgp','vpc','servercluster')
+    DEFAULT NULL,\n  `meta` longtext NOT NULL DEFAULT '{}' CHECK (json_valid(`meta`)),\n
+    \ PRIMARY KEY (`id`),\n  KEY `pairs_idx` (`tag_id`,`resource_id`) USING BTREE,\n
+    \ CONSTRAINT `fk1` FOREIGN KEY (`tag_id`) REFERENCES `tag` (`id`) ON DELETE RESTRICT
+    ON UPDATE CASCADE\n) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;\n/*!40101 SET character_set_client
     = @saved_cs_client */;\n\n--\n-- Table structure for table `optimistic_locks`\n--\n\nDROP
     TABLE IF EXISTS `optimistic_locks`;\n/*!40101 SET @saved_cs_client     = @@character_set_client
     */;\n/*!40101 SET character_set_client = utf8 */;\nCREATE TABLE `optimistic_locks`
@@ -1432,25 +1432,76 @@ data:
     unsigned NOT NULL AUTO_INCREMENT,\n  `lkey` text NOT NULL,\n  PRIMARY KEY (`id`)\n)
     ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;\n/*!40101 SET
     character_set_client = @saved_cs_client */;\n\n--\n-- Table structure for table
-    `mac_address`\n--\n\nDROP TABLE IF EXISTS `mac_address`;\n/*!40101 SET @saved_cs_client
-    \    = @@character_set_client */;\n/*!40101 SET character_set_client = utf8 */;\nCREATE
-    TABLE `mac_address` (\n  `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,\n  `host_id`
-    bigint(20) unsigned NOT NULL,\n  `mac` varchar(20) NOT NULL,\n  `state` enum('active','deleted')
-    NOT NULL DEFAULT 'active',\n  `source` enum('none','dhcp','arp') NOT NULL DEFAULT
-    'none',\n  `created_date` timestamp NOT NULL DEFAULT current_timestamp(),\n  `modified_date`
-    timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),\n
-    \ PRIMARY KEY (`id`),\n  KEY `host_id_idx` (`host_id`),\n  KEY `mac_address_idx`
-    (`mac`),\n  KEY `state_source_idx` (`state`,`source`),\n  CONSTRAINT `host_id`
-    FOREIGN KEY (`host_id`) REFERENCES `ip_host` (`id`) ON DELETE CASCADE ON UPDATE
-    CASCADE\n) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;\n/*!40101 SET character_set_client
-    = @saved_cs_client */;\n\n\nLOCK TABLES `mac_address` WRITE;\n/*!40000 ALTER TABLE
-    `mac_address` DISABLE KEYS */;\n/*!40000 ALTER TABLE `mac_address` ENABLE KEYS
-    */;\nUNLOCK TABLES;\n/*!50003 SET @saved_cs_client      = @@character_set_client
-    */ ;\n/*!50003 SET @saved_cs_results     = @@character_set_results */ ;\n/*!50003
-    SET @saved_col_connection = @@collation_connection */ ;\n/*!50003 SET character_set_client
-    \ = utf8 */ ;\n/*!50003 SET character_set_results = utf8 */ ;\n/*!50003 SET collation_connection
-    \ = utf8_general_ci */ ;\n/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;\n/*!50003
-    SET sql_mode              = 'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION'
+    `srv_cluster_template`\n--\n\nDROP TABLE IF EXISTS `srv_cluster_template`;\n/*!40101
+    SET @saved_cs_client     = @@character_set_client */;\n/*!40101 SET character_set_client
+    = utf8 */;\nCREATE TABLE `srv_cluster_template` (\n  `id` bigint(20) unsigned
+    NOT NULL AUTO_INCREMENT,\n  `name` varchar(100) NOT NULL,\n  `create_date` timestamp
+    NOT NULL DEFAULT current_timestamp(),\n  `modified_date` timestamp NULL DEFAULT
+    current_timestamp() ON UPDATE current_timestamp(),\n  PRIMARY KEY (`id`)\n) ENGINE=InnoDB
+    DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;\n/*!40101 SET character_set_client
+    = @saved_cs_client */;\n\n--\n-- Table structure for table `srv_cluster_template_rel`\n--\n\nDROP
+    TABLE IF EXISTS `srv_cluster_template_rel`;\n/*!40101 SET @saved_cs_client     =
+    @@character_set_client */;\n/*!40101 SET character_set_client = utf8 */;\nCREATE
+    TABLE `srv_cluster_template_rel` (\n  `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,\n
+    \ `template_id` bigint(20) unsigned NOT NULL,\n  `template_props_id` bigint(20)
+    unsigned NOT NULL,\n  PRIMARY KEY (`id`),\n  KEY `srvcls_tid_idx` (`template_id`),\n
+    \ KEY `srvcls_oid_idx` (`template_props_id`),\n  KEY `srvcls_tid_oid_idx` (`template_id`,`template_props_id`),\n
+    \ CONSTRAINT `srvcls_obj_id_fk` FOREIGN KEY (`template_props_id`) REFERENCES `srv_cluster_template_props`
+    (`id`) ON DELETE CASCADE ON UPDATE CASCADE,\n  CONSTRAINT `srvcls_tmpl_id_fk`
+    FOREIGN KEY (`template_id`) REFERENCES `srv_cluster_template` (`id`) ON DELETE
+    CASCADE ON UPDATE CASCADE\n) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;\n/*!40101
+    SET character_set_client = @saved_cs_client */;\n\n--\n-- Table structure for
+    table `srv_cluster_template_props`\n--\n\nDROP TABLE IF EXISTS `srv_cluster_template_props`;\n/*!40101
+    SET @saved_cs_client     = @@character_set_client */;\n/*!40101 SET character_set_client
+    = utf8 */;\nCREATE TABLE `srv_cluster_template_props` (\n  `id` bigint(20) unsigned
+    NOT NULL AUTO_INCREMENT,\n  `type` enum('vnet') NOT NULL,\n  `props` longtext
+    CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '{}' CHECK (json_valid(`props`)),\n
+    \ PRIMARY KEY (`id`),\n  KEY `srvcls_tmpl_obj_type_idx` (`type`)\n) ENGINE=InnoDB
+    DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;\n/*!40101 SET character_set_client
+    = @saved_cs_client */;\n/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;\n\n--\n-- Table
+    structure for table `srv_cluster_service_rel`\n--\n\nDROP TABLE IF EXISTS `srv_cluster_service_rel`;\n/*!40101
+    SET @saved_cs_client     = @@character_set_client */;\n/*!40101 SET character_set_client
+    = utf8 */;\nCREATE TABLE `srv_cluster_service_rel` (\n  `id` bigint(20) unsigned
+    NOT NULL AUTO_INCREMENT,\n  `cluster_id` bigint(20) unsigned NOT NULL,\n  `cluster_svc_id`
+    bigint(20) unsigned NOT NULL,\n  `srv_cls_templ_props_id` bigint(20) unsigned
+    DEFAULT NULL,\n  `type` enum('vnet','hw','allocation','subnet') NOT NULL,\n  PRIMARY
+    KEY (`id`),\n  KEY `sctpid_idx` (`srv_cls_templ_props_id`),\n  KEY `cid_svcid_idx`
+    (`cluster_id`,`cluster_svc_id`),\n  CONSTRAINT `srvcls_id_fk` FOREIGN KEY (`cluster_id`)
+    REFERENCES `srv_cluster` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,\n  CONSTRAINT
+    `srvcls_tmpl_props_id_fk` FOREIGN KEY (`srv_cls_templ_props_id`) REFERENCES `srv_cluster_template_props`
+    (`id`) ON DELETE CASCADE ON UPDATE CASCADE\n) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4
+    COLLATE=utf8mb4_general_ci;\n/*!40101 SET character_set_client = @saved_cs_client
+    */;\n\n--\n-- Table structure for table `srv_cluster`\n--\n\nDROP TABLE IF EXISTS
+    `srv_cluster`;\n/*!40101 SET @saved_cs_client     = @@character_set_client */;\n/*!40101
+    SET character_set_client = utf8 */;\nCREATE TABLE `srv_cluster` (\n  `id` bigint(20)
+    unsigned NOT NULL AUTO_INCREMENT,\n  `name` varchar(100) NOT NULL,\n  `tenant_id`
+    bigint(20) unsigned NOT NULL,\n  `site_id` bigint(20) unsigned NOT NULL,\n  `vpc_id`
+    bigint(20) unsigned NOT NULL,\n  `template_id` bigint(20) unsigned NOT NULL,\n
+    \ `create_date` timestamp NOT NULL DEFAULT current_timestamp(),\n  `modified_date`
+    timestamp NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),\n  PRIMARY
+    KEY (`id`),\n  KEY `srv_cls_tmpl_id_fk` (`template_id`),\n  CONSTRAINT `srv_cls_tmpl_id_fk`
+    FOREIGN KEY (`template_id`) REFERENCES `srv_cluster_template` (`id`)\n) ENGINE=InnoDB
+    DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;\n\n--\n-- Table structure
+    for table `mac_address`\n--\n\nDROP TABLE IF EXISTS `mac_address`;\n/*!40101 SET
+    @saved_cs_client     = @@character_set_client */;\n/*!40101 SET character_set_client
+    = utf8 */;\nCREATE TABLE `mac_address` (\n  `id` bigint(20) unsigned NOT NULL
+    AUTO_INCREMENT,\n  `host_id` bigint(20) unsigned NOT NULL,\n  `mac` varchar(20)
+    NOT NULL,\n  `state` enum('active','deleted') NOT NULL DEFAULT 'active',\n  `source`
+    enum('none','dhcp','arp') NOT NULL DEFAULT 'none',\n  `created_date` timestamp
+    NOT NULL DEFAULT current_timestamp(),\n  `modified_date` timestamp NOT NULL DEFAULT
+    current_timestamp() ON UPDATE current_timestamp(),\n  PRIMARY KEY (`id`),\n  KEY
+    `host_id_idx` (`host_id`),\n  KEY `mac_address_idx` (`mac`),\n  KEY `state_source_idx`
+    (`state`,`source`),\n  CONSTRAINT `host_id` FOREIGN KEY (`host_id`) REFERENCES
+    `ip_host` (`id`) ON DELETE CASCADE ON UPDATE CASCADE\n) ENGINE=InnoDB DEFAULT
+    CHARSET=utf8mb4;\n/*!40101 SET character_set_client = @saved_cs_client */;\n\n\nLOCK
+    TABLES `mac_address` WRITE;\n/*!40000 ALTER TABLE `mac_address` DISABLE KEYS */;\n/*!40000
+    ALTER TABLE `mac_address` ENABLE KEYS */;\nUNLOCK TABLES;\n/*!50003 SET @saved_cs_client
+    \     = @@character_set_client */ ;\n/*!50003 SET @saved_cs_results     = @@character_set_results
+    */ ;\n/*!50003 SET @saved_col_connection = @@collation_connection */ ;\n/*!50003
+    SET character_set_client  = utf8 */ ;\n/*!50003 SET character_set_results = utf8
+    */ ;\n/*!50003 SET collation_connection  = utf8_general_ci */ ;\n/*!50003 SET
+    @saved_sql_mode       = @@sql_mode */ ;\n/*!50003 SET sql_mode              =
+    'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION'
     */ ;\nDELIMITER ;;\n/*!50003 CREATE TRIGGER `dhcp-lease-delete` AFTER DELETE ON
     `mac_address` \nFOR EACH ROW BEGIN\n    SELECT count(id) INTO @UsedHostCount FROM
     `mac_address` WHERE `host_id` = OLD.host_id;\n    IF @UsedHostCount = 0\n    THEN\n

diff --git a/charts/netris-controller/values.yaml b/charts/netris-controller/values.yaml
@@ -83,7 +83,7 @@ web-service-backend:
     repository: netrisai/controller-web-service-backend
     pullPolicy: IfNotPresent
     # Overrides the image tag whose default is the chart appVersion.
-    tag: "4.3.0-014"
+    tag: "4.3.0-015"
 
   imagePullSecrets: []
 
@@ -108,7 +108,7 @@ web-service-frontend:
     repository: netrisai/controller-web-service-frontend
     pullPolicy: IfNotPresent
     # Overrides the image tag whose default is the chart appVersion.
-    tag: "4.3.0-024"
+    tag: "4.3.0-026"
 
   imagePullSecrets: []
 
@@ -156,7 +156,7 @@ telescope:
     repository: netrisai/controller-telescope
     pullPolicy: IfNotPresent
     # Overrides the image tag whose default is the chart appVersion.
-    tag: "4.3.0.001"
+    tag: "4.3.0.002"
 
   imagePullSecrets: []