Skip to content

Commit afb1393

Browse files
author
CluedIn CI
committed
Release 3.7.0
1 parent 6ea3bb3 commit afb1393

File tree

9 files changed

+4
-71
lines changed

9 files changed

+4
-71
lines changed

‎clusterenv/default/.env

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ CLUEDIN_SUBMITTER_IMAGE_VERSION=latest
3131
CLUEDIN_UI_IMAGE_VERSION=latest
3232
CLUEDIN_VALUES_APPLICATION=
3333
CLUEDIN_VALUES_INFRASTRUCTURE=
34-
CLUEDIN_WEBAPI_IMAGE_VERSION=
3534
CLUSTER_CA_CERTIFICATE_SECRET_NAME=ca-key-pair
3635
CLUSTER_DOCKER_PASSWORD=
3736
CLUSTER_DOCKER_REGISTRY_SERVER=https://index.docker.io/v1/

‎docker/compose/docker-compose.server.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ services:
4747
- CLUEDIN_CONNECTIONSTRINGS__WEBAPPSTORE=Data Source=${CLUEDIN_SQLSERVER_HOST};Initial Catalog=DataStore.Db.WebApp;User Id=${CLUEDIN_SQLSERVER_USER};Password=${CLUEDIN_SQLSERVER_PASS};MultipleActiveResultSets=True;connection timeout=0;Max Pool Size=200;Pooling=True
4848
- CLUEDIN_CONNECTIONSTRINGS__MICROSERVICES=Data Source=${CLUEDIN_SQLSERVER_HOST};Initial Catalog=DataStore.Db.MicroServices;User Id=${CLUEDIN_SQLSERVER_USER};Password=${CLUEDIN_SQLSERVER_PASS};MultipleActiveResultSets=True;connection timeout=0;Max Pool Size=200;Pooling=True
4949
- CLUEDIN_CONNECTIONSTRINGS__CLEANCACHE=Data Source=${CLUEDIN_SQLSERVER_HOST};Initial Catalog=DataStore.Db.CleanCache;User Id=${CLUEDIN_SQLSERVER_USER};Password=${CLUEDIN_SQLSERVER_PASS};MultipleActiveResultSets=True;connection timeout=0;Max Pool Size=200;Pooling=True
50+
- CLUEDIN_CONNECTIONSTRINGS__INVITATIONSTORE=Data Source=${CLUEDIN_SQLSERVER_HOST};Initial Catalog=DataStore.Db.WebApp;User Id=${CLUEDIN_SQLSERVER_USER};Password=${CLUEDIN_SQLSERVER_PASS};MultipleActiveResultSets=True;connection timeout=0;Max Pool Size=200;Pooling=True
5051
- CLUEDIN_APPSETTINGS__AGENT_ENABLED=${CLUEDIN_AGENT_ENABLED}
5152
- CLUEDIN_APPSETTINGS__MODELS_ENABLED=${CLUEDIN_MODELS_ENABLED:-false}
5253
- DOTNET_ENVIRONMENT=${CLUEDIN_ENVIRONMENT}

‎docker/compose/docker-compose.ui.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ services:
2020
- REACT_APP_UI_MAIN_DOMAIN=${CLUEDIN_DOMAIN}:${CLUEDIN_UI_LOCALPORT:-9080}
2121
- REACT_APP_UI_PROTOCOL=http://
2222
- REACT_APP_UI_UPLOAD_LIMIT=${CLUEDIN_UI_UPLOAD_LIMIT:-1gb}
23+
- REACT_APP_UI_CLUEDIN_PUBLICAPI_URL=http://localhost:9007
2324
depends_on:
2425
- server
2526
deploy:
@@ -37,7 +38,6 @@ services:
3738
- "MICRO_DATASOURCE_URL=http://${CLUEDIN_DATASOURCE_HOST:-datasource}:${CLUEDIN_DATASOURCE_PORT:-8888}"
3839
- "MICRO_SUBMITTER_URL=http://${CLUEDIN_SUBMITTER_HOST:-submitter}:${CLUEDIN_SUBMITTER_PORT:-9012}"
3940
- "MICRO_DOCUMENTATION_URL=http://${CLUEDIN_DOCUMENTATION_HOST:-documentation}:${CLUEDIN_DOCUMENTATION_PORT:-8888}"
40-
- "APP_API_URL=http://${CLUEDIN_WEBAPI_HOST:-webapi}:9008/"
4141
- "PUBLIC_API=http://${CLUEDIN_SERVER_HOST:-server}:9007/"
4242
- "WEBHOOKS_URL=http://${CLUEDIN_SERVER_HOST:-server}:9006/"
4343
- "NODE_ENV=${CLUEDIN_ENVIRONMENT}"
@@ -63,7 +63,6 @@ services:
6363
- annotation
6464
- clean
6565
- datasource
66-
- webapi
6766
- sqlserver
6867
deploy:
6968
restart_policy:

‎docker/compose/docker-compose.webapi.yml

Lines changed: 0 additions & 39 deletions
This file was deleted.

