From 94e9572769f84798cd7ae75f36a1655a2973b427 Mon Sep 17 00:00:00 2001 From: Vijay Kumar Date: Wed, 15 Feb 2023 13:32:49 +0530 Subject: [PATCH 1/5] feat: removed ttk system config in pm4ml helm values template --- ansible/templates/pm4ml.values.yml.j2 | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/ansible/templates/pm4ml.values.yml.j2 b/ansible/templates/pm4ml.values.yml.j2 index 60b584e..5f60fbc 100644 --- a/ansible/templates/pm4ml.values.yml.j2 +++ b/ansible/templates/pm4ml.values.yml.j2 @@ -230,21 +230,6 @@ ttk: "DEFAULT_ENVIRONMENT_FILE_NAME": "pm4ml-default-environment.json", "FSPID": *dfspId } - system_config.json: { - "API_DEFINITIONS": [ - { - "type": "scheme_adapter_outbound", - "version": "1.0", - "folderPath": "mojaloop_sdk_outbound_scheme_adapter_1.0" - }, - { - "type": "core_connector", - "version": "1.4", - "folderPath": "mojaloop_simulator_sim_1.4", - "hostnames": [ "{{ item.value.helm_release_name }}-ttk-backend" ] - } - ] - } ml-testing-toolkit-frontend: nameOverride: ttk-frontend From 7dce0ed1af0a3abdb71c7c9ed9be77c0e6fa2f48 Mon Sep 17 00:00:00 2001 From: Vijay Kumar Date: Wed, 15 Feb 2023 14:45:19 +0530 Subject: [PATCH 2/5] test: disable ingress class for ttk --- ansible/templates/pm4ml.values.yml.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/templates/pm4ml.values.yml.j2 b/ansible/templates/pm4ml.values.yml.j2 index 5f60fbc..cdef564 100644 --- a/ansible/templates/pm4ml.values.yml.j2 +++ b/ansible/templates/pm4ml.values.yml.j2 @@ -217,7 +217,7 @@ ttk: adminApi: host: ttk.{{ item.key }}.{{ item.value.pm4ml_subdomain }} annotations: - kubernetes.io/ingress.class: {{ pm4ml_ingress_classname }} + # kubernetes.io/ingress.class: {{ pm4ml_ingress_classname }} external-dns.alpha.kubernetes.io/target: {{ dfsp_access_lb_hostname }} # Not enabling tls ingress endpoints because there is some issue in the TTK helm chart and its not accepting tls ingress configuration. # Need to fix it in TTK helm chart and then only we can enable tls here @@ -239,7 +239,7 @@ ttk: ui: host: ttk.{{ item.key }}.{{ item.value.pm4ml_subdomain }} annotations: - kubernetes.io/ingress.class: {{ pm4ml_ingress_classname }} + # kubernetes.io/ingress.class: {{ pm4ml_ingress_classname }} external-dns.alpha.kubernetes.io/target: {{ dfsp_access_lb_hostname }} # Not enabling tls ingress endpoints because there is some issue in the TTK helm chart and its not accepting tls ingress configuration. # Need to fix it in TTK helm chart and then only we can enable tls here From baeeff2ba6df92ae965900c912392f3e1fa50614 Mon Sep 17 00:00:00 2001 From: Vijay Kumar Date: Wed, 15 Feb 2023 21:16:40 +0530 Subject: [PATCH 3/5] added a comment --- ansible/templates/pm4ml.values.yml.j2 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ansible/templates/pm4ml.values.yml.j2 b/ansible/templates/pm4ml.values.yml.j2 index cdef564..ec40394 100644 --- a/ansible/templates/pm4ml.values.yml.j2 +++ b/ansible/templates/pm4ml.values.yml.j2 @@ -166,6 +166,7 @@ scheme-adapter: JWS_SIGN: true VALIDATE_INBOUND_JWS: true PEER_ENDPOINT: "{{ item.value.extgw_fqdn }}:{{ mojaloop_switch_extgw_port }}/fsp/1.0" + ALS_ENDPOINT: "{{ item.value.extgw_fqdn }}:{{ mojaloop_switch_extgw_port }}/fsp/1.0" OUTBOUND_MUTUAL_TLS_ENABLED: true INBOUND_MUTUAL_TLS_ENABLED: false OAUTH_TOKEN_ENDPOINT: "https://{{ item.value.extgw_fqdn }}:{{ mojaloop_switch_extgw_port }}/token" @@ -217,6 +218,7 @@ ttk: adminApi: host: ttk.{{ item.key }}.{{ item.value.pm4ml_subdomain }} annotations: + ## TODO: disabling the following line temporarily because of an issue with TTK helm chart. # kubernetes.io/ingress.class: {{ pm4ml_ingress_classname }} external-dns.alpha.kubernetes.io/target: {{ dfsp_access_lb_hostname }} # Not enabling tls ingress endpoints because there is some issue in the TTK helm chart and its not accepting tls ingress configuration. From 48373a648f4b1c0c86e8fdf0bc492b2f3a20d04b Mon Sep 17 00:00:00 2001 From: Vijay Date: Tue, 21 Feb 2023 14:08:27 +0530 Subject: [PATCH 4/5] fixed ttk ingress issue --- ansible/templates/pm4ml.values.yml.j2 | 5 ++--- samplefiles/.env | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ansible/templates/pm4ml.values.yml.j2 b/ansible/templates/pm4ml.values.yml.j2 index c1f82b8..d35accf 100644 --- a/ansible/templates/pm4ml.values.yml.j2 +++ b/ansible/templates/pm4ml.values.yml.j2 @@ -217,9 +217,8 @@ ttk: host: ttk-specapi.{{ item.key }}.{{ item.value.pm4ml_subdomain }} adminApi: host: ttk.{{ item.key }}.{{ item.value.pm4ml_subdomain }} + className: {{ pm4ml_ingress_classname }} annotations: - ## TODO: disabling the following line temporarily because of an issue with TTK helm chart. - # kubernetes.io/ingress.class: {{ pm4ml_ingress_classname }} external-dns.alpha.kubernetes.io/target: {{ dfsp_access_lb_hostname }} # Not enabling tls ingress endpoints because there is some issue in the TTK helm chart and its not accepting tls ingress configuration. # Need to fix it in TTK helm chart and then only we can enable tls here @@ -240,8 +239,8 @@ ttk: hosts: ui: host: ttk.{{ item.key }}.{{ item.value.pm4ml_subdomain }} + className: {{ pm4ml_ingress_classname }} annotations: - # kubernetes.io/ingress.class: {{ pm4ml_ingress_classname }} external-dns.alpha.kubernetes.io/target: {{ dfsp_access_lb_hostname }} # Not enabling tls ingress endpoints because there is some issue in the TTK helm chart and its not accepting tls ingress configuration. # Need to fix it in TTK helm chart and then only we can enable tls here diff --git a/samplefiles/.env b/samplefiles/.env index 5794282..7c0cc66 100644 --- a/samplefiles/.env +++ b/samplefiles/.env @@ -23,7 +23,7 @@ pm4ml_config_file=/k3s-boot/ansible_pm4ml_output.yaml pm4ml_static_config_file=/k3s-boot/static.pm4ml.values.yaml pm4ml_client_cert_remote_dir=/tmp/pm4ml-certoutput/ pm4ml_client_cert_local_dir=##pm4ml_client_cert_local_dir## -pm4ml_helm_version=8.0.0 +pm4ml_helm_version=8.0.1-snapshot.5 pm4ml_dfsp_internal_access_only=yes letsencrypt_server=production internal_pm4ml_instance=yes From 7d40747abfd7ef190e85cbc83bf4d3df33583ff0 Mon Sep 17 00:00:00 2001 From: Vijay Date: Tue, 28 Feb 2023 14:48:20 +0530 Subject: [PATCH 5/5] changed pm4ml helm version in sample env file --- samplefiles/.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samplefiles/.env b/samplefiles/.env index 7c0cc66..bc6da42 100644 --- a/samplefiles/.env +++ b/samplefiles/.env @@ -23,7 +23,7 @@ pm4ml_config_file=/k3s-boot/ansible_pm4ml_output.yaml pm4ml_static_config_file=/k3s-boot/static.pm4ml.values.yaml pm4ml_client_cert_remote_dir=/tmp/pm4ml-certoutput/ pm4ml_client_cert_local_dir=##pm4ml_client_cert_local_dir## -pm4ml_helm_version=8.0.1-snapshot.5 +pm4ml_helm_version=8.0.1 pm4ml_dfsp_internal_access_only=yes letsencrypt_server=production internal_pm4ml_instance=yes