Skip to content

Commit

Permalink
Update-2023-09-25_21:55:32
Browse files Browse the repository at this point in the history
  • Loading branch information
@pogossian
pogossian committed Sep 25, 2023
1 parent c220c80 commit b1cb043
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 20 deletions.
6 changes: 4 additions & 2 deletions charts/netris-controller/Chart.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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: 1.4.4
version: 1.4.5-rc.0

# 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: 3.4.3
appVersion: 3.4.4-rc.0
home: https://netris.ai
icon: https://www.netris.ai/wp-content/uploads/2021/01/logo-300.png # [todo] Change url to permalink
keywords:
Expand Down Expand Up @@ -53,3 +53,5 @@ dependencies:
- name: graphite
version: 0.7.2
repository: https://kiwigrid.github.io
annotations:
artifacthub.io/prerelease: "true"
10 changes: 5 additions & 5 deletions charts/netris-controller/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 | `"3.4.3-001"` |
| `web-service-backend.image.tag` | Image tag. Overrides the image tag whose default is the chart appVersion | `"3.4.4-004"` |
| `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` |
Expand All @@ -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 | `"3.4.2-001"` |
| `web-service-frontend.image.tag` | Image tag. Overrides the image tag whose default is the chart appVersion | `"3.4.4-004"` |
| `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` |
Expand All @@ -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 | `"3.4.3.001"` |
| `grpc.image.tag` | Image tag. Overrides the image tag whose default is the chart appVersion | `"3.4.4.001"` |
| `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` |
Expand Down Expand Up @@ -199,7 +199,7 @@ The following table lists the configurable parameters of the netris-controller c
| ----------------------------------------------------- | --------------------------------------------------------------------------------------------------------- | -------------------------- |
| `phoenixnap-bmc-agent.enabled` | Enable phoenixnap-bmc-agent deployment | `true` |
| `phoenixnap-bmc-agent.image.repository` | Image repository | `netrisai/bare-metal-phoenixnap-bmc-agent` |
| `phoenixnap-bmc-agent.image.tag` | Image tag. Overrides the image tag whose default is the chart appVersion | `"0.4.0"` |
| `phoenixnap-bmc-agent.image.tag` | Image tag. Overrides the image tag whose default is the chart appVersion | `"0.5.1"` |
| `phoenixnap-bmc-agent.image.pullPolicy` | Image pull policy | `IfNotPresent` |
| `phoenixnap-bmc-agent.imagePullSecrets` | Reference to one or more secrets to be used when pulling images | `[]` |

Expand All @@ -208,7 +208,7 @@ The following table lists the configurable parameters of the netris-controller c
| Parameter | Description | Default |
| ---------------------------------| ----------------------------------------------------------------------------- | ------------------------------------------- |
| `migration.image.repository` | Image repository | `netrisai/controller-web-service-migration` |
| `migration.image.tag` | Image tag. Overrides the image tag whose default is the chart appVersion | `"3.4.2"` |
| `migration.image.tag` | Image tag. Overrides the image tag whose default is the chart appVersion | `"3.4.4"` |
| `migration.image.pullPolicy` | Image pull policy | `IfNotPresent` |
| `migration.imagePullSecrets` | Reference to one or more secrets to be used when pulling images | `[]` |

