SB-25552 - UCI modules configuration update (#2719)

* fix: ports and env for helm charts

ansible/roles/stack-sunbird/defaults/main.yml

@@ -858,7 +858,7 @@ uci_transformer_liveness_readiness:
   readinessProbe:
     httpGet:
       path: /service/health
-      port: 8080
+      port: 9091
     initialDelaySeconds: 15
     periodSeconds: 15
     timeoutSeconds: 5
@@ -867,7 +867,7 @@ uci_transformer_liveness_readiness:
   livenessProbe:
     httpGet:
       path: /service/health
-      port: 8080
+      port: 9091
     initialDelaySeconds: 15
     periodSeconds: 15
     timeoutSeconds: 5

ansible/roles/stack-sunbird/templates/inbound.env

-campaign.url=http://uci-service:9999
+#External Services
+CAMPAIGN_URL=http://uci-service.{{namespace}}.svc.cluster.local:9999
 
-#Kafka Configuration
-spring.kafka.bootstrap-servers={{sunbird_processing_kafka_host}}
-spring.kafka.consumer.auto-offset-reset=earliest
-spring.kafka.consumer.value-deserializer=org.springframework.kafka.support.serializer.JsonDeserializer
-spring.kafka.producer.value-serializer=org.springframework.kafka.support.serializer.JsonSerializer
-schema.registry.url={{zookeepers}}
-inbound-error={{env_name}}.inbound-error
-inboundProcessed={{env_name}}.inbound-processed
-inboundUnprocessed={{env_name}}.inbound-unprocessed
-campaign={{env_name}}.campaign
+#Kafka
+BOOTSTRAP_SERVERS={{sunbird_processing_kafka_host}}
+KAFKA_INBOUND_PROCESSED_TOPIC={{env_name}}.inbound-processed
+KAFKA_CAMPAIGN_TOPIC={{env_name}}.campaign
+KAFKA_INBOUND_UNPROCESSED_TOPIC={{env_name}}.inbound-unprocessed
+KAFKA_INBOUND_GS_OPTED_OUT_TOPIC={{env_name}}.gs-opted-out
+KAFKA_INBOUND_ERROR_TOPIC={{env_name}}.inbound-error
+KAFKA_OUTBOUND_TOPIC={{env_name}}.outbound
+KAFKA_TELEMETRY_TOPIC={{env_name}}.uci.telemetry
+KAFKA_ODK_TRANSFORMER_TOPIC={{env_name}}.com.odk.transformer
+KAFKA_ODK_TRANSFORMER_TOPIC_PATTERN={{env_name}}.com.odk.*
 
-# Cassandra Configuration
-spring.data.cassandra.contactpoints={{sunbird_cassandra_host}}
-spring.data.cassandra.port=9042
-spring.data.cassandra.keyspace-name={{env}}_uci_store
-spring.data.cassandra.pool.heartbeat-interval=30s
-spring.data.cassandra.pool.max-queue-size=2000
-spring.data.cassandra.pool.idle-timeout=10s
-spring.data.cassandra.pool.pool-timeout=1s
+#FormsDB
+FORMS_DB_URL=postgresql://{{uci_postgres_host}}:5432/{{uci_forms_postgres_database}}
+FORMS_DB_USERNAME={{uci_postgres_user}}
+FORMS_DB_PASSWORD={{uci_postgres_password}}
+FORMS_DB_NAME={{uci_forms_postgres_database}}
+FORMS_DB_HOST={{uci_postgres_host}}
+FORMS_DB_PORT=5432
 
-# Service Configuration
-server.port=8085
-logging.level.root=INFO
\ No newline at end of file
+#Cassandra
+CASSANDRA_URL={{sunbird_cassandra_host}}
+CASSANDRA_PORT=9042
+CASSANDRA_KEYSPACE={{env}}_uci_store
+
+#Ports
+INBOUND_INTERNAL_PORT=8085
+
+#ODK
+ODK_URL=http://odk-service.{{namespace}}.svc.cluster.local:8080
+ODK_USER={{uci_odk_user}}
+ODK_PASS={{uci_odk_password}}
+
+#FusionAuth
+FUSIONAUTH_URL=http://fusionauth-service.{{namespace}}.svc.cluster.local:9011

ansible/roles/stack-sunbird/templates/outbound.env

-spring.kafka.producer.value-serializer=org.springframework.kafka.support.serializer.JsonSerializer
-spring.kafka.consumer.value-deserializer=org.springframework.kafka.support.serializer.JsonDeserializer
-spring.kafka.consumer.auto-offset-reset=earliest
+#External Services
+CAMPAIGN_URL="http://uci-service.{{namespace}}.svc.cluster.local:9999"
 
-# Kafka
-spring.kafka.bootstrap-servers={{sunbird_processing_kafka_host}}
-kafka.topic.in={{env_name}}.outbound
-spring.kafka.consumer.enable-auto-commit=true
-auto.commit.interval.ms=2000
+#Kafka
+BOOTSTRAP_SERVERS={{sunbird_processing_kafka_host}}
+KAFKA_INBOUND_PROCESSED_TOPIC={{env_name}}.inbound-processed
+KAFKA_CAMPAIGN_TOPIC={{env_name}}.campaign
+KAFKA_INBOUND_UNPROCESSED_TOPIC={{env_name}}.inbound-unprocessed
+KAFKA_INBOUND_GS_OPTED_OUT_TOPIC={{env_name}}.gs-opted-out
+KAFKA_INBOUND_ERROR_TOPIC={{env_name}}.inbound-error
+KAFKA_OUTBOUND_TOPIC={{env_name}}.outbound
+KAFKA_TELEMETRY_TOPIC={{env_name}}.uci.telemetry
+KAFKA_ODK_TRANSFORMER_TOPIC={{env_name}}.com.odk.transformer
+KAFKA_ODK_TRANSFORMER_TOPIC_PATTERN={{env_name}}.com.odk.*
 
-# Cassandra Configuration
-spring.data.cassandra.contactpoints={{sunbird_cassandra_host}}
-spring.data.cassandra.port=9042
-spring.data.cassandra.keyspace-name={{env}}_uci_store
-spring.data.cassandra.pool.heartbeat-interval=30s
-spring.data.cassandra.pool.max-queue-size=2000
-spring.data.cassandra.pool.idle-timeout=10s
-spring.data.cassandra.pool.pool-timeout=1s
+#FormsDB
+FORMS_DB_URL=postgresql://{{uci_postgres_host}}:5432/{{uci_forms_postgres_database}}
+FORMS_DB_USERNAME={{uci_postgres_user}}
+FORMS_DB_PASSWORD={{uci_postgres_password}}
+FORMS_DB_NAME={{uci_forms_postgres_database}}
 
-# Confluent Cloud Schema Registry
-schema.registry.url={{zookeepers}}
+#Cassandra
+CASSANDRA_URL={{sunbird_cassandra_host}}
+CASSANDRA_PORT=9042
+CASSANDRA_KEYSPACE={{env}}_uci_store
 
-inboundProcessed={{env_name}}.outbound
-
-server.port=9090
-spring.liquibase.enabled=false
-
-campaign.url=http://uci-service:9999
+#FusionAuth
+FUSIONAUTH_URL=http://fusionauth-service.{{namespace}}.svc.cluster.local:9011/
 
+#Ports
+OUTBOUND_INTERNAL_PORT=9090

ansible/roles/stack-sunbird/templates/transformer.env

-campaign.url=http://uci-service:9999
+#External Services
+CAMPAIGN_URL="http://uci-service.{{namespace}}.svc.cluster.local:9999"
 
-server.port=8080
+#Kafka
+BOOTSTRAP_SERVERS={{sunbird_processing_kafka_host}}
+KAFKA_INBOUND_PROCESSED_TOPIC={{env_name}}.inbound-processed
+KAFKA_CAMPAIGN_TOPIC={{env_name}}.campaign
+KAFKA_INBOUND_UNPROCESSED_TOPIC={{env_name}}.inbound-unprocessed
+KAFKA_INBOUND_GS_OPTED_OUT_TOPIC={{env_name}}.gs-opted-out
+KAFKA_INBOUND_ERROR_TOPIC={{env_name}}.inbound-error
+KAFKA_OUTBOUND_TOPIC={{env_name}}.outbound
+KAFKA_TELEMETRY_TOPIC={{env_name}}.uci.telemetry
+KAFKA_ODK_TRANSFORMER_TOPIC={{env_name}}.com.odk.transformer
+KAFKA_ODK_TRANSFORMER_TOPIC_PATTERN={{env_name}}.com.odk.*
 
-spring.liquibase.enabled=false
\ No newline at end of file
+#FormsDB
+FORMS_DB_URL=postgresql://{{uci_postgres_host}}:5432/{{uci_forms_postgres_database}}
+FORMS_DB_USERNAME={{uci_postgres_user}}
+FORMS_DB_PASSWORD={{uci_postgres_password}}
+FORMS_DB_NAME={{uci_forms_postgres_database}}
+FORMS_DB_HOST={{uci_postgres_host}}
+FORMS_DB_PORT=5432
+
+#Cassandra
+CASSANDRA_URL={{sunbird_cassandra_host}}
+CASSANDRA_PORT=9042
+CASSANDRA_KEYSPACE={{env}}_uci_store
+
+#Ports
+TRANSFORMER_INTERNAL_PORT=9091
+
+#ODK
+ODK_URL=http://odk-service.{{namespace}}.svc.cluster.local:8080
+ODK_USER={{uci_odk_user}}
+ODK_PASS={{uci_odk_password}}
+
+#FusionAuth
+FUSIONAUTH_URL=http://fusionauth-service.{{namespace}}.svc.cluster.local:9011

kubernetes/helm_charts/core/transformer/values.j2

@@ -18,8 +18,8 @@ resources:
     cpu: {{uci_transformer_cpu_limit|default('1')}}
     memory: {{uci_transformer_mem_limit|default('1024Mi')}}
 network:
-  port: 8080
-  targetport: 8080
+  port: 9091
+  targetport: 9091
 strategy:
   type: RollingUpdate
   maxsurge: {{ uci_transformer_maxsurge|default('25%') }}