[ANCHOR-672] Flatten anchor config fields in value file (#1345)

### Description All fields are configurable by the `config` struct in the value file. Previously, only the callback API was configurable using this method. ### Context We need to be able to configure using a separate Horizon instance. Rather than hardcoding the value mapping like the callback API, this refactors how config management is done. ### Testing - `./gradlew test` - Testing with the demo wallet ### Documentation N/A ### Known limitations This is a breaking change so the deployed environments will need to be updated.
stellar · May 1, 2024 · 53f6f6a · 53f6f6a
1 parent 7256673
commit 53f6f6a
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 29 deletions.
diff --git a/helm-charts/reference-server/templates/configmap.yaml b/helm-charts/reference-server/templates/configmap.yaml
@@ -9,7 +9,6 @@ data:
       version: 0.0.1
       isTest: false
       port: 8091
-      horizonEndpoint: https://horizon-testnet.stellar.org
       distributionWallet: GBN4NNCDGJO4XW4KQU3CBIESUJWFVBUZPOKUZHT7W7WRB7CWOA7BXVQF
       distributionWalletMemo:
       distributionWalletMemoType:

diff --git a/helm-charts/reference-server/values.yaml b/helm-charts/reference-server/values.yaml
@@ -9,6 +9,7 @@ container:
 
 config:
   app:
+    horizonEndpoint: https://horizon-testnet.stellar.org
     platformApiEndpoint: http://anchor-platform-svc-platform:8085
   data:
     url: postgresql-ref:5432

diff --git a/helm-charts/sep-service/templates/configmap.yaml b/helm-charts/sep-service/templates/configmap.yaml
@@ -4,6 +4,10 @@ metadata:
   name: anchor-config
   namespace: {{ .Values.namespace }}
 data:
-  {{ include "common.addMultiline" (list "anchor-config.yaml" .Values.anchor_config )}}
   {{ include "common.addMultiline" (list "sep1.toml" .Values.sep1_toml )}}
-  {{ include "common.addMultiline" (list "assets.yaml" .Values.assets_config )}}
+  {{ include "common.addMultiline" (list "assets.yaml" .Values.assets_config )}}
+  anchor-config.yaml: |
+    version: 1
+    {{- range $key, $value := .Values.config }}
+    {{ $key }}: {{ toYaml $value | nindent 6 }}
+    {{- end }}
diff --git a/helm-charts/sep-service/templates/eventprocessor-deployment.yaml b/helm-charts/sep-service/templates/eventprocessor-deployment.yaml
@@ -64,10 +64,6 @@ spec:
                 secretKeyRef:
                   name: {{ .Values.fullName }}-secrets
                   key: SEP6_MORE_INFO_URL_JWT_SECRET
-            - name: PLATFORM_API_BASE_URL
-              value: {{ print "http://" .Values.fullName "-svc-" .Values.services.platform.name ":" .Values.services.platform.containerPort }}
-            - name: CALLBACK_API_BASE_URL
-              value: {{ .Values.config.callbackApi.baseUrl }}
             - name: SECRET_EVENTS_QUEUE_KAFKA_USERNAME
               valueFrom:
                 secretKeyRef:

diff --git a/helm-charts/sep-service/templates/observer-deployment.yaml b/helm-charts/sep-service/templates/observer-deployment.yaml
@@ -84,8 +84,6 @@ spec:
                 secretKeyRef:
                   name: {{ .Values.fullName }}-secrets
                   key: SEP6_MORE_INFO_URL_JWT_SECRET
-            - name: PLATFORM_API_BASE_URL
-              value: {{ print "http://" .Values.fullName "-svc-" .Values.services.platform.name ":" .Values.services.platform.containerPort | default 8085 }}
           resources:
             requests:
               memory: {{ .Values.services.observer.deployment.resources.requests.memory }}

diff --git a/helm-charts/sep-service/templates/sepserver-deployment.yaml b/helm-charts/sep-service/templates/sepserver-deployment.yaml
@@ -94,10 +94,6 @@ spec:
                 secretKeyRef:
                   name: {{ .Values.fullName }}-secrets
                   key: SEP10_SIGNING_SEED
-            - name: PLATFORM_API_BASE_URL
-              value: {{ print "http://" .Values.fullName "-svc-" .Values.services.platform.name ":" .Values.services.platform.containerPort | default 8085 }}
-            - name: CALLBACK_API_BASE_URL
-              value: {{ .Values.config.callbackApi.baseUrl }}
             - name: SECRET_EVENTS_QUEUE_KAFKA_USERNAME
               valueFrom:
                 secretKeyRef:

diff --git a/helm-charts/sep-service/values.yaml b/helm-charts/sep-service/values.yaml
@@ -69,18 +69,6 @@ services:
           cpu: 1
 
 config:
-  callbackApi:
-    baseUrl: http://reference-server-svc-reference-server:8091
-
-ingress:
-  name: ingress-anchor-platform
-  className: nginx
-  annotations:
-    nginx.ingress.kubernetes.io/rewrite-target: /
-
-anchor_config: |
-  version: 1
-
   app_logging:
     stellar_level: DEBUG
     request_logger_enabled: true
@@ -97,6 +85,12 @@ anchor_config: |
     flyway_enabled: true
     ddl_auto: update
 
+  callback_api:
+    base_url: http://reference-server-svc-reference-server:8091
+
+  platform_api:
+    base_url: http://anchor-platform-svc-platform:8085
+
   events:
     enabled: true
     queue:
@@ -111,18 +105,18 @@ anchor_config: |
     toml:
       type: file
       value: /config/sep1.toml
-  
+
   sep6:
     enabled: true
-  
+
   sep10:
     enabled: true
     web_auth_domain: localhost:8080
     home_domains: localhost:8080
-  
+
   sep12:
     enabled: true
-  
+
   sep31:
     enabled: true
 
@@ -136,6 +130,12 @@ anchor_config: |
     more_info_url:
       base_url: http://localhost:8091
 
+ingress:
+  name: ingress-anchor-platform
+  className: nginx
+  annotations:
+    nginx.ingress.kubernetes.io/rewrite-target: /
+
 sep1_toml: |
   ACCOUNTS = ["GCSGSR6KQQ5BP2FXVPWRL6SWPUSFWLVONLIBJZUKTVQB5FYJFVL6XOXE"]
   VERSION = "0.1.0"