Expand Down
17 changes: 9 additions & 8 deletions charts/netris-controller/templates/netris-controller-initdb.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -804,9 +804,10 @@ data:
'disabled',\n `rp_id` bigint(22) NOT NULL DEFAULT 1,\n `acl_policy` enum('deny','permit')
NOT NULL DEFAULT 'deny',\n `switch_fabric` enum('netris', 'equinix_metal', 'dot1q_trunk',
'phoenixnap_bmc') NOT NULL DEFAULT 'netris',\n `vlan_range` VARCHAR(100) NOT
NULL DEFAULT '1-4094',\n `meta` JSON NULL DEFAULT '{}',\n PRIMARY KEY (`id`),\n
\ UNIQUE KEY `id_UNIQUE` (`id`),\n UNIQUE KEY `name_UNIQUE` (`name`)\n) ENGINE=InnoDB
DEFAULT CHARSET=utf8;\n/*!40101 SET character_set_client = @saved_cs_client */;\n\n--\n--
NULL DEFAULT '1-4094',\n `vlan_range_auto_assign` varchar(100) NOT NULL DEFAULT
'2-4094',\n `meta` JSON NULL DEFAULT '{}',\n PRIMARY KEY (`id`),\n UNIQUE KEY
`id_UNIQUE` (`id`),\n UNIQUE KEY `name_UNIQUE` (`name`)\n) ENGINE=InnoDB DEFAULT
CHARSET=utf8;\n/*!40101 SET character_set_client = @saved_cs_client */;\n\n--\n--
Table structure for table `net_vpn`\n--\n\nDROP TABLE IF EXISTS `net_vpn`;\n/*!40101
SET @saved_cs_client = @@character_set_client */;\n/*!40101 SET character_set_client
= utf8 */;\nCREATE TABLE `net_vpn` (\n `id` bigint(20) NOT NULL AUTO_INCREMENT,\n
Expand Down Expand Up @@ -1604,7 +1605,7 @@ data:
INSERT INTO `global_settings` VALUES (36,'wireguard_port_range','59000-60999','VPN peers port range','true');
INSERT INTO `global_settings` VALUES (37,'k8s_lb_check_timeout','2000','K8s Layer 4 load-balancer timeout (ms)','true');
INSERT INTO `global_settings` VALUES (38,'vpn_measurement_wait_secs','30','Site Mesh measurement module wait interval (sec)','true');
INSERT INTO `global_settings` VALUES (39,'migration_version', '3.4.2', 'Database scheme version', 'false');
INSERT INTO `global_settings` VALUES (39,'migration_version', '3.4.4', 'Database scheme version', 'false');
INSERT INTO `global_settings` VALUES (40,'system_asn_range', '4200000000 - 4209999999', 'System ASN range', 'true');
INSERT INTO `global_settings` VALUES (41,'vpn_asn_range', '4210000000 - 4219999999', 'Site Mesh VPN ASN range', 'true');
INSERT INTO `global_settings` VALUES (42,'calico_asn_range', '4230000000 - 4239999999', 'Calico ASN range', 'true');
Expand Down Expand Up @@ -1652,10 +1653,10 @@ data:
INSERT INTO `roh_profiles` VALUES (1,'Default','default');
INSERT INTO `roh_profiles` VALUES (2,'Default + Aggregates','default_agg');
INSERT INTO `roh_profiles` VALUES (3,'Full table','full_table');
sites.sql: "USE {{ .Values.mariadb.auth.database }};\nINSERT INTO `net_pops` (`id`,
`name`, `asn`, `physical_instance_asn`, `virtual_instance_asn`, `vpn`, `rp_id`,
`acl_policy`, `switch_fabric`, `vlan_range`) \n VALUES (1, 'Default',
65000, 65500, 65501, 'disabled', 1, 'permit', 'dot1q_trunk', '700-900');\n"
sites.sql: |
USE {{ .Values.mariadb.auth.database }};
INSERT INTO `net_pops` (`id`, `name`, `asn`, `physical_instance_asn`, `virtual_instance_asn`, `vpn`, `rp_id`, `acl_policy`, `switch_fabric`, `vlan_range`, `vlan_range_auto_assign`)
VALUES (1, 'Default', 65000, 65500, 65501, 'disabled', 1, 'permit', 'dot1q_trunk', '2-4094', '700-900');
subnets.sql: |
USE {{ .Values.mariadb.auth.database }};
-- allocations (id,parent_id,allocation_id,name,description,tenant_id,ip_version,purpose,readonly,prefix,length,meta)
Expand Down
10 changes: 5 additions & 5 deletions charts/netris-controller/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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: "3.4.3-001"
tag: "3.4.4-004"

imagePullSecrets: []

Expand All @@ -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: "3.4.2-001"
tag: "3.4.4-004"

imagePullSecrets: []

Expand All @@ -132,7 +132,7 @@ grpc:
repository: netrisai/controller-grpc
pullPolicy: IfNotPresent
# Overrides the image tag whose default is the chart appVersion.
tag: "3.4.3.001"
tag: "3.4.4.001"

imagePullSecrets: []

Expand Down Expand Up @@ -235,7 +235,7 @@ phoenixnap-bmc-agent:
repository: netrisai/bare-metal-phoenixnap-bmc-agent
pullPolicy: IfNotPresent
# Overrides the image tag whose default is the chart appVersion.
tag: "0.4.0"
tag: "0.5.1"

imagePullSecrets: []

Expand All @@ -244,7 +244,7 @@ migration:
image:
repository: netrisai/controller-web-service-migration
pullPolicy: IfNotPresent
tag: "3.4.2"
tag: "3.4.4"


## Using default values from https://github.com/bitnami/charts/tree/master/bitnami/mariadb/values.yaml
Expand Down

0 comments on commit b1cb043

Please sign in to comment.