UCI Config Changes (#2957)

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

@@ -875,23 +875,26 @@ uci_outbound_liveness_readiness:
 
 uci_transformer_liveness_readiness:
   healthcheck: true
-  readinessProbe:
+  livenessProbe:
+    failureThreshold: 2
     httpGet:
-      path: /service/health
+      path: /health
       port: 9091
-    initialDelaySeconds: 15
-    periodSeconds: 15
+      scheme: HTTP
+    initialDelaySeconds: 90
+    periodSeconds: 30
+    successThreshold: 1
     timeoutSeconds: 5
+  readinessProbe:
     failureThreshold: 2
-    successThreshold: 1
-  livenessProbe:
     httpGet:
-      path: /service/health
+      path: /health
       port: 9091
-    initialDelaySeconds: 15
-    periodSeconds: 15
+      scheme: HTTP
+    initialDelaySeconds: 90
+    periodSeconds: 30
+    successThreshold: 1
     timeoutSeconds: 5
-    failureThreshold: 2
 
 uci_orchestrator_liveness_readiness:
   healthcheck: true

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

@@ -10,8 +10,8 @@ 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.*
+KAFKA_ODK_TRANSFORMER_TOPIC={{env_name}}.odk.transformer
+KAFKA_ODK_TRANSFORMER_TOPIC_PATTERN={{env_name}}.odk.*
 
 #FormsDB
 FORMS_DB_URL=postgresql://{{uci_postgres_host}}:5432/{{uci_forms_postgres_database}}
@@ -36,3 +36,7 @@ ODK_PASS={{uci_odk_password}}
 
 #FusionAuth
 FUSIONAUTH_URL=http://fusionauth-service.{{namespace}}.svc.cluster.local:9011
+
+# API Key for Fusionauth. More details on how to generate this here -> https://fusionauth.io/docs/v1/tech/apis/authentication/#api-key-authentication
+# Note - You will need access to UI to generate this the first time.
+FUSIONAUTH_KEY={{fusionauth_service_admin_key}}
\ No newline at end of file

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

 #External Services
-CAMPAIGN_URL="http://uci_api-service.{{namespace}}.svc.cluster.local:9011"
+CAMPAIGN_URL=http://uci-service.{{namespace}}.svc.cluster.local:9999
 
 #Kafka
 BOOTSTRAP_SERVERS={{sunbird_processing_kafka_host}}
@@ -10,8 +10,8 @@ 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.*
+KAFKA_ODK_TRANSFORMER_TOPIC={{env_name}}.odk.transformer
+KAFKA_ODK_TRANSFORMER_TOPIC_PATTERN={{env_name}}.odk.*
 
 #FormsDB
 FORMS_DB_URL=postgresql://{{uci_postgres_host}}:5432/{{uci_forms_postgres_database}}
@@ -25,4 +25,11 @@ CASSANDRA_PORT=9042
 CASSANDRA_KEYSPACE={{env}}_uci_store
 
 #Ports
-ORCHESTRATOR_INTERNAL_PORT=8686
\ No newline at end of file
+ORCHESTRATOR_INTERNAL_PORT=8686
+
+#FusionAuth
+FUSIONAUTH_URL=http://fusionauth-service.{{namespace}}.svc.cluster.local:9011
+
+# API Key for Fusionauth. More details on how to generate this here -> https://fusionauth.io/docs/v1/tech/apis/authentication/#api-key-authentication
+# Note - You will need access to UI to generate this the first time.
+FUSIONAUTH_KEY={{fusionauth_service_admin_key}}

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

 #External Services
-CAMPAIGN_URL="http://uci-service.{{namespace}}.svc.cluster.local:9999"
+CAMPAIGN_URL=http://uci-service.{{namespace}}.svc.cluster.local:9999
 
 #Kafka
 BOOTSTRAP_SERVERS={{sunbird_processing_kafka_host}}
@@ -10,8 +10,8 @@ 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.*
+KAFKA_ODK_TRANSFORMER_TOPIC={{env_name}}.odk.transformer
+KAFKA_ODK_TRANSFORMER_TOPIC_PATTERN={{env_name}}.odk.*
 
 #FormsDB
 FORMS_DB_URL=postgresql://{{uci_postgres_host}}:5432/{{uci_forms_postgres_database}}

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

 #External Services
-CAMPAIGN_URL="http://uci-service.{{namespace}}.svc.cluster.local:9999"
+CAMPAIGN_URL=http://uci-service.{{namespace}}.svc.cluster.local:9999
 
 #Kafka
 BOOTSTRAP_SERVERS={{sunbird_processing_kafka_host}}
@@ -10,8 +10,9 @@ 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.*
+KAFKA_ODK_TRANSFORMER_TOPIC={{env_name}}.odk.transformer
+KAFKA_ODK_TRANSFORMER_TOPIC_PATTERN={{env_name}}.odk.*
+KAFKA_LOGS_TOPIC={{env_name}}.inbound-unprocessed
 
 #FormsDB
 FORMS_DB_URL=postgresql://{{uci_postgres_host}}:5432/{{uci_forms_postgres_database}}
@@ -40,3 +41,4 @@ FUSIONAUTH_URL=http://fusionauth-service.{{namespace}}.svc.cluster.local:9011
 # API Key for Fusionauth. More details on how to generate this here -> https://fusionauth.io/docs/v1/tech/apis/authentication/#api-key-authentication
 # Note - You will need access to UI to generate this the first time.
 FUSIONAUTH_KEY={{fusionauth_service_admin_key}}
+CAMPAIGN_ADMIN_TOKEN={{uci_api_admin_token}}

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

@@ -32,9 +32,18 @@ UCI_CORE_BASE_URL=http://inbound-service.{{namespace}}.svc.cluster.local:8085
 # API Key for Fusionauth. More details on how to generate this here -> https://fusionauth.io/docs/v1/tech/apis/authentication/#api-key-authentication
 # Note - You will need access to UI to generate this the first time.
 FUSIONAUTH_KEY={{fusionauth_service_admin_key}}
-FUSIONAUTH_URL=http://fusionauth-service.{{namespace}}.svc.cluster.local:9011
+FUSIONAUTH_URL=http://fusionauth-service.{{namespace}}.svc.cluster.local:9011/
 
 # AES Encryption Key for UCI (Base64). To generate this the first time take any string of 16 chars and use the 
 # method here -> https://github.com/samagra-comms/utils/blob/b67d0d15e699d76c2f24792643562fee5435676f/src/main/java/com/uci/utils/encryption/AESWrapper.java#L32
 # Should be generated once for each env.
-ENCRYPTION_KEY={{uci_encryption_key_base64}}
\ No newline at end of file
+ENCRYPTION_KEY={{uci_encryption_key_base64}}
+ADMIN_TOKEN={{uci_api_admin_token}}
+
+GRAPHQL_BASE_URL=http://gql-service.{{namespace}}.svc.cluster.local:8080
+
+ODK_SERVICE=http://odk-service.{{namespace}}.svc.cluster.local:8080
+ODK_USERNAME={{uci_odk_user}}
+ODK_PASSWORD={{uci_odk_password}}
+
+TRANSFORMER_BASE_URL=http://transformer-service.{{namespace}}.svc.cluster.local:9091/odk/updateAll

kubernetes/helm_charts/core/fusionauth/templates/service.yaml

 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "fusionauth.fullname" . }}
+  name: {{ include "fusionauth.fullname" . }}-service
   labels:
     app.kubernetes.io/name: {{ include "fusionauth.name" . }}
     helm.sh/chart: {{ include "fusionauth.chart" . }}