Merge pull request #661 from pranavv0/tag-update-5.0

5.0.0 tag update
datakaveri · Jan 30, 2024 · 7f508bb · 7f508bb
2 parents d5e6dde + 538539c
commit 7f508bb
Show file tree

Hide file tree

Showing 42 changed files with 162 additions and 227 deletions.
diff --git a/Docker-Swarm-deployment/single-node/acl-apd/acl-apd-stack.yaml b/Docker-Swarm-deployment/single-node/acl-apd/acl-apd-stack.yaml
@@ -7,7 +7,7 @@ networks:
 
 services:
   acl-apd:
-    image: ghcr.io/datakaveri/acl-apd-depl:5.0.0-alpha-92f87e8
+    image: ghcr.io/datakaveri/acl-apd-depl:1.0.0-66c8df1
     env_file:
       - ./secrets/.apd.env
     read_only: true
@@ -36,6 +36,7 @@ services:
       options:
         max-file: "5"
         max-size: "10m"
+        tag: "{\"name\":\"{{.Name}}\",\"id\":\"{{.ID}}\"}"
     command:  bash -c "exec java $$FS_JAVA_OPTS  -Dvertx.logger-delegate-factory-class-name=io.vertx.core.logging.Log4j2LogDelegateFactory -jar ./fatjar.jar  --host $$(hostname) -c secrets/configs/config.json"
 
 secrets:

diff --git a/Docker-Swarm-deployment/single-node/acl-apd/example-secrets/secrets/config.json b/Docker-Swarm-deployment/single-node/acl-apd/example-secrets/secrets/config.json
@@ -1,6 +1,8 @@
 {
   "version": "1.0",
-  "zookeepers": ["zookeeper"],
+  "zookeepers": [
+  "zookeeper"
+  ],
   "clusterId": "iudx-acl-apd-cluster",
   "commonConfig": {
     "dxApiBasePath": "/ngsi-ld/v1",
@@ -9,8 +11,10 @@
     "catServerHost": "<catalogue-domain>",
     "catServerPort": 443,
     "authHost": "<authhost>",
+    "authPort": 443,
     "databaseIP": "tasks.postgres",
     "databasePort": 5432,
+    "databaseSchema" : "<database-aclApd-schema>",
     "databaseName": "<database-name>",
     "databaseUserName": "<datbase-user-name>",
     "databasePassword": "<database-password>",
@@ -38,7 +42,6 @@
       "id": "iudx.apd.acl.server.notification.NotificationVerticle",
       "isWorkerVerticle": false,
       "verticleInstances": 1,
-      "authPort": 443,
       "domain": "iudx.io",
       "emailHostName": "<email-hostname>",
       "emailPort": 2587,
@@ -78,8 +81,6 @@
       "prodVhost": "IUDX",
       "internalVhost": "IUDX-INTERNAL",
       "externalVhost": "IUDX-EXTERNAL"
-    }
-
+    } 
   ]
 }
-
diff --git a/Docker-Swarm-deployment/single-node/auditing-server/auditing-stack.yaml b/Docker-Swarm-deployment/single-node/auditing-server/auditing-stack.yaml
@@ -2,7 +2,7 @@ version: "3.9"
 
 services:
   auditing:
-    image: ghcr.io/datakaveri/auditing-server-depl:1.5.0-alpha-7eb8130
+    image: ghcr.io/datakaveri/auditing-server-depl:5.0.0-d332b94
     read_only: true
     cap_drop:
       - ALL

diff --git a/Docker-Swarm-deployment/single-node/auditing-server/example-secrets/secrets/config.json b/Docker-Swarm-deployment/single-node/auditing-server/example-secrets/secrets/config.json
@@ -47,19 +47,21 @@
     },
     {
       "id": "iudx.auditing.server.immudb.ImmudbVerticle",
+      "isWorkerVerticle": false,
       "verticleInstances": 1,
       "meteringDatabaseIP": "tasks.immudb",
       "meteringDatabasePort": 5432,
-      "meteringRSDatabaseName": "iudxrsorg",
+      "meteringRSDatabaseName": "iudx",
       "meteringRSDatabaseUserName": "iudx_rs",
       "meteringRSDatabasePassword": "<immudb-rs-db-password:- cat iudx-deployment/Docker-Swarm-deployment/single-node/immudb/secrets/passwords/rs-password>",
-      "meteringAAADatabaseName": "iudxauth",
+      "meteringAAADatabaseName": "iudx",
       "meteringAAADatabaseUserName": "iudx_auth",
       "meteringAAADatabasePassword": "<immudb-aaa-db-password:- cat iudx-deployment/Docker-Swarm-deployment/single-node/immudb/secrets/passwords/auth-password>",
-      "meteringCATDatabaseName": "iudxcat",
+      "meteringCATDatabaseName": "iudx",
       "meteringCATDatabaseUserName": "iudx_cat",
       "meteringCATDatabasePassword": "<immudb-cat-db-password:- cat iudx-deployment/Docker-Swarm-deployment/single-node/immudb/secrets/passwords/cat-password>",
       "meteringPoolSize": 25
     }
   ]
 }
