diff --git a/helm/ctdapp/templates/configmap-core.yaml b/helm/ctdapp/templates/configmap-core.yaml index 58a15ab0..a3c3f9cd 100644 --- a/helm/ctdapp/templates/configmap-core.yaml +++ b/helm/ctdapp/templates/configmap-core.yaml @@ -5,6 +5,41 @@ metadata: argocd.argoproj.io/sync-wave: "1" name: core-config data: + FLAG_CORE_HEALTHCHECK: "60" + FLAG_CORE_CHECK_SUBGRAPH_URLS: "200" + FLAG_CORE_GET_FUNDINGS: "900" + FLAG_CORE_GET_TICKET_PRICE: "900" + FLAG_CORE_AGGREGATE_PEERS: "300" + FLAG_CORE_GET_TOPOLOGY_DATA: "300" + FLAG_CORE_GET_SUBGRAPH_DATA: "300" + FLAG_CORE_GET_REGISTERED_NODES: "300" + FLAG_CORE_GET_NFT_HOLDERS: "900" + FLAG_CORE_APPLY_ECONOMIC_MODEL: "600" + + FLAG_NODE_HEALTHCHECK: "60" + FLAG_NODE_RETRIEVE_PEERS: "300" + FLAG_NODE_RETRIEVE_OUTGOING_CHANNELS: "600" + FLAG_NODE_RETRIEVE_INCOMING_CHANNELS: "600" + FLAG_NODE_RETRIEVE_BALANCES: "900" + FLAG_NODE_OPEN_CHANNELS: "900" + FLAG_NODE_CLOSE_OLD_CHANNELS: "900" + FLAG_NODE_CLOSE_PENDING_CHANNELS: "1800" + FLAG_NODE_FUND_CHANNELS: "900" + FLAG_NODE_GET_TOTAL_CHANNEL_FUNDS: "900" + + DISTRIBUTION_MIN_ELIGIBLE_PEERS: "100" + DISTRIBUTION_MAX_APR_PERCENTAGE: "15.0" + + PEER_MIN_VERSION: "2.0.7" + + GCP_FILE_PREFIX: expected_reward + GCP_FOLDER: expected_rewards + + ECONOMIC_MODEL_MIN_SAFE_ALLOWANCE: "-1" + ECONOMIC_MODEL_NFT_THRESHOLD: "-1" + + RABBITMQ_TASK_NAME: send_1_hop_message + RABBITMQ_PROJECT_NAME: ct-app {{- if .Values.ctdapp.core.extraEnvVars -}} {{ .Values.ctdapp.core.extraEnvVars | toYaml | nindent 2 }} {{- end }} \ No newline at end of file diff --git a/helm/ctdapp/templates/configmap-postman.yaml b/helm/ctdapp/templates/configmap-postman.yaml index f1b8372b..3f65f378 100644 --- a/helm/ctdapp/templates/configmap-postman.yaml +++ b/helm/ctdapp/templates/configmap-postman.yaml @@ -5,6 +5,11 @@ metadata: argocd.argoproj.io/sync-wave: "1" name: postman-config data: + PARAM_BATCH_SIZE: "200" + PARAM_DELAY_BETWEEN_TWO_MESSAGES: "0.2" + PARAM_MESSAGE_DELIVERY_TIMEOUT: "15" + PARAM_MAX_ATTEMPTS: "6" + RABBITMQ_PROJECT_NAME: ct-app {{- if .Values.ctdapp.postman.extraEnvVars -}} {{ .Values.ctdapp.postman.extraEnvVars | toYaml | nindent 2 }} {{- end }} \ No newline at end of file diff --git a/helm/ctdapp/templates/deployment-core.yaml b/helm/ctdapp/templates/deployment-core.yaml index 9f2ecf7c..86fb0814 100644 --- a/helm/ctdapp/templates/deployment-core.yaml +++ b/helm/ctdapp/templates/deployment-core.yaml @@ -28,8 +28,8 @@ spec: serviceAccountName: {{ include "ctdapp.serviceAccountName" . }} containers: - name: {{ .Chart.Name }} - image: "{{ .Values.ctdapp.image.core.repository }}:{{ .Values.ctdapp.image.core.tag }}" - imagePullPolicy: {{ .Values.ctdapp.image.core.pullPolicy }} + image: "{{ .Values.ctdapp.core.repository }}:{{ .Values.ctdapp.core.tag }}" + imagePullPolicy: {{ .Values.ctdapp.core.pullPolicy }} ports: - name: http containerPort: {{ .Values.ctdapp.service.port }} diff --git a/helm/ctdapp/templates/deployment-postman.yaml b/helm/ctdapp/templates/deployment-postman.yaml index fab09b78..1e342c81 100644 --- a/helm/ctdapp/templates/deployment-postman.yaml +++ b/helm/ctdapp/templates/deployment-postman.yaml @@ -28,8 +28,8 @@ spec: serviceAccountName: {{ include "ctdapp.serviceAccountName" . }} containers: - name: {{ .Chart.Name }} - image: "{{ .Values.ctdapp.image.postman.repository }}:{{ .Values.ctdapp.image.postman.tag }}" - imagePullPolicy: {{ .Values.ctdapp.image.postman.pullPolicy }} + image: "{{ .Values.ctdapp.postman.repository }}:{{ .Values.ctdapp.postman.tag }}" + imagePullPolicy: {{ .Values.ctdapp.postman.pullPolicy }} envFrom: - configMapRef: name: postman-config diff --git a/helm/ctdapp/values.yaml b/helm/ctdapp/values.yaml index f58ccf64..d5957a45 100644 --- a/helm/ctdapp/values.yaml +++ b/helm/ctdapp/values.yaml @@ -1,6 +1,5 @@ environmentName: "" ctdapp: - image: core: repository: europe-west3-docker.pkg.dev/hoprassociation/docker-images/cover-traffic diff --git a/helm/secrets-staging.sops.yaml b/helm/secrets-staging.sops.yaml index 5c242646..325c54f4 100644 --- a/helm/secrets-staging.sops.yaml +++ b/helm/secrets-staging.sops.yaml @@ -16,9 +16,12 @@ ctdapp: username: ENC[AES256_GCM,data:8kx+G5x7,iv:7Iuaab3j1P0Fa+zvvLk0KiaxiqA7gAR/c0L73o9u7CU=,tag:1AlE0bLsLKj1kKif3sB/eg==,type:str] virtualhost: ENC[AES256_GCM,data:quiqbqQN,iv:en9oeMNGGXM6oGwkX4KfnHhON/1NIQ2i5OFRAJO7NXQ=,tag:SdveTPa2Hr8JUo9ykl2ehg==,type:str] subgraph: + stakingUrl: ENC[AES256_GCM,data:UXoyoipM5CVDrvkSb5TVhUVnnUcb1Hfhz7QLH5UvIX+YgUShXwhL+KV/Hkp7CZhk2mPtML04P2RpFNyHx/X3bVINpC01C+vUBVGlsu8G3RkWYm3NZdcu6/EWlTcx5QGsLDg3F6LHmRMEiq6cYQ+kYmDo87e1ZByOOXUb,iv:yQqCJOqDnCEmHScL9IGR1AyVldofsSAEbInmH84kaas=,tag:xS32cZngQ5x5gJLBTads5A==,type:str] + stakingUrlBackup: ENC[AES256_GCM,data:1RFSxyDt+rjjyeBW54hga2UQJ3iyxiWFHSVmJ4KWbsyO7UCa3km0WWMM/RUy8WG1v3jMHMf0mnd6Lv5ROHAE4dWUm+8vV855wt8=,iv:iFiHu8MVDn0986OQqIRcqaUSAn6TZJBrsk+nfsP/ABM=,tag:aGMhZP03QYI5s4AjaiLksw==,type:str] safesBalanceUrl: ENC[AES256_GCM,data:7yp7I4/JKaWe/rKAndSV9RZjVRnnjrBz5S5Wc+Ju4+etrWmXNP+ZsSu0fqjus3p8vcF/RfCS2i15HLR+Bh8qISGRnVFAMOFHJYiIFqOIAefnGnGJIZTF5yTgMUhoY98dgq77XAuiqtTSDZQ4hmvpFemMM/L1sQFv+GjZ,iv:RcoYo91coC2lW3vDiPF0FTcM+FEC8J8lZ6TFNfZ/3D8=,tag:gTomJ1/hJKhYsASQOZvxZQ==,type:str] safesBalanceUrlBackup: ENC[AES256_GCM,data:oP6dVIxme8VAukzmhMTY3aCJTGiMtkKhK5Ext/857I3hiIsBhJ4Hv28/+Ys7X7jRdD0h4VnjCVByO3OSygeJAs1Sf9aBQuvCi4WYpQ==,iv:uZwldoiN+wADGtimX05+2/T8irp1O3OA9WyWHke538Y=,tag:f+dbpP/CEm56Xmg1B5PaiA==,type:str] - wxhporTxsUrl: ENC[AES256_GCM,data:dFClzw3WomvblSNcYPACXOU4p7Y+Hbp1lNrIxXPvU4wo39eg0S+SZeplhgQtCVDnOLrFo2B8TISmR2Dc+gXs8T6FfHkR,iv:21HVwIjtpDJppFUctm849EwMq3rZeEssBwwqnqcN/p8=,tag:kyo/GU+uBrupY9dAz5xefg==,type:str] + wxhoprTxsUrl: ENC[AES256_GCM,data:FirJ4hbxjMbou5o6K+0WVCwKYUPhmit+Iy88atrgtPaOYdXEhWzzs2zuIJ+ZnNXJElPMYr9KQf9Rhpn1AIt4drWH23URtfxMhsFZSguTT9CWX+qBnDXlx493LOFDBCufrAwYcXFOyey5AmDIO1WVEJxHfIoqgrrbHNk8,iv:bbHjIS6iCdB+mJ8935eIk0IRV9FJaSavQm/43hvh0/s=,tag:L8ioVhfx//fu2QQAUju9WQ==,type:str] + wxhoprTxsUrlBackup: ENC[AES256_GCM,data:zyc7R1s3EjnoxImzzB0QimkR/YTFp3JH0iy2qcKIhecosyYfXy+/KrHG6DhkFWVWzCmFZV81vmG9fRk2L1XK/kM2Yi1e,iv:+GwEL4ajYTG7OZTU1/kFFHQCMOwq1pUp+mWEvFsByTY=,tag:LoIzQTXVBwegd8faO6qJoQ==,type:str] sops: shamir_threshold: 1 kms: [] @@ -35,8 +38,8 @@ sops: U1Y1U3hub0Q1eVlWZS9HU3dYelpGbHcK8zlP32ezjRDORF9Z8OdKib/Hm0gdL4v5 oakH+9etUi3LoXowDza9ZocCwfgCjmx4WhKFCw/n3eRT0zBk4o+OaQ== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-04-11T15:07:37Z" - mac: ENC[AES256_GCM,data:lw4NEcxtTLxkCcE/ckn2uvCi7NJpFQVoR4bfWm6Nvul2g/b/5r1yoOzcIAiDuWHSG/WBPbSMAJfzefhonuu8smdxZh4U38aSTRSFI7RQlW67qBrRjOhBaUIQxQkn3UpSOYgIm/v+V/ErDhc4HtHieDqmH4OvWubMrANBiDzQyQQ=,iv:KmfzbtVxi2fkva2Den/U3tv9vkHelgKWjmtqClOaSLs=,tag:OUEfR8yWFEcqpSnyP70gPA==,type:str] + lastmodified: "2024-05-02T08:47:13Z" + mac: ENC[AES256_GCM,data:XYT2u/WfKcSAN7ymC6YRfGzHKly/HFkOjnBfLJr8lWXoWZrmjNdqMZD8YTVSk9sDAz1hqt+HPm7jNZxFezqqg+fosTwittpkJo/YPd2faZoCoZQF9N88YuIuOKZMc8fw88PdIUG/HRbPSbeWvYNsH3c+V0JFCAHH+KMv6ld4alk=,iv:zlmTLfZwbb+peP/RW9jUnSYecg/Z5ocRVsTANk7KRiU=,tag:tkjwriloWB9p3wqmc2WjrQ==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.8.0 diff --git a/helm/values-prod.yaml b/helm/values-prod.yaml index 6bfe79c7..50f7178f 100644 --- a/helm/values-prod.yaml +++ b/helm/values-prod.yaml @@ -6,66 +6,23 @@ green-nodes: enabled: false ctdapp: - image: - core: - tag: v2.1.10 - postman: - tag: v2.1.10 core: replicas: 1 + tag: v2.1.10 extraEnvVars: - FLAG_CORE_HEALTHCHECK: "60" - FLAG_CORE_CHECK_SUBGRAPH_URLS: "200" - FLAG_CORE_GET_FUNDINGS: "900" - FLAG_CORE_GET_TICKET_PRICE: "900" - FLAG_CORE_AGGREGATE_PEERS: "300" - FLAG_CORE_GET_TOPOLOGY_DATA: "300" - FLAG_CORE_GET_SUBGRAPH_DATA: "300" - FLAG_CORE_GET_REGISTERED_NODES: "300" - FLAG_CORE_GET_NFT_HOLDERS: "900" - FLAG_CORE_APPLY_ECONOMIC_MODEL: "600" FLAG_CORE_DISTRIBUTE_REWARDS: "1" - FLAG_NODE_HEALTHCHECK: "60" - FLAG_NODE_RETRIEVE_PEERS: "300" - FLAG_NODE_RETRIEVE_OUTGOING_CHANNELS: "600" - FLAG_NODE_RETRIEVE_INCOMING_CHANNELS: "600" - FLAG_NODE_RETRIEVE_BALANCES: "900" - FLAG_NODE_OPEN_CHANNELS: "900" - FLAG_NODE_CLOSE_OLD_CHANNELS: "900" - FLAG_NODE_CLOSE_PENDING_CHANNELS: "1800" - FLAG_NODE_FUND_CHANNELS: "900" - FLAG_NODE_GET_TOTAL_CHANNEL_FUNDS: "900" - - DISTRIBUTION_MIN_ELIGIBLE_PEERS: "100" + DISTRIBUTION_MIN_ELIGIBLE_PEERS: "5" DISTRIBUTION_MAX_APR_PERCENTAGE: "15.0" - - PEER_MIN_VERSION: "2.0.7" - - GCP_FILE_PREFIX: expected_reward - GCP_FOLDER: expected_rewards + GCP_BUCKET: hoprnet-ctdapp-prod ECONOMIC_MODEL_FILENAME: parameters-production.json - ECONOMIC_MODEL_MIN_SAFE_ALLOWANCE: "-1" - ECONOMIC_MODEL_NFT_THRESHOLD: "-1" + CHANNEL_MIN_BALANCE: "15" CHANNEL_FUNDING_AMOUNT: "50" CHANNEL_MAX_AGE_SECONDS: "172800" - - RABBITMQ_TASK_NAME: send_1_hop_message - RABBITMQ_PROJECT_NAME: ct-app - - LEGACY_SUBGRAPH_PAGINATION_SIZE: "1000" - LEGACY_SUBGRAPH_SAFES_BALANCE_QUERY: "{ safes(first: valfirst, skip: valskip) { registeredNodesInNetworkRegistry { node { id } safe { id balance { wxHoprBalance } allowance { wxHoprAllowance } } } } }" - LEGACY_SUBGRAPH_WXHOPR_TXS_QUERY: "{ transactions(where: { from: valfrom, to: valto }) { from to amount }} " - LEGACY_SUBGRAPH_FROM_ADDRESS: 0xd9a00176cf49dfb9ca3ef61805a2850f45cb1d05 postman: replicas: 1 - extraEnvVars: - PARAM_BATCH_SIZE: "200" - PARAM_DELAY_BETWEEN_TWO_MESSAGES: "0.2" - PARAM_MESSAGE_DELIVERY_TIMEOUT: "15" - PARAM_MAX_ATTEMPTS: "6" - RABBITMQ_PROJECT_NAME: ct-app \ No newline at end of file + tag: v2.1.10 \ No newline at end of file diff --git a/helm/values-staging.yaml b/helm/values-staging.yaml index 2d243529..782199d4 100644 --- a/helm/values-staging.yaml +++ b/helm/values-staging.yaml @@ -8,5 +8,15 @@ green-nodes: ctdapp: core: replicas: 0 + tag: ba586d0 + extraEnvVars: + GCP_BUCKET: hoprnet-ctdapp-staging + + ECONOMIC_MODEL_FILENAME: parameters-staging.json + + CHANNEL_MIN_BALANCE: "0.05" + CHANNEL_FUNDING_AMOUNT: "0.2" + CHANNEL_MAX_AGE_SECONDS: "172800" postman: - replicas: 0 \ No newline at end of file + replicas: 0 + tag: ba586d0 \ No newline at end of file