‎env/default/.env

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,3 @@ CLUEDIN_UI_FEATURES_USERS=users
123123
CLUEDIN_UI_LOCALPORT=9080
124124
CLUEDIN_UI_TAG=latest
125125
CLUEDIN_UI_UPLOAD_LIMIT=1gb
126-
CLUEDIN_WEBAPI_HOST=
127-
CLUEDIN_WEBAPI_LOCALPORT=
128-
CLUEDIN_WEBAPI_TAG=latest

‎env/default/grafana/cadvisor.json

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -314,14 +314,9 @@
314314
"selected": false,
315315
"text": "ui",
316316
"value": "ui"
317-
},
318-
{
319-
"selected": false,
320-
"text": "webapi",
321-
"value": "webapi"
322317
}
323318
],
324-
"query": "annotation,clean,datasource,elasticsearch,grafana,neo4j,openrefine,prometheus,rabbitmq,redis,seq,server,sqlserver,submitter,ui,webapi",
319+
"query": "annotation,clean,datasource,elasticsearch,grafana,neo4j,openrefine,prometheus,rabbitmq,redis,seq,server,sqlserver,submitter,ui",
325320
"queryValue": "",
326321
"skipUrlSync": false,
327322
"type": "custom"

‎powershell/checks.ps1

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ function Test-Environment {
8181
[PortCheck]::new('CluedIn Jobs', $envDetails.CLUEDIN_SERVER_JOB_LOCALPORT ?? 9003, $cluedinDomain)
8282
[PortCheck]::new('CluedIn WebHooks', $envDetails.CLUEDIN_SERVER_WEBHOOK_LOCALPORT ?? 9006, $cluedinDomain)
8383
[PortCheck]::new('CluedIn Public', $envDetails.CLUEDIN_SERVER_PUBLIC_LOCALPORT ?? 9007, $cluedinDomain)
84-
[PortCheck]::new('CluedIn Web Api', $envDetails.CLUEDIN_WEBAPI_LOCALPORT ?? 9008, $cluedinDomain)
8584
[PortCheck]::new('CluedIn Clean', $envDetails.CLUEDIN_CLEAN_LOCALPORT ?? 9009, $cluedinDomain)
8685
[PortCheck]::new('CluedIn Annotation', $envDetails.CLUEDIN_ANNOTATION_LOCALPORT ?? 9010, $cluedinDomain)
8786
[PortCheck]::new('CluedIn Datasource', $envDetails.CLUEDIN_DATASOURCE_LOCALPORT ?? 9011, $cluedinDomain)
@@ -181,7 +180,6 @@ function Test-InstanceStatus {
181180
cluedin_325_61ef0f49_sqlserver_1 sh -c /init/init.sh Up 0.0.0.0:1433->1433/tcp,:::1433->1433/tcp
182181
cluedin_325_61ef0f49_submitter_1 dotnet CluedIn.MicroServic ... Up 0.0.0.0:9012->8888/tcp,:::9012->8888/tcp
183182
cluedin_325_61ef0f49_ui_1 /docker-entrypoint.sh /ent ... Up 80/tcp, 0.0.0.0:9080->8080/tcp,:::9080->8080/tcp
184-
cluedin_325_61ef0f49_webapi_1 dotnet CluedIn.App.dll Up 0.0.0.0:9008->9008/tcp,:::9008->9008/tcp
185183
186184
Running CluedIn instance status
187185

‎powershell/doctor.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ function Invoke-ClusterDoctor
209209
$statefulSets = @()
210210

211211
$deployments320 = @("$prefix-webapi","$prefix-ui","$prefix-clean","$prefix-gql","$prefix-datasource","$prefix-annotation","$prefix-cluedin","$prefix-submitter")
212-
$deployments322 = @('cluedin-webapi','cluedin-ui','cluedin-prepare','cluedin-gql','cluedin-datasource','cluedin-annotation','cluedin-controller','cluedin-server','cluedin-submitter')
212+
$deployments322 = @('cluedin-ui','cluedin-prepare','cluedin-gql','cluedin-datasource','cluedin-annotation','cluedin-controller','cluedin-server','cluedin-submitter')
213213

214214
if($cluedinVersion -eq 320)
215215
{

‎terraform/scripts/40_application/main.tf

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -142,11 +142,6 @@ variable "cluedin_ui_image_version" {
142142
type = string
143143
}
144144

145-
variable "cluedin_webapi_image_version" {
146-
default = ""
147-
type = string
148-
}
149-
150145
variable "cluedin_init_neo4j_image_version" {
151146
default = ""
152147
type = string
@@ -519,18 +514,6 @@ resource "helm_release" "cluedin-application" {
519514
value = var.cluedin_image_pull_policy
520515
}
521516

522-
# WEBAPI SETTINGS
523-
524-
set {
525-
name = "webapi.image.tag"
526-
value = var.cluedin_webapi_image_version != "" ? var.cluedin_webapi_image_version : var.cluedin_image_version
527-
}
528-
529-
set {
530-
name = "webapi.image.pullPolicy"
531-
value = var.cluedin_image_pull_policy
532-
}
533-
534517
# INIT SQL SETTINGS
535518

536519
set {

0 commit comments

Comments
 (0)