Merge pull request #54 from mojaloop/feature/upgrade-netmaker-v24

Netmaker upgrade and change in haproxy config
mojaloop · May 15, 2024 · 697c689 · 697c689
2 parents 556fb99 + 2b237c0
commit 697c689
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 6 deletions.
diff --git a/mojaloop/iac/roles/argocd/defaults/main.yaml b/mojaloop/iac/roles/argocd/defaults/main.yaml
@@ -9,7 +9,7 @@ tenant_vault_token: token
 tenant_vault_server_url: "https://tenantvault"
 kubeconfig_location: "/root/.kube"
 root_app_path: "infra/app-yamls"
-netmaker_image_version: "0.18.7"
+netmaker_image_version: "0.24.0"
 wireguard_node_port: "31821"
 cluster_name: envname
 kubeconfig_local_location: "/tmp"

diff --git a/mojaloop/iac/roles/argocd/tasks/main.yaml b/mojaloop/iac/roles/argocd/tasks/main.yaml
@@ -68,7 +68,7 @@
     - namespace
     - vault-service-account-etc
     - vault-env
-    - netclient
+    #- netclient
     - argo-oidc-secrets
     - argocd-server-patch
     - argocd-cmd-params-cm-patch    

diff --git a/mojaloop/iac/roles/argocd/templates/kustomization.yaml.j2 b/mojaloop/iac/roles/argocd/templates/kustomization.yaml.j2
@@ -10,7 +10,6 @@ resources:
 - vault-service-account-etc.yaml
 - argo-gitlab.yaml
 - vault-env.yaml
-- netclient.yaml
 - argo-oidc-secrets.yaml
 
 patches:

diff --git a/mojaloop/iac/roles/haproxy/templates/haproxy.cfg.j2 b/mojaloop/iac/roles/haproxy/templates/haproxy.cfg.j2
@@ -16,6 +16,21 @@ frontend vault
   bind :{{ local_vault_listening_port }}
   default_backend vault
 
+{% for msp in managed_rds_svc %}
+frontend {{ msp.name }}
+  mode {{ msp.mode }}
+  bind :{{ msp.local_listening_port }}
+  default_backend {{ msp.name }}
+
+{% endfor %}
+
+{% for msp in managed_kafka_svc %}
+frontend {{ msp.name }}
+  mode {{ msp.mode }}
+  bind :{{ msp.local_listening_port }}  
+  default_backend {{ msp.name }}
+
+{% endfor %}
 
 backend minio
   server minio {{ minio_fqdn }}:{{ minio_listening_port }}
@@ -26,3 +41,19 @@ backend nexus
 backend vault
   mode tcp
   server vault {{ vault_fqdn }}:{{ vault_listening_port }} ssl verify none
+
+{% for msp in managed_rds_svc %}
+
+backend {{ msp.name }}
+  mode {{ msp.mode }}
+  server {{ msp.name }} {{ msp.dest_fqdn }}:{{ msp.dest_port }}
+{% endfor %}
+
+{% for msp in managed_kafka_svc %}
+
+backend {{ msp.name }}
+  mode {{ msp.mode }}
+{%for broker in msp.managed_kafka_brokers_list %}
+  server {{ msp.name }}{{ loop.index }} {{ broker }}
+{% endfor %}  
+{% endfor %}
diff --git a/mojaloop/iac/roles/netclient/defaults/main.yaml b/mojaloop/iac/roles/netclient/defaults/main.yaml
@@ -1,5 +1,5 @@
 netmaker_root_dir: /root/netmaker-compose
-netmaker_image_version: 0.18.7
+netmaker_image_version: 0.24.0
 netclient_enrollment_keys: ["cntrlctr-ops"]
 netmaker_join_tokens: []
 netmaker_enrollment_key_list_file_location: /tmp/keylist.json

diff --git a/mojaloop/iac/roles/netmaker/defaults/main.yaml b/mojaloop/iac/roles/netmaker/defaults/main.yaml
@@ -1,7 +1,7 @@
 netmaker_base_domain: a.b.c
 netmaker_root_dir: /root/netmaker-compose
 netmaker_server_public_ip: 127.0.0.1
-netmaker_image_version: 0.18.6
+netmaker_image_version: 0.24.0
 netmaker_caddy_image_version: 2.6.2
 netmaker_acme_email: [email protected]
 netmaker_mq_pw: crazypassword

diff --git a/mojaloop/iac/roles/netmaker/tasks/configure.yaml b/mojaloop/iac/roles/netmaker/tasks/configure.yaml
@@ -18,7 +18,7 @@
       Authorization: Bearer {{ netmaker_master_key }}
     body: "{{ lookup('template', 'createadminuser.json.j2') }}"
     body_format: json
-    status_code: [200, 400]
+    status_code: [200, 400, 500]
 
 - name: Add networks if don't exist
   uri: