From 0f98281f6c3d2c4fe66a14f28767cf969cf1d31a Mon Sep 17 00:00:00 2001 From: Gor Poghosyan Date: Wed, 5 Jun 2024 11:16:47 -0700 Subject: [PATCH] Update-2024-06-05_18:16:47 --- charts/netris-controller/Chart.yaml | 4 +- charts/netris-controller/README.md | 8 +- .../templates/netris-controller-initdb.yaml | 114 +++++++++--------- charts/netris-controller/values.yaml | 8 +- 4 files changed, 70 insertions(+), 64 deletions(-) diff --git a/charts/netris-controller/Chart.yaml b/charts/netris-controller/Chart.yaml index 1237ff6..6c65037 100644 --- 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.4 +version: 2.3.0-alpha.5 # 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.4 +appVersion: 4.3.0-alpha.5 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 index 1206475..c2c5a95 100644 --- 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-007"` | +| `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.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-009"` | +| `web-service-frontend.image.tag` | Image tag. Overrides the image tag whose default is the chart appVersion | `"4.3.0-023"` | | `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` | @@ -122,7 +122,7 @@ The following table lists the configurable parameters of the netris-controller c | -------------------------------------- | --------------------------------------------------------------------------------------------------------- | -------------------------- | | `grpc.replicaCount` | Number of replicas in grpc deployment | `1` | | `grpc.image.repository` | Image repository | `netrisai/controller-grpc` | -| `grpc.image.tag` | Image tag. Overrides the image tag whose default is the chart appVersion | `"4.3.0.001"` | +| `grpc.image.tag` | Image tag. Overrides the image tag whose default is the chart appVersion | `"4.3.0.002"` | | `grpc.image.pullPolicy` | Image pull policy | `IfNotPresent` | | `grpc.imagePullSecrets` | Reference to one or more secrets to be used when pulling images | `[]` | | `grpc.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.1.0.001"` | +| `telescope.image.tag` | Image tag. Overrides the image tag whose default is the chart appVersion | `"4.3.0.001"` | | `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 index 82e4984..e304524 100644 --- a/charts/netris-controller/templates/netris-controller-initdb.yaml +++ b/charts/netris-controller/templates/netris-controller-initdb.yaml @@ -595,16 +595,16 @@ data: DEFAULT NULL,\n `ipv4_ssh` text DEFAULT NULL,\n `ipv6_ssh` text DEFAULT NULL,\n \ `timezone` varchar(255) DEFAULT NULL,\n `ntp_servers` text DEFAULT NULL,\n \ `dns_servers` text DEFAULT NULL,\n `meta` JSON NOT NULL DEFAULT '{}',\n `created_date` - timestamp /* mariadb-5.3 */ NULL DEFAULT current_timestamp(),\n `modified_date` - timestamp /* mariadb-5.3 */ NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),\n - \ PRIMARY KEY (`id`),\n UNIQUE KEY `inv_prof_name_uniq` (`name`)\n) ENGINE=InnoDB - DEFAULT CHARSET=utf8mb4;\n/*!40101 SET character_set_client = @saved_cs_client - */;\n\n--\n-- Table structure for table `ip`\n--\n\nDROP TABLE IF EXISTS `ip`;\n/*!40101 - SET @saved_cs_client = @@character_set_client */;\n/*!40101 SET character_set_client - = utf8 */;\nCREATE TABLE `ip` (\n `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,\n - \ `parent_id` bigint(20) NOT NULL DEFAULT 0,\n `tenant_id` bigint(20) unsigned - NOT NULL,\n `name` varchar(255) DEFAULT NULL,\n `description` text DEFAULT NULL,\n - \ `prefix` varchar(100) NOT NULL,\n `length` int(10) unsigned NOT NULL,\n `ip_version` + timestamp NOT NULL DEFAULT current_timestamp(),\n `modified_date` timestamp NOT + NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),\n PRIMARY KEY + (`id`),\n UNIQUE KEY `inv_prof_name_uniq` (`name`)\n) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;\n/*!40101 + SET character_set_client = @saved_cs_client */;\n\n--\n-- Table structure for + table `ip`\n--\n\nDROP TABLE IF EXISTS `ip`;\n/*!40101 SET @saved_cs_client = + @@character_set_client */;\n/*!40101 SET character_set_client = utf8 */;\nCREATE + TABLE `ip` (\n `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,\n `parent_id` + bigint(20) NOT NULL DEFAULT 0,\n `tenant_id` bigint(20) unsigned NOT NULL,\n + \ `name` varchar(255) DEFAULT NULL,\n `description` text DEFAULT NULL,\n `prefix` + varchar(100) NOT NULL,\n `length` int(10) unsigned NOT NULL,\n `ip_version` enum('ipv4','ipv6') NOT NULL DEFAULT 'ipv4',\n `purpose` enum('common','load-balancer','loopback','mgmt','nat','bgp','endpoint') NOT NULL DEFAULT 'common',\n PRIMARY KEY (`id`),\n KEY `parent_idx` (`parent_id`),\n \ KEY `tenant_idx` (`tenant_id`),\n KEY `purpose_idx` (`purpose`),\n KEY `ipv_idx` @@ -1041,30 +1041,31 @@ data: int(10) unsigned NOT NULL DEFAULT 0,\n `state` enum('active','disabled','provisioning','hidden') NOT NULL DEFAULT 'active',\n `provisioning` int(10) unsigned NOT NULL DEFAULT 0,\n `internal` int(10) unsigned NOT NULL DEFAULT 0,\n `va_mode` int(10) unsigned - DEFAULT 0,\n `va_native_vlan` int(11) unsigned DEFAULT NULL,\n `va_vlans` text - DEFAULT NULL,\n `create_date` timestamp /* mariadb-5.3 */ NOT NULL DEFAULT current_timestamp(),\n - \ `modified_date` timestamp /* mariadb-5.3 */ NOT NULL DEFAULT current_timestamp() - ON UPDATE current_timestamp(),\n PRIMARY KEY (`id`),\n KEY `vpcid` (`vpc_id`),\n - \ CONSTRAINT `vnet_vpc_ibfk_1` FOREIGN KEY (`vpc_id`) REFERENCES `vpc` (`id`) - ON DELETE CASCADE 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 `rcircuit2member`\n--\n\nDROP TABLE IF EXISTS `rcircuit2member`;\n/*!40101 - SET @saved_cs_client = @@character_set_client */;\n/*!40101 SET character_set_client - = utf8 */;\nCREATE TABLE `rcircuit2member` (\n `id` bigint(22) unsigned NOT NULL - AUTO_INCREMENT,\n `rcircuit_id` bigint(22) unsigned NOT NULL,\n `rcircuit_member_id` - bigint(22) unsigned NOT NULL,\n PRIMARY KEY (`id`),\n UNIQUE KEY `unique_c_m` - (`rcircuit_id`,`rcircuit_member_id`),\n KEY `fk_member_idx` (`rcircuit_member_id`),\n - \ KEY `fk_circuit_idx` (`rcircuit_id`),\n CONSTRAINT `fk_circuit` FOREIGN KEY - (`rcircuit_id`) REFERENCES `rcircuit` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,\n - \ CONSTRAINT `fk_member` FOREIGN KEY (`rcircuit_member_id`) REFERENCES `rcircuit_members` - (`id`) ON DELETE CASCADE 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 `rcircuit_gw2reserved_ip`\n--\n\nDROP TABLE IF EXISTS `rcircuit_gw2reserved_ip`;\n/*!40101 - SET @saved_cs_client = @@character_set_client */;\n/*!40101 SET character_set_client - = utf8 */;\nCREATE TABLE `rcircuit_gw2reserved_ip` (\n `id` bigint(20) unsigned - NOT NULL AUTO_INCREMENT,\n `rcircuit_gw_id` bigint(22) unsigned NOT NULL,\n `ip_assignment_id` - bigint(20) unsigned NOT NULL,\n `switch_id` bigint(20) unsigned DEFAULT NULL,\n - \ PRIMARY KEY (`id`),\n UNIQUE KEY `id_UNIQUE` (`id`),\n KEY `fk_gw_idx` (`rcircuit_gw_id`),\n + DEFAULT 0,\n `l3vpn` int(10) unsigned DEFAULT 0,\n `va_native_vlan` int(11) + unsigned DEFAULT NULL,\n `va_vlans` text DEFAULT NULL,\n `create_date` timestamp + /* mariadb-5.3 */ NOT NULL DEFAULT current_timestamp(),\n `modified_date` timestamp + /* mariadb-5.3 */ NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),\n + \ PRIMARY KEY (`id`),\n KEY `vpcid` (`vpc_id`),\n CONSTRAINT `vnet_vpc_ibfk_1` + FOREIGN KEY (`vpc_id`) REFERENCES `vpc` (`id`) ON DELETE CASCADE 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 `rcircuit2member`\n--\n\nDROP TABLE IF + EXISTS `rcircuit2member`;\n/*!40101 SET @saved_cs_client = @@character_set_client + */;\n/*!40101 SET character_set_client = utf8 */;\nCREATE TABLE `rcircuit2member` + (\n `id` bigint(22) unsigned NOT NULL AUTO_INCREMENT,\n `rcircuit_id` bigint(22) + unsigned NOT NULL,\n `rcircuit_member_id` bigint(22) unsigned NOT NULL,\n PRIMARY + KEY (`id`),\n UNIQUE KEY `unique_c_m` (`rcircuit_id`,`rcircuit_member_id`),\n + \ KEY `fk_member_idx` (`rcircuit_member_id`),\n KEY `fk_circuit_idx` (`rcircuit_id`),\n + \ CONSTRAINT `fk_circuit` FOREIGN KEY (`rcircuit_id`) REFERENCES `rcircuit` (`id`) + ON DELETE CASCADE ON UPDATE CASCADE,\n CONSTRAINT `fk_member` FOREIGN KEY (`rcircuit_member_id`) + REFERENCES `rcircuit_members` (`id`) ON DELETE CASCADE 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 `rcircuit_gw2reserved_ip`\n--\n\nDROP + TABLE IF EXISTS `rcircuit_gw2reserved_ip`;\n/*!40101 SET @saved_cs_client = + @@character_set_client */;\n/*!40101 SET character_set_client = utf8 */;\nCREATE + TABLE `rcircuit_gw2reserved_ip` (\n `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,\n + \ `rcircuit_gw_id` bigint(22) unsigned NOT NULL,\n `ip_assignment_id` bigint(20) + unsigned NOT NULL,\n `switch_id` bigint(20) unsigned DEFAULT NULL,\n PRIMARY + KEY (`id`),\n UNIQUE KEY `id_UNIQUE` (`id`),\n KEY `fk_gw_idx` (`rcircuit_gw_id`),\n \ KEY `fk_switch_idx` (`switch_id`),\n CONSTRAINT `fk_gw` FOREIGN KEY (`rcircuit_gw_id`) REFERENCES `circuit_gateways` (`id`) ON DELETE CASCADE ON UPDATE CASCADE\n) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;\n/*!40101 SET character_set_client = @saved_cs_client @@ -1425,26 +1426,31 @@ data: TABLE `optimistic_locks` DISABLE KEYS */;\nINSERT INTO `optimistic_locks` VALUES ('port_reservation',0),('vlan_reservation',0),('vxlan_reservation',0),('asn_reservation',0);\n/*!40000 ALTER TABLE `optimistic_locks` ENABLE KEYS */;\nUNLOCK TABLES;\n/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE - */;\n\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' + */;\n\n--\n-- Table structure for table `license`\n--\n\nDROP TABLE IF EXISTS + `license`;\n/*!40101 SET @saved_cs_client = @@character_set_client */;\n/*!40101 + SET character_set_client = utf8 */;\nCREATE TABLE `license` (\n `id` bigint(20) + 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' */ ;\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 index 44130d8..0b92f64 100644 --- 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-007" + tag: "4.3.0-014" 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-009" + tag: "4.3.0-023" imagePullSecrets: [] @@ -132,7 +132,7 @@ grpc: repository: netrisai/controller-grpc pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. - tag: "4.3.0.001" + tag: "4.3.0.002" imagePullSecrets: [] @@ -156,7 +156,7 @@ telescope: repository: netrisai/controller-telescope pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. - tag: "4.1.0.001" + tag: "4.3.0.001" imagePullSecrets: []