Skip to content

Commit

Permalink
add latest tested configs
Browse files Browse the repository at this point in the history
  • Loading branch information
dfry committed Dec 7, 2022
1 parent 6074351 commit 44d177e
Show file tree
Hide file tree
Showing 4 changed files with 95 additions and 27 deletions.
6 changes: 6 additions & 0 deletions gitlab_templates/gitlab_ci_templates/.gitlab-main-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -435,11 +435,17 @@ Create Gateway Cluster:
.deploy_switch_iac: &deploy_switch_iac
script:
- *deploy_aws_infra
- sleep 10
- *create_gw_cluster
- sleep 10
- *deploy_base_services
- sleep 10
- *deploy_stateful_svcs
- sleep 10
- *deploy_support_svcs
- sleep 10
- *deploy_mojaloop_apps
- sleep 10
- *deploy_post_install

Deploy IaC:
Expand Down
2 changes: 1 addition & 1 deletion gitlab_templates/switch-iac/.gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ include:
variables:
GIT_SSL_NO_VERIFY: "true"
PLATFORM_IAC_IMAGE_VERSION: "2.3.1"
K3S_IAC_IMAGE_VERSION: "0.18.0"
K3S_IAC_IMAGE_VERSION: "0.17.0"
13 changes: 8 additions & 5 deletions gitlab_templates/switch-iac/k3s-sync-dir/.env
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ cloud_provider=aws
use_bastion=true
create_public_zone=yes
create_private_zone=yes
master_instance_type=m5.large
master_instance_type=t3.medium
master_volume_size=100
agent_node_count=3
agent_instance_type=t3.large
agent_node_count=2
agent_instance_type=m5.xlarge
agent_volume_size=100
ingress_name=nginx
letsencrypt_email=[email protected]
Expand All @@ -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=v4.2.10
pm4ml_helm_version=7.0.7
pm4ml_dfsp_internal_access_only=yes
letsencrypt_server=production
internal_pm4ml_instance=yes
Expand All @@ -35,5 +35,8 @@ install_portainer=no
internal_managed_tls=yes
extra_tag_file=/k3s-boot/extra-tags.json
ext_gw_listen_port=443
use_aws_acm_cert=false
grafana_internal_access_only=no
ttk_enabled=no
ttk_payee_simulator_enabled=no
ttk_payee_simulator_enabled=no
az_count=1
101 changes: 80 additions & 21 deletions gitlab_templates/switch-iac/k3s-sync-dir/static.pm4ml.values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,56 +3,115 @@ management-api:
tlsClientCSRParametersData: |-
{
"subject": {
"emailAddress": "[email protected]",
"E": "[email protected]",
"ST": "test_client",
"C": "US",
"L": "test",
"O": "test",
"CN": "test_client",
"OU": "test"
"C": "US",
"L": "test",
"O": "test",
"CN": "test_client",
"OU": "test"
},
"extensions": {
"subjectAltName": {
"dns": [
"test"
],
"ips": [
"test"
]
}
}
}
tlsServerCSRParametersData: |-
{
"subject": {
"emailAddress": "[email protected]",
"E": "[email protected]",
"ST": "test_server",
"C": "US",
"L": "test",
"O": "test",
"CN": "test_server",
"OU": "test"
"C": "US",
"L": "test",
"O": "test",
"CN": "test_server",
"OU": "test"
},
"extensions": {
"subjectAltName": {
"dns": [
"test"
],
"ips": [
"test"
]
}
}
}
mojaloop-core-connector:
image:
repository: pm4ml/mojaloop-payment-manager-simulator-core-connector
tag: 1.4.2
repository: pm4ml/wallet-core-connector
tag: 1.0.34
env:
MLCONN_OUTBOUND_ENDPOINT: "http://{{ item.value.helm_release_name }}-pm4ml-mojaloop-connector:4001"
MLCONN_OUTBOUND_ENDPOINT: "http://{{ item.value.helm_release_name }}-scheme-adapter:4001"
BACKEND_ENDPOINT: "http://sim-backend:3000"
livenessProbe:
enabled: true
readinessProbe:
enabled: true
enabled: true

scheme-adapter:
env:
RESOURCE_VERSIONS: transfers=1.1,
RESERVE_NOTIFICATION: true
AUTO_ACCEPT_PARTY: true
AUTO_ACCEPT_QUOTES: true

sim-backend:
rules: |-
[
{
"ruleId": 1,
"description": "Returns an invalid fulfillment from the simulator when transfer value is 123456789 in any currency",
"conditions": {
"all": [
{
"fact": "path",
"operator": "equal",
"value": "/transfers"
},
{
"fact": "method",
"operator": "equal",
"value": "POST"
},
{
"fact": "body",
"operator": "equal",
"value": "123456789",
"path": "$.amount"
}
]
},
"event": {
"type": "simulateResponse",
"params": {
"statusCode": 200,
"body": {
"homeTransactionId": "274107e7-cac7-427b-8485-065c919db2e6",
"fulfilment": "Lw8ygZt5_ZxQ9uPDoT0pSezu7Jyj_CNtmvFFZMgJHo5"
}
}
}
}
]
keycloak:
enabled: true

extraVolumes: |
- name: realm-config
# the below should be set to the name of the keycloak realm config map
# this has the deployment name on the front but because helm is so horrible
# we cant get the deployment name here in a nice way. You have to plug it
# in manually. e.g. the below works for a deployment called "pm4ml"
configMap:
name: {{ '{{ $.Release.Name }}' }}-keycloak-realm
extraVolumeMounts: |
- name: realm-config
mountPath: "/realm"
readOnly: true

0 comments on commit 44d177e

Please sign in to comment.