+
diff --git a/Docker-Swarm-deployment/single-node/auth/auth-stack.yaml b/Docker-Swarm-deployment/single-node/auth/auth-stack.yaml
@@ -2,7 +2,7 @@ version: "3.9"
 
 services:
   auth:
-    image: ghcr.io/datakaveri/aaa-depl:5.0.0-alpha-0a34c52
+    image: ghcr.io/datakaveri/aaa-depl:5.0.0-3f434f6
     command: bash -c "exec java $$AUTH_JAVA_OPTS  -Dvertx.logger-delegate-factory-class-name=io.vertx.core.logging.Log4j2LogDelegateFactory -jar ./fatjar.jar  --host $$(hostname) -c secrets/configs/config.json"
     cap_drop:
       - ALL

diff --git a/Docker-Swarm-deployment/single-node/auth/example-secrets/secrets/config.json b/Docker-Swarm-deployment/single-node/auth/example-secrets/secrets/config.json
@@ -18,17 +18,11 @@
       "cosAdminUserId": "<cos-admin-userid>"
     },
     "keycloakOptions": {
-      "keycloakHost": "<keycloak-server-public-domain",
-      "keycloakPort": 443,
       "keycloakRealm": "iudx",
-      "keycloakSite": "https://{{keycloakHost}}/auth/realms/iudx",
       "keycloakUrl": "https://{{keycloakHost}}/auth",
-      "keycloakTokenUri": "/auth/realms/iudx/protocol/openid-connect/token",
       "keycloakAdminClientId": "<AAA-admin Client ID:- get-from-configured-realm>",
       "keycloakAdminClientSecret": "<AAA-admin-Client-Secret:- get-from-configured-realm>",
       "keycloakAdminPoolSize": "10",
-      "keycloakAaaClientId": "<AAA-user client ID:- get-from-configured-realms>",
-      "keycloakAaaClientSecret": "<AAA-user client Secret:- get-from-configured-realm>",
       "keycloakJwtLeeway": 90
     },
     "jwtKeystoreOptions": {
@@ -37,86 +31,42 @@
     }
   },
   "modules": [
-    {
+  {
       "id": "iudx.aaa.server.policy.PolicyVerticle",
       "verticleInstances": 1,
-      "required": [
-        "postgresOptions",
-        "commonOptions"
-      ],
+      "required": [  "postgresOptions",  "commonOptions" ],
       "poolSize": "25",
-      "domain": "<domain-name-of-IUDX-system, Eg: iudx.test>",
       "catalogueOptions": {
         "catServerHost": "<catalogue-api-domain-name>",
         "catServerPort": "443",
-        "catServerItemPath": "/iudx/cat/v1/item"
-      },
-      "authOptions": {
-        "policyExpiry": "12",
-        "adminPolicyExpiry": "60"
-      },
-      "catOptions": {
-        "catURL": "<cat-audience-domain-name>",
-        "catItem": "catalogue/crud"
-      },
-      "resOptions": {
-        "resURL": "<rs-audience-domain-name>"
-      },
-      "emailOptions": {
-        "emailHostName": "<SMTP-host-name>",
-        "emailPort": 2587,
-        "emailUserName": "<SMTP-username>",
-        "emailPassword": "<SMTP-password>",
-        "emailSender": "<sender-email:- eg:  [email protected]>",
-        "emailSupport": "<support-email:-eg:  [email protected]",
-        "publisherPanelUrl": "<publisher-panel-url:- eg: https://publisher.test >",
-        "notifyByEmail": true,
-        "senderName": "<sender-name>"
+        "catServerBasePath": "/iudx/cat/v1"
       }
     },
-    {
+   {
       "id": "iudx.aaa.server.registration.RegistrationVerticle",
       "verticleInstances": 2,
-      "required": [
-        "postgresOptions",
-        "keycloakOptions",
-        "commonOptions"
-      ],
-      "serversOmittedFromRevoke": [
-        "<catalogue-audience-domain>"
-      ],
+      "required": [  "postgresOptions",   "keycloakOptions",   "commonOptions"   ],
+      "serversOmittedFromRevoke": [    "<catalogue-audience-domain>"  ],
       "poolSize": "15"
     },
     {
       "id": "iudx.aaa.server.token.TokenVerticle",
-      "verticleInstances": 2,
-      "required": [
-        "postgresOptions",
-        "commonOptions",
-        "keycloakOptions",
-        "jwtKeystoreOptions"
-      ],
+      "verticleInstances": 1,
+      "required":["postgresOptions", "commonOptions",     "keycloakOptions", "jwtKeystoreOptions"],
       "poolSize": "5"
     },
     {
       "id": "iudx.aaa.server.admin.AdminVerticle",
-      "verticleInstances": 2,
-      "required": [
-        "postgresOptions",
-        "commonOptions",
-        "keycloakOptions"
-      ],
-      "poolSize": "15"
+      "verticleInstances": 1,
+      "required":["postgresOptions", "commonOptions", "keycloakOptions"],
+      "poolSize": "25"
     },
     {
       "id": "iudx.aaa.server.apd.ApdVerticle",
-      "verticleInstances": 2,
-      "required": [
-        "postgresOptions",
-        "commonOptions"
-      ],
+      "verticleInstances": 1,
+      "required":["postgresOptions", "commonOptions"],
       "webClientTimeoutMs": 4000,
-      "poolSize": "15"
+      "poolSize": "25"
     },
     {
       "id": "iudx.aaa.server.auditing.AuditingVerticle",

diff --git a/Docker-Swarm-deployment/single-node/catalogue/cat-stack.yaml b/Docker-Swarm-deployment/single-node/catalogue/cat-stack.yaml
@@ -2,7 +2,7 @@ version: "3.9"
 
 services:
   cat:
-    image: ghcr.io/datakaveri/cat-prod:5.0.0-alpha-9ea1757
+    image: ghcr.io/datakaveri/cat-prod:5.0.0-cd67af0 
     networks:
       - overlay-net
     secrets:

diff --git a/Docker-Swarm-deployment/single-node/catalogue/example-secrets/secrets/config.json b/Docker-Swarm-deployment/single-node/catalogue/example-secrets/secrets/config.json
@@ -4,6 +4,7 @@
     "zookeeper"
   ],
   "clusterId": "dx-catalogue-cluster",
+  "host": "server",
   "commonConfig": {
     "dxApiBasePath": "/iudx/cat/v1",
     "dxAuthBasePath": "/auth/v1",
@@ -24,18 +25,16 @@
       "mlayerDomainIndex": "cat_instances",
       "databaseUser": "cat-user",
       "databasePassword": "<elastic-pass:- cat iudx-deployment/Docker-Swarm-deployment/single-node/elk/secrets/passwords/elasticsearch-cat-password>",
-      "databasePort": 9200
+      "databasePort": 9200,
+      "bypassAuth": true
     },
     {
       "id": "iudx.catalogue.server.authenticator.AuthenticationVerticle",
       "host": "<cat-audience-domain>",
-      "tempCopAudience": "<tempCopAudience>",
-      "issuer": "<auth-issuer>",
-      "tempCopIssuer": "<tempCopIssuer>",
-      "keycloakServerHost": "https://{{keycloak-domain}}/auth/realms/demo",
-      "certsEndpoint": "/protocol/openid-connect/certs",
+      "consumerHost": "<consumer-host-domain>",
       "verticleInstances": 1,
       "authServerHost": "<AAA-server-public-domain>",
+      "issuer": "<auth-issuer>",
       "jwtIgnoreExpiry": false
     },
     {
@@ -45,16 +44,29 @@
       "docIndex": "cat",
       "databaseUser": "cat-user",
       "databasePassword": "<elastic-pass:- cat iudx-deployment/Docker-Swarm-deployment/single-node/elk/secrets/passwords/elasticsearch-cat-password>",
-      "verticleInstances": 2
+      "verticleInstances": 2,
+      "@context": ""
     },
     {
       "id": "iudx.catalogue.server.apiserver.ApiServerVerticle",
       "host": "<cat-audience-domain>",
       "ssl": false,
       "ip": "127.0.0.1",
+      "httpPort": 8080,
       "catAdmin": "<catalogue-admin-id>",
       "verticleInstances": 2
     },
+    {
+      "id": "iudx.catalogue.server.auditing.AuditingVerticle",
+      "verticleInstances": 1,
+      "auditingDatabaseIP": "tasks.immudb",
+      "auditingDatabasePort": 5432,
+      "auditingDatabaseName": "iudx",
+      "auditingDatabaseUserName": "iudx_cat",
+      "auditingDatabasePassword": "<immudb-pass:- cat iudx-deployment/Docker-Swarm-deployment/single-node/immudb/secrets/passwords/cat-password>",
+      "auditingPoolSize": 25,
+      "auditingDatabaseTableName": "auditingtable"
+    },
     {
       "id": "iudx.catalogue.server.geocoding.GeocodingVerticle",
       "peliasUrl": "<pelias-service-domain/ip>",
@@ -66,18 +78,7 @@
       "nlpServiceUrl": "<nlp-service-domain/ip>",
       "nlpServicePort": 3000,
       "verticleInstances": 1
-    },
-    {
-      "id": "iudx.catalogue.server.auditing.AuditingVerticle",
-      "verticleInstances": 1,
-      "auditingDatabaseIP": "tasks.immudb",
-      "auditingDatabasePort": 5432,
-      "auditingDatabaseName": "iudxcat",
-      "auditingDatabaseUserName": "iudx_cat",
-      "auditingDatabasePassword": "<immudb-pass:- cat iudx-deployment/Docker-Swarm-deployment/single-node/immudb/secrets/passwords/cat-password>",
-      "auditingPoolSize": 25,
-      "auditingDatabaseTableName": "auditingtable"
-    },
+    },    
     {
       "id": "iudx.catalogue.server.rating.RatingVerticle",
       "verticleInstances": 1,
@@ -107,6 +108,7 @@
     },
     {
       "id": "iudx.catalogue.server.database.postgres.PostgresVerticle",
+      "isWorkerVerticle": false,
       "verticleInstances": 1,
       "databaseIP": "tasks.postgres",
       "databasePort": 5432,
@@ -117,3 +119,4 @@
     }
   ]
 }
