From 6483a6223f1209ed3b04a767d8aa6f8381862cd3 Mon Sep 17 00:00:00 2001 From: Gor Poghosyan Date: Tue, 2 Jul 2024 15:24:39 -0700 Subject: [PATCH] Update-2024-07-02_22:24:39 --- charts/netris-controller/Chart.yaml | 4 ++-- charts/netris-controller/README.md | 4 ++-- .../templates/netris-controller-initdb.yaml | 22 +++++++++---------- charts/netris-controller/values.yaml | 4 ++-- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/charts/netris-controller/Chart.yaml b/charts/netris-controller/Chart.yaml index 766f192..64db72b 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.8 +version: 2.3.0-alpha.9 # 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.8 +appVersion: 4.3.0-alpha.9 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 c618d9e..96ac969 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-024"` | +| `web-service-backend.image.tag` | Image tag. Overrides the image tag whose default is the chart appVersion | `"4.3.0-026"` | | `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-034"` | +| `web-service-frontend.image.tag` | Image tag. Overrides the image tag whose default is the chart appVersion | `"4.3.0-036"` | | `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` | diff --git a/charts/netris-controller/templates/netris-controller-initdb.yaml b/charts/netris-controller/templates/netris-controller-initdb.yaml index 15b5bdb..066826c 100644 --- a/charts/netris-controller/templates/netris-controller-initdb.yaml +++ b/charts/netris-controller/templates/netris-controller-initdb.yaml @@ -14,15 +14,15 @@ data: Table structure for table `users`\n--\n\nDROP TABLE IF EXISTS `users`;\n/*!40101 SET @saved_cs_client = @@character_set_client */;\n/*!40101 SET character_set_client = utf8 */;\nCREATE TABLE `users` (\n `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,\n - \ `login` varchar(50) NOT NULL,\n `password` varchar(255) DEFAULT NULL,\n `name` - varchar(255) DEFAULT NULL,\n `email` varchar(255) DEFAULT NULL,\n `email_cc` - varchar(255) DEFAULT NULL,\n `role_id` bigint(20) unsigned DEFAULT NULL,\n `master` - int(11) NOT NULL DEFAULT 0,\n `phone` varchar(255) DEFAULT NULL,\n `position` - varchar(255) DEFAULT NULL,\n `company` varchar(255) DEFAULT NULL,\n `ims` varchar(255) - DEFAULT NULL,\n `perm_id` bigint(20) unsigned DEFAULT NULL,\n `auth_scheme_id` - bigint(20) NOT NULL DEFAULT 1,\n `email_notification` enum('enabled','disabled') - NOT NULL DEFAULT 'enabled',\n `options` text NOT NULL DEFAULT '{}',\n `notification_subscription` - varchar(512) NOT NULL DEFAULT '{\"approvals\":\"true\",\"telescope\":\"true\"}',\n + \ `login` varchar(50) NOT NULL,\n `password` varchar(255) DEFAULT NULL,\n `salt` + varchar(255) DEFAULT NULL,\n `name` varchar(255) DEFAULT NULL,\n `email` varchar(255) + DEFAULT NULL,\n `email_cc` varchar(255) DEFAULT NULL,\n `role_id` bigint(20) + unsigned DEFAULT NULL,\n `master` int(11) NOT NULL DEFAULT 0,\n `phone` varchar(255) + DEFAULT NULL,\n `position` varchar(255) DEFAULT NULL,\n `company` varchar(255) + DEFAULT NULL,\n `ims` varchar(255) DEFAULT NULL,\n `perm_id` bigint(20) unsigned + DEFAULT NULL,\n `auth_scheme_id` bigint(20) NOT NULL DEFAULT 1,\n `email_notification` + enum('enabled','disabled') NOT NULL DEFAULT 'enabled',\n `options` text NOT NULL + DEFAULT '{}',\n `notification_subscription` varchar(512) NOT NULL DEFAULT '{\"approvals\":\"true\",\"telescope\":\"true\"}',\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 UNIQUE KEY `login` (`login`),\n KEY `role_id` (`role_id`)\n) ENGINE=InnoDB @@ -1734,8 +1734,8 @@ data: INSERT INTO `tenants` VALUES (2,'DevOps',0,0,0,0,0,'region',1,10,0,'public','2019-01-15 09:37:34','2020-07-14 19:00:02','DevOps Resources'); 01-users.sql: | USE {{ .Values.mariadb.auth.database }}; - INSERT INTO `users` VALUES (1,'{{ .Values.netris.webLogin }}','{{ .Values.netris.webPassword | sha1sum }}','Netris','info@netris.local','',NULL,0,'','','Netris',NULL,0,1,'disabled','','{"approvals":"false","telescope":"false"}', NULL, NULL); - INSERT INTO `users` VALUES (2,'system',NULL,'System Generated','system@netris.local','',NULL,0,'','','Netris',NULL,0,1,'disabled','','{"approvals":"false","telescope":"false"}', NULL, NULL); + INSERT INTO `users` VALUES (1,'{{ .Values.netris.webLogin }}','{{ .Values.netris.webPassword | sha1sum }}',NULL,'Netris','info@netris.local','',NULL,0,'','','Netris',NULL,0,1,'disabled','','{"approvals":"false","telescope":"false"}', NULL, NULL); + INSERT INTO `users` VALUES (2,'system',NULL,NULL,'System Generated','system@netris.local','',NULL,0,'','','Netris',NULL,0,1,'disabled','','{"approvals":"false","telescope":"false"}', NULL, NULL); INSERT INTO `user_to_tenant` VALUES (1,1,0,'w'); INSERT INTO `user_to_tenant` VALUES (2,2,0,'w'); diff --git a/charts/netris-controller/values.yaml b/charts/netris-controller/values.yaml index a51b317..c08d9a4 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-024" + tag: "4.3.0-026" 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-034" + tag: "4.3.0-036" imagePullSecrets: []