+
diff --git a/Docker-Swarm-deployment/single-node/consent-validator/consent-stack.yaml b/Docker-Swarm-deployment/single-node/consent-validator/consent-stack.yaml
@@ -7,7 +7,7 @@ networks:
 
 services:
   consent:
-    image: ghcr.io/datakaveri/consent-validator:1.0.0-alpha-81ab723
+    image: ghcr.io/datakaveri/consent-validator:1.5.0-e3c3aec
     env_file:
       - ./secrets/.consent.env
     read_only: true
@@ -37,6 +37,7 @@ services:
          options:
              max-file: "5"
              max-size: "10m"
+             tag: "{\"name\":\"{{.Name}}\",\"id\":\"{{.ID}}\"}"
     command: bash -c "exec java  -Dvertx.logger-delegate-factory-class-name=io.vertx.core.logging.Log4j2LogDelegateFactory -jar ./fatjar.jar  --host $$(hostname) -c secrets/configs/config.json"
 
 secrets:

diff --git a/Docker-Swarm-deployment/single-node/data-ingestion-server/di-stack.yaml b/Docker-Swarm-deployment/single-node/data-ingestion-server/di-stack.yaml
@@ -2,7 +2,7 @@ version: '3.9'
 
 services:
   di:
-    image: ghcr.io/datakaveri/di-depl:5.0.0-alpha-ae31210
+    image: ghcr.io/datakaveri/di-depl:5.0.0-fa953b3
     command:  bash -c "exec java $$DI_JAVA_OPTS  -Dvertx.logger-delegate-factory-class-name=io.vertx.core.logging.Log4j2LogDelegateFactory -jar ./fatjar.jar  --host $$(hostname) -c secrets/configs/config.json"
     # Dropping all Linux capabilities
     cap_drop:

diff --git a/...er-Swarm-deployment/single-node/data-ingestion-server/example-secrets/secrets/config.json b/...er-Swarm-deployment/single-node/data-ingestion-server/example-secrets/secrets/config.json
@@ -41,6 +41,7 @@
 		{
 			"id": "iudx.data.ingestion.server.apiserver.ApiServerVerticle",
 			"ssl": false,
+			"httpPort": 8443,
 			"catServerHost": "<catalogue-api-public-domain>",
 			"catServerPort": 443,
 			"verticleInstances": 2
@@ -51,3 +52,4 @@
 		}
 	]
 }
+