From 2b2311a6fd47ff9625c4a1e54ff3202e39151210 Mon Sep 17 00:00:00 2001 From: ausias-armesto Date: Mon, 29 Apr 2024 12:03:16 +0200 Subject: [PATCH 01/26] Scale deployment --- helm/values-prod.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/helm/values-prod.yaml b/helm/values-prod.yaml index 0dc6ef63..d5e0d50e 100644 --- a/helm/values-prod.yaml +++ b/helm/values-prod.yaml @@ -7,6 +7,6 @@ green-nodes: ctdapp: core: - replicas: 0 + replicas: 1 postman: - replicas: 0 \ No newline at end of file + replicas: 1 \ No newline at end of file From 773a1acfbea7063ca4f01004d26cd745c4fdc744 Mon Sep 17 00:00:00 2001 From: ausias-armesto Date: Mon, 29 Apr 2024 12:12:21 +0200 Subject: [PATCH 02/26] fix --- helm/values-prod.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/helm/values-prod.yaml b/helm/values-prod.yaml index d5e0d50e..51f9e36b 100644 --- a/helm/values-prod.yaml +++ b/helm/values-prod.yaml @@ -6,7 +6,12 @@ green-nodes: enabled: false ctdapp: + image: + core: + tag: v2.1.9 + postman: + tag: v2.1.9 core: replicas: 1 postman: - replicas: 1 \ No newline at end of file + replicas: 1 From d92d341e138d275d2600f7f08ff33000ab1ec82b Mon Sep 17 00:00:00 2001 From: ausias-armesto Date: Mon, 29 Apr 2024 12:24:35 +0200 Subject: [PATCH 03/26] Adding envVars --- helm/ctdapp/templates/configmap-core.yaml | 11 ++++++----- helm/ctdapp/templates/secret-subgraph.yaml | 5 ++++- helm/secrets-prod.sops.yaml | 9 ++++++--- helm/values-prod.yaml | 3 +++ 4 files changed, 19 insertions(+), 9 deletions(-) diff --git a/helm/ctdapp/templates/configmap-core.yaml b/helm/ctdapp/templates/configmap-core.yaml index 17d3aac5..6347f3f0 100644 --- a/helm/ctdapp/templates/configmap-core.yaml +++ b/helm/ctdapp/templates/configmap-core.yaml @@ -24,14 +24,15 @@ data: _FLAG_NODE_CLOSE_PENDING_CHANNELS: "900" FLAG_NODE_FUND_CHANNELS: "60" FLAG_NODE_GET_TOTAL_CHANNEL_FUNDS: "60" - DISTRIBUTION_MIN_ELIGIBLE_PEERS: "5" - DISTRIBUTION_MAX_APR_PERCENTAGE: "100.0" - PEER_MIN_VERSION: "0.0.0" + 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 GCP_BUCKET: hoprnet-ctdapp-{{ .Values.environmentName }} - ECONOMIC_MODEL_FILENAME: parameters-staging.json - ECONOMIC_MODEL_MIN_SAFE_ALLOWANCE: "0.000000001" + ECONOMIC_MODEL_FILENAME: parameters-{{ .Values.environmentName }}.json + ECONOMIC_MODEL_MIN_SAFE_ALLOWANCE: -1 + ECONOMIC_MODEL_NFT_THRESHOLD: -1 CHANNEL_MIN_BALANCE: "0.05" CHANNEL_FUNDING_AMOUNT: "0.2" CHANNEL_MAX_AGE_SECONDS: "172800" diff --git a/helm/ctdapp/templates/secret-subgraph.yaml b/helm/ctdapp/templates/secret-subgraph.yaml index 5381103f..d86c61a8 100644 --- a/helm/ctdapp/templates/secret-subgraph.yaml +++ b/helm/ctdapp/templates/secret-subgraph.yaml @@ -5,6 +5,9 @@ metadata: argocd.argoproj.io/sync-wave: "1" name: subgraph data: + SUBGRAPH_STAKING_URL: {{ .Values.ctdapp.subgraph.stakingUrl | b64enc }} + SUBGRAPH_STAKING_URL_BACKUP: {{ .Values.ctdapp.subgraph.stakingUrlBackup | b64enc }} SUBGRAPH_SAFES_BALANCE_URL: {{ .Values.ctdapp.subgraph.safesBalanceUrl | b64enc }} SUBGRAPH_SAFES_BALANCE_URL_BACKUP: {{ .Values.ctdapp.subgraph.safesBalanceUrlBackup | b64enc }} - SUBGRAPH_WXHOPR_TXS_URL: {{ .Values.ctdapp.subgraph.wxhporTxsUrl | b64enc }} + SUBGRAPH_WXHOPR_TXS_URL: {{ .Values.ctdapp.subgraph.wxhoprTxsUrl | b64enc }} + SUBGRAPH_WXHOPR_TXS_URL_BACKUP: {{ .Values.ctdapp.subgraph.wxhoprTxsUrlBackup | b64enc }} \ No newline at end of file diff --git a/helm/secrets-prod.sops.yaml b/helm/secrets-prod.sops.yaml index 195f70de..dfb70975 100644 --- a/helm/secrets-prod.sops.yaml +++ b/helm/secrets-prod.sops.yaml @@ -16,9 +16,12 @@ ctdapp: username: ENC[AES256_GCM,data:UqEYdiPk,iv:hQfljaXwcq7SVp48YmobIszg3tz7OKLTuSbRwncY8lI=,tag:/jbvYrZHMqhH9H2SsrkZSw==,type:str] virtualhost: ENC[AES256_GCM,data:gPQRRa/R,iv:Xc4CckYql/LCTZ8hODS20BpFwk6nC7Wva3jAhW3DiRs=,tag:iQK6s27EKxmBz1gyKr5sWA==,type:str] subgraph: + stakingUrl: ENC[AES256_GCM,data:woDzQFINcyCzfFVIJgGrX3yz2ZDNBmBlVYYJSKeVAwDEw032WSqEfRcyvH8J2kpA6FxXtJl0v1rJQKpq3vjUk9Cna1tJgq0XVfnYT0GEEcyMPoYMfLSmSWhzIpRoEMGGBsrJNeSk27VY2i2S6aEUrC+VSIIshwyQVytM,iv:iozSjoiUTwDJ55tvm4t9ETG0AHeNuLZz+UJ31dc7S3w=,tag:0Uj7GrGy/KwkEtA2oYojww==,type:str] + stakingUrlBackup: ENC[AES256_GCM,data:F+u1qw2U96Yk45Ldhu+qjdT/RLv6g+aWtEIbQOxBCdLc0CDXxs+fIn5JkBFdfRqEWzMR/P+tQspvlpIVNdtCDPkvCtRhLScJNWM=,iv:2QoiKnl3cuO/eCVFa6EcHqkNOC8ULR/MzVIXEyaUooI=,tag:cB5M7uD9AG7gigCDQHeY3A==,type:str] safesBalanceUrl: ENC[AES256_GCM,data:Q7vpVVkr7f9qa9wupUAKJy38fveVHiqquZdongllOsSfS1ZVsXjkvvS2fJ5upDlk3+Gc8u4ZBPWKykiEi96gircyv9WfHCMNp00rt7UbVbAAyswNLD/FARNn7+HcpIgy+Ckkf4HWB4cs6cDPOeAmDOrT/csf42m1Xp6K,iv:2HnPBNIwzUPjCFETf+dp1S+RR0p6HxE6GDUf0BfOzkg=,tag:OvN9pjWuhmVEknuh0TSXDA==,type:str] safesBalanceUrlBackup: ENC[AES256_GCM,data:Yo1S8Hasnz2rRIT+Zn8BGGJIeSCVXq1YxvuU9Uh06S6mufcEb1QNhBSgcuAoR5hh3h6on2hcWJZXR/8pCKxKLgBfoDJOSTKZyiaFuw==,iv:G8g+9Qa7wK/VN0NSkkpA0xFkUJu20tew/rW10oM+6sI=,tag:/P0V9H0HnY85H4DnWSRLEA==,type:str] - wxhporTxsUrl: ENC[AES256_GCM,data:xHBhBRBuwmWxc2HsVoNcQz4sa8Jw5f7hyBJrVB+deU2Vjij4zwmc5nvVB0yEFRstrVaroBwEqbDHG6IuPySX2CP4j6Km,iv:DOJ/YdgU0T3zzvIRKM0vMoff3GQy5WNb3oYZgCjI6Qw=,tag:PADxtF8/7p4tKEHu4qCAwg==,type:str] + wxhoprTxsUrl: ENC[AES256_GCM,data:hrNMykvK9dTs7qxSLQY4tOTHX7Y4IgqUPFt76E2fWSlp0xdpwCpGyduwzu87lQkrP1/4yGw5NRm/37l2n1rUweOnsYHxXMjuJxnow39K13ccWva8rN8eG5mYg0WM25XOnOD+vf+YMIYZOOeseNnTnimUu5CiZ2ezhr2l,iv:E7KxMfNzAMiEJL8576xqybFEokrlmoQkSwCbK58P2+Q=,tag:OugLOMTgx3q9w5zyPkXGHQ==,type:str] + wxhoprTxsUrlBackup: ENC[AES256_GCM,data:kPBhJ2NDLlbKWISwjvHjLPbh0Wi//Z2yt19kqcWQzsruA//SLXiWlMiAmG3ALxcgEam7Hwj2GVMt7bWiEeVXfyJBfiLa,iv:ZO2YXHZ5UqFLT/rvYrnV3kmomcQ1oieiGu9P3TJXmqo=,tag:KCenllaPEuKWmuWdr4Hjyg==,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:48Z" - mac: ENC[AES256_GCM,data:cmwDpF/z5NrNYnNVZ+ubFjVkeDW5obYDw57WDs9eRVmGqmNLWB5EzDLi0yT2I4IyhZzwcceSBkGkbfJHuZgYjGbyey0BlmPyAXNCnjjBH6WIjS5toNnKvm68lqmBzMUW6Jv+blYchv/vNy+JbBRGsmgeceQZZU0qpU1RdeXMmuA=,iv:m1S+2D4+vsMiAsxEWqvtBzTNSSVc5LB4qxVASud/EkA=,tag:l6+W7E74x8Qef31K/eCiBQ==,type:str] + lastmodified: "2024-04-29T10:20:03Z" + mac: ENC[AES256_GCM,data:vOeyytBfz20QPiPwTEZHE/vGXx+gP5SXcWA6fHcv8lzuMr2kLcEmwUEwIlz3S2axfOb0T6cXyQpyeHlxmC4D0KUPf/BDsMka8fulMdfV6CgiScW1zyN39hIE4en1mIU+PROk74ZtkQ6/rqAmNHml+x5+ukYZAZVCOa0EfcGL9+Q=,iv:A4fAX9ZrJAY7Cm9M07ZbW35QRwecfxjXcrcD0MAXWH0=,tag:SkcVMdY6QRcomg+kWCTVdw==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.8.0 diff --git a/helm/values-prod.yaml b/helm/values-prod.yaml index 51f9e36b..7a4aead8 100644 --- a/helm/values-prod.yaml +++ b/helm/values-prod.yaml @@ -13,5 +13,8 @@ ctdapp: tag: v2.1.9 core: replicas: 1 + # extraEnvVars: + # DISTRIBUTION_MIN_ELIGIBLE_PEERS: "100" + # DISTRIBUTION_MAX_APR_PERCENTAGE: "15.0" postman: replicas: 1 From 1668e5a56a3680ac93b1561226aae01f9f63c188 Mon Sep 17 00:00:00 2001 From: ausias-armesto Date: Mon, 29 Apr 2024 12:26:06 +0200 Subject: [PATCH 04/26] quote --- helm/ctdapp/templates/configmap-core.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/helm/ctdapp/templates/configmap-core.yaml b/helm/ctdapp/templates/configmap-core.yaml index 6347f3f0..91e2ac66 100644 --- a/helm/ctdapp/templates/configmap-core.yaml +++ b/helm/ctdapp/templates/configmap-core.yaml @@ -31,8 +31,8 @@ data: GCP_FOLDER: expected_rewards GCP_BUCKET: hoprnet-ctdapp-{{ .Values.environmentName }} ECONOMIC_MODEL_FILENAME: parameters-{{ .Values.environmentName }}.json - ECONOMIC_MODEL_MIN_SAFE_ALLOWANCE: -1 - ECONOMIC_MODEL_NFT_THRESHOLD: -1 + ECONOMIC_MODEL_MIN_SAFE_ALLOWANCE: "-1" + ECONOMIC_MODEL_NFT_THRESHOLD: "-1" CHANNEL_MIN_BALANCE: "0.05" CHANNEL_FUNDING_AMOUNT: "0.2" CHANNEL_MAX_AGE_SECONDS: "172800" From 3630c8806c6885016730cb01f64c4871e304ee0e Mon Sep 17 00:00:00 2001 From: ausias-armesto Date: Mon, 29 Apr 2024 12:27:40 +0200 Subject: [PATCH 05/26] scale down --- helm/values-prod.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/helm/values-prod.yaml b/helm/values-prod.yaml index 7a4aead8..7bc78ea3 100644 --- a/helm/values-prod.yaml +++ b/helm/values-prod.yaml @@ -12,9 +12,9 @@ ctdapp: postman: tag: v2.1.9 core: - replicas: 1 + replicas: 0 # extraEnvVars: # DISTRIBUTION_MIN_ELIGIBLE_PEERS: "100" # DISTRIBUTION_MAX_APR_PERCENTAGE: "15.0" postman: - replicas: 1 + replicas: 0 From d31eb461c933f4256de43d4e05c3b180691a7a8c Mon Sep 17 00:00:00 2001 From: ausias-armesto Date: Mon, 29 Apr 2024 12:33:10 +0200 Subject: [PATCH 06/26] changing properties --- helm/ctdapp/templates/configmap-core.yaml | 4 +--- helm/ctdapp/templates/configmap-postman.yaml | 2 +- helm/values-prod.yaml | 8 +++++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/helm/ctdapp/templates/configmap-core.yaml b/helm/ctdapp/templates/configmap-core.yaml index 91e2ac66..e28d0945 100644 --- a/helm/ctdapp/templates/configmap-core.yaml +++ b/helm/ctdapp/templates/configmap-core.yaml @@ -24,8 +24,6 @@ data: _FLAG_NODE_CLOSE_PENDING_CHANNELS: "900" FLAG_NODE_FUND_CHANNELS: "60" FLAG_NODE_GET_TOTAL_CHANNEL_FUNDS: "60" - 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 @@ -42,6 +40,6 @@ data: SUBGRAPH_SAFES_BALANCE_QUERY: "{ safes(first: valfirst, skip: valskip) { registeredNodesInNetworkRegistry { node { id } safe { id balance { wxHoprBalance } allowance { wxHoprAllowance } } } } }" SUBGRAPH_WXHOPR_TXS_QUERY: "{ transactions(where: { from: valfrom, to: valto }) { from to amount }} " SUBGRAPH_FROM_ADDRESS: "0xd9a00176cf49dfb9ca3ef61805a2850f45cb1d05" - {{- if .Values.ctdapp.core.extraEnvVars }} + {{- 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 01e1b346..eed9413e 100644 --- a/helm/ctdapp/templates/configmap-postman.yaml +++ b/helm/ctdapp/templates/configmap-postman.yaml @@ -10,6 +10,6 @@ data: PARAM_MESSAGE_DELIVERY_TIMEOUT: "20" PARAM_MAX_ATTEMPTS: "4" RABBITMQ_PROJECT_NAME: ct-app - {{- if .Values.ctdapp.postman.extraEnvVars }} + {{- if .Values.ctdapp.postman.extraEnvVars -}} {{ .Values.ctdapp.postman.extraEnvVars | toYaml | nindent 2 }} {{- end }} \ No newline at end of file diff --git a/helm/values-prod.yaml b/helm/values-prod.yaml index 7bc78ea3..107a048e 100644 --- a/helm/values-prod.yaml +++ b/helm/values-prod.yaml @@ -13,8 +13,10 @@ ctdapp: tag: v2.1.9 core: replicas: 0 - # extraEnvVars: - # DISTRIBUTION_MIN_ELIGIBLE_PEERS: "100" - # DISTRIBUTION_MAX_APR_PERCENTAGE: "15.0" + extraEnvVars: + DISTRIBUTION_MIN_ELIGIBLE_PEERS: "100" + DISTRIBUTION_MAX_APR_PERCENTAGE: "15.0" postman: replicas: 0 + # extraEnvVars: + # PROPERTY_NAME: PROPERTY_VALUE From bb17e67e6462bc9b84d1a24def9035c9c38c16a3 Mon Sep 17 00:00:00 2001 From: Jean Demeusy Date: Mon, 29 Apr 2024 12:36:04 +0200 Subject: [PATCH 07/26] updated prod env variables --- helm/ctdapp/templates/configmap-core.yaml | 35 ------------- helm/ctdapp/templates/configmap-postman.yaml | 5 -- helm/values-prod.yaml | 53 +++++++++++++++++++- 3 files changed, 51 insertions(+), 42 deletions(-) diff --git a/helm/ctdapp/templates/configmap-core.yaml b/helm/ctdapp/templates/configmap-core.yaml index e28d0945..58a15ab0 100644 --- a/helm/ctdapp/templates/configmap-core.yaml +++ b/helm/ctdapp/templates/configmap-core.yaml @@ -5,41 +5,6 @@ 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: "600" - FLAG_CORE_AGGREGATE_PEERS: "30" - FLAG_CORE_GET_TOPOLOGY_DATA: "30" - FLAG_CORE_GET_SUBGRAPH_DATA: "30" - FLAG_CORE_APPLY_ECONOMIC_MODEL: "20" - FLAG_CORE_DISTRIBUTE_REWARDS: "1" - FLAG_CORE_GET_TICKET_PRICE: "60" - FLAG_NODE_HEALTHCHECK: "60" - FLAG_NODE_RETRIEVE_PEERS: "60" - FLAG_NODE_RETRIEVE_OUTGOING_CHANNELS: "60" - FLAG_NODE_RETRIEVE_INCOMING_CHANNELS: "60" - FLAG_NODE_RETRIEVE_BALANCES: "900" - FLAG_NODE_OPEN_CHANNELS: "60" - _FLAG_NODE_CLOSE_OLD_CHANNELS: "900" - _FLAG_NODE_CLOSE_PENDING_CHANNELS: "900" - FLAG_NODE_FUND_CHANNELS: "60" - FLAG_NODE_GET_TOTAL_CHANNEL_FUNDS: "60" - PEER_MIN_VERSION: "2.0.7" - GCP_FILE_PREFIX: expected_reward - GCP_FOLDER: expected_rewards - GCP_BUCKET: hoprnet-ctdapp-{{ .Values.environmentName }} - ECONOMIC_MODEL_FILENAME: parameters-{{ .Values.environmentName }}.json - ECONOMIC_MODEL_MIN_SAFE_ALLOWANCE: "-1" - ECONOMIC_MODEL_NFT_THRESHOLD: "-1" - CHANNEL_MIN_BALANCE: "0.05" - CHANNEL_FUNDING_AMOUNT: "0.2" - CHANNEL_MAX_AGE_SECONDS: "172800" - RABBITMQ_TASK_NAME: send_1_hop_message - RABBITMQ_PROJECT_NAME: ct-app - SUBGRAPH_PAGINATION_SIZE: "1000" - SUBGRAPH_SAFES_BALANCE_QUERY: "{ safes(first: valfirst, skip: valskip) { registeredNodesInNetworkRegistry { node { id } safe { id balance { wxHoprBalance } allowance { wxHoprAllowance } } } } }" - SUBGRAPH_WXHOPR_TXS_QUERY: "{ transactions(where: { from: valfrom, to: valto }) { from to amount }} " - SUBGRAPH_FROM_ADDRESS: "0xd9a00176cf49dfb9ca3ef61805a2850f45cb1d05" {{- 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 eed9413e..f1b8372b 100644 --- a/helm/ctdapp/templates/configmap-postman.yaml +++ b/helm/ctdapp/templates/configmap-postman.yaml @@ -5,11 +5,6 @@ metadata: argocd.argoproj.io/sync-wave: "1" name: postman-config data: - PARAM_BATCH_SIZE: "100" - PARAM_DELAY_BETWEEN_TWO_MESSAGES: "0.3" - PARAM_MESSAGE_DELIVERY_TIMEOUT: "20" - PARAM_MAX_ATTEMPTS: "4" - 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/values-prod.yaml b/helm/values-prod.yaml index 107a048e..8c3db03b 100644 --- a/helm/values-prod.yaml +++ b/helm/values-prod.yaml @@ -14,9 +14,58 @@ ctdapp: core: replicas: 0 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_MAX_APR_PERCENTAGE: "15.0" + + PEER_MIN_VERSION: "2.0.7" + + GCP_FILE_PREFIX: expected_reward + GCP_FOLDER: expected_rewards + GCP_BUCKET: ct-platform-ct + + 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: 0 - # extraEnvVars: - # PROPERTY_NAME: PROPERTY_VALUE + 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 From 8262df95efffb11218b1be63d7411f3828a7b07d Mon Sep 17 00:00:00 2001 From: Jean Demeusy Date: Mon, 29 Apr 2024 12:36:34 +0200 Subject: [PATCH 08/26] deploy core and postman --- helm/values-prod.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/helm/values-prod.yaml b/helm/values-prod.yaml index 8c3db03b..82a15b6e 100644 --- a/helm/values-prod.yaml +++ b/helm/values-prod.yaml @@ -12,7 +12,7 @@ ctdapp: postman: tag: v2.1.9 core: - replicas: 0 + replicas: 1 extraEnvVars: FLAG_CORE_HEALTHCHECK: "60" FLAG_CORE_CHECK_SUBGRAPH_URLS: "200" @@ -62,7 +62,7 @@ ctdapp: LEGACY_SUBGRAPH_WXHOPR_TXS_QUERY: "{ transactions(where: { from: valfrom, to: valto }) { from to amount }} " LEGACY_SUBGRAPH_FROM_ADDRESS: 0xd9a00176cf49dfb9ca3ef61805a2850f45cb1d05 postman: - replicas: 0 + replicas: 1 extraEnvVars: PARAM_BATCH_SIZE: "200" PARAM_DELAY_BETWEEN_TWO_MESSAGES: "0.2" From 7fc76fd96362fc5e93afa224500e9e9c5bd1882a Mon Sep 17 00:00:00 2001 From: ausias-armesto Date: Mon, 29 Apr 2024 12:41:32 +0200 Subject: [PATCH 09/26] change bucket name --- helm/values-prod.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/values-prod.yaml b/helm/values-prod.yaml index 82a15b6e..210b0f97 100644 --- a/helm/values-prod.yaml +++ b/helm/values-prod.yaml @@ -44,7 +44,7 @@ ctdapp: GCP_FILE_PREFIX: expected_reward GCP_FOLDER: expected_rewards - GCP_BUCKET: ct-platform-ct + GCP_BUCKET: hoprnet-ctdapp-prod ECONOMIC_MODEL_FILENAME: parameters-production.json ECONOMIC_MODEL_MIN_SAFE_ALLOWANCE: "-1" From 06b4671767cf6a64f22b4972fc12262657c0f010 Mon Sep 17 00:00:00 2001 From: ausias-armesto Date: Mon, 29 Apr 2024 12:53:34 +0200 Subject: [PATCH 10/26] Upgrading --- helm/values-prod.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/helm/values-prod.yaml b/helm/values-prod.yaml index 210b0f97..6bfe79c7 100644 --- a/helm/values-prod.yaml +++ b/helm/values-prod.yaml @@ -8,9 +8,9 @@ green-nodes: ctdapp: image: core: - tag: v2.1.9 + tag: v2.1.10 postman: - tag: v2.1.9 + tag: v2.1.10 core: replicas: 1 extraEnvVars: From ecd70e6d564e30af8e6f3749b9e7706951908d72 Mon Sep 17 00:00:00 2001 From: ausias-armesto Date: Mon, 29 Apr 2024 13:05:00 +0200 Subject: [PATCH 11/26] fix url --- helm/ctdapp/templates/configmap-nodes.yaml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/helm/ctdapp/templates/configmap-nodes.yaml b/helm/ctdapp/templates/configmap-nodes.yaml index 3d19abd6..57105216 100644 --- a/helm/ctdapp/templates/configmap-nodes.yaml +++ b/helm/ctdapp/templates/configmap-nodes.yaml @@ -6,9 +6,7 @@ metadata: name: hoprd-nodes data: NODE_ADDRESS_1: http://hoprd-ctdapp-1:3001 - NODE_ADDRESS_2: http://hoprd-ctdapp--2:3001 - NODE_ADDRESS_3: http://hoprd-ctdapp--3:3001 - NODE_ADDRESS_4: http://hoprd-ctdapp--4:3001 - NODE_ADDRESS_5: http://hoprd-ctdapp--5:3001 - - + NODE_ADDRESS_2: http://hoprd-ctdapp-2:3001 + NODE_ADDRESS_3: http://hoprd-ctdapp-3:3001 + NODE_ADDRESS_4: http://hoprd-ctdapp-4:3001 + NODE_ADDRESS_5: http://hoprd-ctdapp-5:3001 From 974a75694c9f975c87ab455b541b58e6069eca91 Mon Sep 17 00:00:00 2001 From: ausias-armesto Date: Mon, 29 Apr 2024 13:08:14 +0200 Subject: [PATCH 12/26] add url x --- helm/ctdapp/templates/configmap-nodes.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/helm/ctdapp/templates/configmap-nodes.yaml b/helm/ctdapp/templates/configmap-nodes.yaml index 57105216..44117ade 100644 --- a/helm/ctdapp/templates/configmap-nodes.yaml +++ b/helm/ctdapp/templates/configmap-nodes.yaml @@ -10,3 +10,4 @@ data: NODE_ADDRESS_3: http://hoprd-ctdapp-3:3001 NODE_ADDRESS_4: http://hoprd-ctdapp-4:3001 NODE_ADDRESS_5: http://hoprd-ctdapp-5:3001 + NODE_ADDRESS_X: http://hoprd-ctdapp-5:3001 From 60b8b68649791b6b537902f47561edcfb011fde8 Mon Sep 17 00:00:00 2001 From: ausias-armesto Date: Mon, 29 Apr 2024 13:09:32 +0200 Subject: [PATCH 13/26] adding secret x --- helm/ctdapp/templates/secret-nodes.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/helm/ctdapp/templates/secret-nodes.yaml b/helm/ctdapp/templates/secret-nodes.yaml index 2c02d52a..272e040b 100644 --- a/helm/ctdapp/templates/secret-nodes.yaml +++ b/helm/ctdapp/templates/secret-nodes.yaml @@ -10,5 +10,6 @@ data: NODE_KEY_3: {{ .Values.wallet.hoprdApiToken | b64enc }} NODE_KEY_4: {{ .Values.wallet.hoprdApiToken | b64enc }} NODE_KEY_5: {{ .Values.wallet.hoprdApiToken | b64enc }} + NODE_KEY_X: {{ .Values.wallet.hoprdApiToken | b64enc }} From 39eed11ec86c08ce192a005c6d55ca9d4e467935 Mon Sep 17 00:00:00 2001 From: ausias-armesto Date: Mon, 29 Apr 2024 13:18:20 +0200 Subject: [PATCH 14/26] new metrics --- helm/ctdapp/templates/service-monitor.yaml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 helm/ctdapp/templates/service-monitor.yaml diff --git a/helm/ctdapp/templates/service-monitor.yaml b/helm/ctdapp/templates/service-monitor.yaml new file mode 100644 index 00000000..c8c009bf --- /dev/null +++ b/helm/ctdapp/templates/service-monitor.yaml @@ -0,0 +1,13 @@ +apiVersion: monitoring.coreos.com/v1 +kind: ServiceMonitor +metadata: + name: ct-core +spec: + endpoints: + - interval: 30s + path: /metrics + port: http + selector: + matchLabels: + app.kubernetes.io/instance: ctdapp + app.kubernetes.io/component: core From f9dea3c898f985586a926db1c6f3bda5f64cf1e4 Mon Sep 17 00:00:00 2001 From: ausias-armesto Date: Mon, 29 Apr 2024 13:23:52 +0200 Subject: [PATCH 15/26] changing --- helm/ctdapp/templates/service.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/helm/ctdapp/templates/service.yaml b/helm/ctdapp/templates/service.yaml index 4ced83ae..e1ffd157 100644 --- a/helm/ctdapp/templates/service.yaml +++ b/helm/ctdapp/templates/service.yaml @@ -3,9 +3,10 @@ kind: Service metadata: annotations: argocd.argoproj.io/sync-wave: "5" - name: {{ include "ctdapp.fullname" . }} + name: {{ include "ctdapp.fullname" . }}-core labels: {{- include "ctdapp.labels" . | nindent 4 }} + app.kubernetes.io/component: core spec: type: {{ .Values.ctdapp.service.type }} ports: From c75caee14352e4d9d42797fc6d7096f19d39f919 Mon Sep 17 00:00:00 2001 From: ausias-armesto Date: Mon, 29 Apr 2024 13:42:44 +0200 Subject: [PATCH 16/26] update safe secrets --- helm/secrets-prod.sops.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/helm/secrets-prod.sops.yaml b/helm/secrets-prod.sops.yaml index dfb70975..7494682f 100644 --- a/helm/secrets-prod.sops.yaml +++ b/helm/secrets-prod.sops.yaml @@ -18,8 +18,8 @@ ctdapp: subgraph: stakingUrl: ENC[AES256_GCM,data:woDzQFINcyCzfFVIJgGrX3yz2ZDNBmBlVYYJSKeVAwDEw032WSqEfRcyvH8J2kpA6FxXtJl0v1rJQKpq3vjUk9Cna1tJgq0XVfnYT0GEEcyMPoYMfLSmSWhzIpRoEMGGBsrJNeSk27VY2i2S6aEUrC+VSIIshwyQVytM,iv:iozSjoiUTwDJ55tvm4t9ETG0AHeNuLZz+UJ31dc7S3w=,tag:0Uj7GrGy/KwkEtA2oYojww==,type:str] stakingUrlBackup: ENC[AES256_GCM,data:F+u1qw2U96Yk45Ldhu+qjdT/RLv6g+aWtEIbQOxBCdLc0CDXxs+fIn5JkBFdfRqEWzMR/P+tQspvlpIVNdtCDPkvCtRhLScJNWM=,iv:2QoiKnl3cuO/eCVFa6EcHqkNOC8ULR/MzVIXEyaUooI=,tag:cB5M7uD9AG7gigCDQHeY3A==,type:str] - safesBalanceUrl: ENC[AES256_GCM,data:Q7vpVVkr7f9qa9wupUAKJy38fveVHiqquZdongllOsSfS1ZVsXjkvvS2fJ5upDlk3+Gc8u4ZBPWKykiEi96gircyv9WfHCMNp00rt7UbVbAAyswNLD/FARNn7+HcpIgy+Ckkf4HWB4cs6cDPOeAmDOrT/csf42m1Xp6K,iv:2HnPBNIwzUPjCFETf+dp1S+RR0p6HxE6GDUf0BfOzkg=,tag:OvN9pjWuhmVEknuh0TSXDA==,type:str] - safesBalanceUrlBackup: ENC[AES256_GCM,data:Yo1S8Hasnz2rRIT+Zn8BGGJIeSCVXq1YxvuU9Uh06S6mufcEb1QNhBSgcuAoR5hh3h6on2hcWJZXR/8pCKxKLgBfoDJOSTKZyiaFuw==,iv:G8g+9Qa7wK/VN0NSkkpA0xFkUJu20tew/rW10oM+6sI=,tag:/P0V9H0HnY85H4DnWSRLEA==,type:str] + safesBalanceUrl: ENC[AES256_GCM,data:FSBo8HfsdRO0v4YnQZt1eOTiyYWXlFwLfhuRlYqvn9uBT9w5II1LCqoZee1N4qe3sml7WtIcFaQqXIuqd/HPsySWH926xXcDsayua7R+CDTRuNLAr7aSQaYpWvtN43KuUNGVcYsFcfmIt/H5KBik/s0oK+85o8DK9jaY,iv:0BoTfXDmkVclzu04jx3Z/jySWHNpbP5v3J6P5Qr6o1g=,tag:dX775EYVby4H53vwY+a4tg==,type:str] + safesBalanceUrlBackup: ENC[AES256_GCM,data:wOKPFtlStVD0PgnKmZT77Vds/OMMVGf27NzjOfGKLUx+2IZOo48CDUqSSOdI06EuJDpUClipI3u8nv9n7NPzhz8VH+vfBaeGd3HRXw==,iv:G69DTROezfVD78X4NLxWXRnVk89NHrEHQnM8ByY/x50=,tag:Z/PGe9EYucOWwD+41CgZAA==,type:str] wxhoprTxsUrl: ENC[AES256_GCM,data:hrNMykvK9dTs7qxSLQY4tOTHX7Y4IgqUPFt76E2fWSlp0xdpwCpGyduwzu87lQkrP1/4yGw5NRm/37l2n1rUweOnsYHxXMjuJxnow39K13ccWva8rN8eG5mYg0WM25XOnOD+vf+YMIYZOOeseNnTnimUu5CiZ2ezhr2l,iv:E7KxMfNzAMiEJL8576xqybFEokrlmoQkSwCbK58P2+Q=,tag:OugLOMTgx3q9w5zyPkXGHQ==,type:str] wxhoprTxsUrlBackup: ENC[AES256_GCM,data:kPBhJ2NDLlbKWISwjvHjLPbh0Wi//Z2yt19kqcWQzsruA//SLXiWlMiAmG3ALxcgEam7Hwj2GVMt7bWiEeVXfyJBfiLa,iv:ZO2YXHZ5UqFLT/rvYrnV3kmomcQ1oieiGu9P3TJXmqo=,tag:KCenllaPEuKWmuWdr4Hjyg==,type:str] sops: @@ -38,8 +38,8 @@ sops: U1Y1U3hub0Q1eVlWZS9HU3dYelpGbHcK8zlP32ezjRDORF9Z8OdKib/Hm0gdL4v5 oakH+9etUi3LoXowDza9ZocCwfgCjmx4WhKFCw/n3eRT0zBk4o+OaQ== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-04-29T10:20:03Z" - mac: ENC[AES256_GCM,data:vOeyytBfz20QPiPwTEZHE/vGXx+gP5SXcWA6fHcv8lzuMr2kLcEmwUEwIlz3S2axfOb0T6cXyQpyeHlxmC4D0KUPf/BDsMka8fulMdfV6CgiScW1zyN39hIE4en1mIU+PROk74ZtkQ6/rqAmNHml+x5+ukYZAZVCOa0EfcGL9+Q=,iv:A4fAX9ZrJAY7Cm9M07ZbW35QRwecfxjXcrcD0MAXWH0=,tag:SkcVMdY6QRcomg+kWCTVdw==,type:str] + lastmodified: "2024-04-29T11:42:38Z" + mac: ENC[AES256_GCM,data:zliyavrH71mP61SUXgJTmKUVhFl2CdKoaIUCz2EA2npvvjHovtIkWQDuYjHAphiSx0JA+6AMR5XpmWP/g9yK5UnuY6Nakp365cpWpnpuz71gX63a6/i5gFLniGw5HfSNwTmddgV7aRz3sKRu+7+xOIC5Nhz+2MdcUyPpKWroWa8=,iv:KMdSzuIqi1j7AbzNTtYXwWOyUHU3f6dp5EtazJ3gmyg=,tag:iFPgmQb7UlvXYF9tsfJplQ==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.8.0 From 6d87be564acd1d670a8bff2d5955487bb5c63bfd Mon Sep 17 00:00:00 2001 From: Jean Demeusy Date: Mon, 29 Apr 2024 14:14:57 +0200 Subject: [PATCH 17/26] increase concurrency to 5 --- helm/ctdapp/templates/deployment-postman.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/ctdapp/templates/deployment-postman.yaml b/helm/ctdapp/templates/deployment-postman.yaml index 2f410fd7..fab09b78 100644 --- a/helm/ctdapp/templates/deployment-postman.yaml +++ b/helm/ctdapp/templates/deployment-postman.yaml @@ -45,6 +45,6 @@ spec: - /bin/sh - -c - | - celery -A postman.postman_tasks.app worker -c 4 -n worker@%h -l info -E -Q "send_messages" + celery -A postman.postman_tasks.app worker -c 5 -n worker@%h -l info -E -Q "send_messages" resources: {{- toYaml .Values.ctdapp.postman.resources | nindent 12 }} From df4b601a49225ea3345d868a88e698c65f747a4a Mon Sep 17 00:00:00 2001 From: ausias-armesto Date: Mon, 29 Apr 2024 15:45:33 +0200 Subject: [PATCH 18/26] pointing to instance 0 of the RabbitMQ --- helm/secrets-prod.sops.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/helm/secrets-prod.sops.yaml b/helm/secrets-prod.sops.yaml index 7494682f..7a77672e 100644 --- a/helm/secrets-prod.sops.yaml +++ b/helm/secrets-prod.sops.yaml @@ -10,7 +10,7 @@ ctdapp: port: ENC[AES256_GCM,data:vuFTbQ==,iv:9yDTSwKXdWvt1lkVvl+QoC1wnE+qD653wYFMTuppYyM=,tag:Mdbzs4jCvKNtD3GUBuq6xg==,type:str] username: ENC[AES256_GCM,data:KkDjvb1N,iv:5Vv30U3IrFAAV5TbI9j5Tgbg+aS+Fz/q7phHs5gfFMg=,tag:iEKuvWTFr2yC3P+2+ugWuw==,type:str] rabbitmq: - celeryBrokerUrl: ENC[AES256_GCM,data:wENlYiZSB5l/ueQfqe1x/uGOmv3nmMb2bBPMo/AI+UHMwm5WWQUkwN9acLbtpfj86xS4BjjK6nOBemDhiT2saYdActhSflm6gVPhpk49IwpHivIwD+a68Wr29a9syaSSQZgoIgq3stt81NB2JD1n9Dc77zT/4w==,iv:Je/2lki7vyuWmT9rq0oxsWSmGpXsTOh5JoQpg8S4I/k=,tag:E092kXVGcMJXhBxx8F+C8A==,type:str] + celeryBrokerUrl: ENC[AES256_GCM,data:9x5TQUzXaRYwSADhXH7MV1ug2l0PlsPSM0DEKIDyx+2g6DeKBs8gTPNYQ3wtTrsO7QeZ7A7+/OpyjmVE43bXmSo7DQUVVmqQJnLKtist7m4hBnjllXuL9F8WqgE2I4MdV82+bnQgSxgxosEW+qEtsOCQ5md7RLtPpsA5UhRA1D5Nba+A+R8G2EI1,iv:M2lUPsVV8S3xUxRPEXne3foNnB7QjpalyVb1o2GDMbw=,tag:ByOUCTm9CrJn1HsSn8myUw==,type:str] host: ENC[AES256_GCM,data:wolMpSLTdXiUoav37BJYi1Ze8R2z0Dg+L93nvjuUuVk=,iv:Yu0zzEK/rbftQB9SqDBzUlE6B66kSN6o2GUUFv3MzP4=,tag:5+3J7vd0okvJ2ISr26NWZg==,type:str] password: ENC[AES256_GCM,data:z1UL135iNu92XqTi7LOSIggBRbPoiDs+M+C9ss8yCVb3pQm3cnJRQHriUVVQNR37AuKMT/jYTdB0VfpC0DXGIw==,iv:0uSO9/ZCyu0sfI9ySg5RR4ftkVGU9wuhWICxHYtg4fk=,tag:cOByGF+CTJzP7njuM+jAhQ==,type:str] username: ENC[AES256_GCM,data:UqEYdiPk,iv:hQfljaXwcq7SVp48YmobIszg3tz7OKLTuSbRwncY8lI=,tag:/jbvYrZHMqhH9H2SsrkZSw==,type:str] @@ -38,8 +38,8 @@ sops: U1Y1U3hub0Q1eVlWZS9HU3dYelpGbHcK8zlP32ezjRDORF9Z8OdKib/Hm0gdL4v5 oakH+9etUi3LoXowDza9ZocCwfgCjmx4WhKFCw/n3eRT0zBk4o+OaQ== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-04-29T11:42:38Z" - mac: ENC[AES256_GCM,data:zliyavrH71mP61SUXgJTmKUVhFl2CdKoaIUCz2EA2npvvjHovtIkWQDuYjHAphiSx0JA+6AMR5XpmWP/g9yK5UnuY6Nakp365cpWpnpuz71gX63a6/i5gFLniGw5HfSNwTmddgV7aRz3sKRu+7+xOIC5Nhz+2MdcUyPpKWroWa8=,iv:KMdSzuIqi1j7AbzNTtYXwWOyUHU3f6dp5EtazJ3gmyg=,tag:iFPgmQb7UlvXYF9tsfJplQ==,type:str] + lastmodified: "2024-04-29T13:45:08Z" + mac: ENC[AES256_GCM,data:TYADvKjKesSIZqA++cbq6vkVpgmRfXO7lfp1hqpty3iUCjkOMG86KD2ICy/3TjkuSUu8LTE5k6TOmyDTgrVfCkXcTcaiY/+5iz1OOVPeXxL80qDpIz3L+3Rweg8nX/Nf7teN/s77fzRxvB6KrT7Jiivy2y0v8fWkgFhivUfyLR4=,iv:ieJ9rj7MGcxult6ETe2derMShH3kdi6/lYZu8+kRsfw=,tag:9lWEZfuA9i6E+bYpwOL87Q==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.8.0 From 39fb47f26d11f65258437299058def8469f75e03 Mon Sep 17 00:00:00 2001 From: ausias-armesto Date: Mon, 29 Apr 2024 15:48:12 +0200 Subject: [PATCH 19/26] fix pod name --- helm/secrets-prod.sops.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/helm/secrets-prod.sops.yaml b/helm/secrets-prod.sops.yaml index 7a77672e..0d59d8f3 100644 --- a/helm/secrets-prod.sops.yaml +++ b/helm/secrets-prod.sops.yaml @@ -10,7 +10,7 @@ ctdapp: port: ENC[AES256_GCM,data:vuFTbQ==,iv:9yDTSwKXdWvt1lkVvl+QoC1wnE+qD653wYFMTuppYyM=,tag:Mdbzs4jCvKNtD3GUBuq6xg==,type:str] username: ENC[AES256_GCM,data:KkDjvb1N,iv:5Vv30U3IrFAAV5TbI9j5Tgbg+aS+Fz/q7phHs5gfFMg=,tag:iEKuvWTFr2yC3P+2+ugWuw==,type:str] rabbitmq: - celeryBrokerUrl: ENC[AES256_GCM,data:9x5TQUzXaRYwSADhXH7MV1ug2l0PlsPSM0DEKIDyx+2g6DeKBs8gTPNYQ3wtTrsO7QeZ7A7+/OpyjmVE43bXmSo7DQUVVmqQJnLKtist7m4hBnjllXuL9F8WqgE2I4MdV82+bnQgSxgxosEW+qEtsOCQ5md7RLtPpsA5UhRA1D5Nba+A+R8G2EI1,iv:M2lUPsVV8S3xUxRPEXne3foNnB7QjpalyVb1o2GDMbw=,tag:ByOUCTm9CrJn1HsSn8myUw==,type:str] + celeryBrokerUrl: ENC[AES256_GCM,data:KMnaOiV77/oow3nlKnn0akHTz6kIn4MAnT+7bO5H8k6krKyDaS+9/Ce/rx4kVKaNMqMybdCaHy1a4mfckgU53yVBdKdOyENHLibOz9+sDUoKxyPwc51C5csY5IB80F3u4ma2PQbf00O+DZSoTrOwsd6ZlngKCfCmEYUsylA7xsREhL8TILbwuGMDHyON2cEvK6c4Jdn/23sMOhLr,iv:FxNARIPoDsPKbOTrFipZvV9Pbo1P9akYnP3sY6vOG20=,tag:S2XDKFDfETnmmZmQ0eWJtw==,type:str] host: ENC[AES256_GCM,data:wolMpSLTdXiUoav37BJYi1Ze8R2z0Dg+L93nvjuUuVk=,iv:Yu0zzEK/rbftQB9SqDBzUlE6B66kSN6o2GUUFv3MzP4=,tag:5+3J7vd0okvJ2ISr26NWZg==,type:str] password: ENC[AES256_GCM,data:z1UL135iNu92XqTi7LOSIggBRbPoiDs+M+C9ss8yCVb3pQm3cnJRQHriUVVQNR37AuKMT/jYTdB0VfpC0DXGIw==,iv:0uSO9/ZCyu0sfI9ySg5RR4ftkVGU9wuhWICxHYtg4fk=,tag:cOByGF+CTJzP7njuM+jAhQ==,type:str] username: ENC[AES256_GCM,data:UqEYdiPk,iv:hQfljaXwcq7SVp48YmobIszg3tz7OKLTuSbRwncY8lI=,tag:/jbvYrZHMqhH9H2SsrkZSw==,type:str] @@ -38,8 +38,8 @@ sops: U1Y1U3hub0Q1eVlWZS9HU3dYelpGbHcK8zlP32ezjRDORF9Z8OdKib/Hm0gdL4v5 oakH+9etUi3LoXowDza9ZocCwfgCjmx4WhKFCw/n3eRT0zBk4o+OaQ== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-04-29T13:45:08Z" - mac: ENC[AES256_GCM,data:TYADvKjKesSIZqA++cbq6vkVpgmRfXO7lfp1hqpty3iUCjkOMG86KD2ICy/3TjkuSUu8LTE5k6TOmyDTgrVfCkXcTcaiY/+5iz1OOVPeXxL80qDpIz3L+3Rweg8nX/Nf7teN/s77fzRxvB6KrT7Jiivy2y0v8fWkgFhivUfyLR4=,iv:ieJ9rj7MGcxult6ETe2derMShH3kdi6/lYZu8+kRsfw=,tag:9lWEZfuA9i6E+bYpwOL87Q==,type:str] + lastmodified: "2024-04-29T13:48:02Z" + mac: ENC[AES256_GCM,data:LafU5ry12qi2E1BTxZwWbVLvxptIgQ2eLVl682nFZ2NUdb6HWHjUk/gu25MPnM5W42QG+xe+A2lbn2qFSJa+li25nnNaNKHG9y2MN4Q8cwq6g6DTYXpyg8NyuQqRGWXUhVyZTF4/4EIEuMu+jFJOg34HxFXuecYvbwWErE5x6Sg=,iv:3Yhdd8G3bBvfGNopdgqGkj5JKVvyTS+IVavCNx2BhVs=,tag:d7mH/rC7V6Daw1J7ZpcDFg==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.8.0 From 2a28cc9d6434b614e1ee7ddc5c30f9f51cd190b8 Mon Sep 17 00:00:00 2001 From: ausias-armesto Date: Mon, 29 Apr 2024 16:08:12 +0200 Subject: [PATCH 20/26] change to static IP --- helm/secrets-prod.sops.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/helm/secrets-prod.sops.yaml b/helm/secrets-prod.sops.yaml index 0d59d8f3..12008ec4 100644 --- a/helm/secrets-prod.sops.yaml +++ b/helm/secrets-prod.sops.yaml @@ -10,7 +10,7 @@ ctdapp: port: ENC[AES256_GCM,data:vuFTbQ==,iv:9yDTSwKXdWvt1lkVvl+QoC1wnE+qD653wYFMTuppYyM=,tag:Mdbzs4jCvKNtD3GUBuq6xg==,type:str] username: ENC[AES256_GCM,data:KkDjvb1N,iv:5Vv30U3IrFAAV5TbI9j5Tgbg+aS+Fz/q7phHs5gfFMg=,tag:iEKuvWTFr2yC3P+2+ugWuw==,type:str] rabbitmq: - celeryBrokerUrl: ENC[AES256_GCM,data:KMnaOiV77/oow3nlKnn0akHTz6kIn4MAnT+7bO5H8k6krKyDaS+9/Ce/rx4kVKaNMqMybdCaHy1a4mfckgU53yVBdKdOyENHLibOz9+sDUoKxyPwc51C5csY5IB80F3u4ma2PQbf00O+DZSoTrOwsd6ZlngKCfCmEYUsylA7xsREhL8TILbwuGMDHyON2cEvK6c4Jdn/23sMOhLr,iv:FxNARIPoDsPKbOTrFipZvV9Pbo1P9akYnP3sY6vOG20=,tag:S2XDKFDfETnmmZmQ0eWJtw==,type:str] + celeryBrokerUrl: ENC[AES256_GCM,data:g866vnm8c+1VROAXphVUI2fQUkxmw0xEyz7QvRytI1cSani+C3rNW8aVoD1e2Cf9d1p0WnvsjxC4vdQTXUExYS1LiB0FTOCf8edr6j1coQ5CsLrdNVCn4Va5P0LWwgj4,iv:RShBvEWw2vD48kiwTQ3/8LfTFx/ifYEr/KgJbtX1lto=,tag:cCSEj+nK2m4teii1pGOTlw==,type:str] host: ENC[AES256_GCM,data:wolMpSLTdXiUoav37BJYi1Ze8R2z0Dg+L93nvjuUuVk=,iv:Yu0zzEK/rbftQB9SqDBzUlE6B66kSN6o2GUUFv3MzP4=,tag:5+3J7vd0okvJ2ISr26NWZg==,type:str] password: ENC[AES256_GCM,data:z1UL135iNu92XqTi7LOSIggBRbPoiDs+M+C9ss8yCVb3pQm3cnJRQHriUVVQNR37AuKMT/jYTdB0VfpC0DXGIw==,iv:0uSO9/ZCyu0sfI9ySg5RR4ftkVGU9wuhWICxHYtg4fk=,tag:cOByGF+CTJzP7njuM+jAhQ==,type:str] username: ENC[AES256_GCM,data:UqEYdiPk,iv:hQfljaXwcq7SVp48YmobIszg3tz7OKLTuSbRwncY8lI=,tag:/jbvYrZHMqhH9H2SsrkZSw==,type:str] @@ -38,8 +38,8 @@ sops: U1Y1U3hub0Q1eVlWZS9HU3dYelpGbHcK8zlP32ezjRDORF9Z8OdKib/Hm0gdL4v5 oakH+9etUi3LoXowDza9ZocCwfgCjmx4WhKFCw/n3eRT0zBk4o+OaQ== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-04-29T13:48:02Z" - mac: ENC[AES256_GCM,data:LafU5ry12qi2E1BTxZwWbVLvxptIgQ2eLVl682nFZ2NUdb6HWHjUk/gu25MPnM5W42QG+xe+A2lbn2qFSJa+li25nnNaNKHG9y2MN4Q8cwq6g6DTYXpyg8NyuQqRGWXUhVyZTF4/4EIEuMu+jFJOg34HxFXuecYvbwWErE5x6Sg=,iv:3Yhdd8G3bBvfGNopdgqGkj5JKVvyTS+IVavCNx2BhVs=,tag:d7mH/rC7V6Daw1J7ZpcDFg==,type:str] + lastmodified: "2024-04-29T14:07:28Z" + mac: ENC[AES256_GCM,data:ipvEq7q4XMKVVsvBnPdyZbkaw6ng3SEswLo17Zk6Tgbd5H6i4K23n+yM977ZWdQFm8P1PZQiGiLHMv/mSOXJB1Xu89he1lIYUki8/02IxPwqDw9o2N37zrjOd6whRKARxMS/h1el9uV2v259FZPvz5I6Hv1hOpaEJCuTAsqhBYI=,iv:mFc7QBg42W8QYPhbsi6OHgxmwI6VyaoGMmOJYrUMQ5E=,tag:56r5Vqcn36TnC+MGw1B4WQ==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.8.0 From 114a03e1707b10b611d9da7317bc4af10ff9d7a0 Mon Sep 17 00:00:00 2001 From: ausias-armesto Date: Mon, 29 Apr 2024 16:29:54 +0200 Subject: [PATCH 21/26] updated to correct url --- helm/secrets-prod.sops.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/helm/secrets-prod.sops.yaml b/helm/secrets-prod.sops.yaml index 12008ec4..d7706997 100644 --- a/helm/secrets-prod.sops.yaml +++ b/helm/secrets-prod.sops.yaml @@ -10,7 +10,7 @@ ctdapp: port: ENC[AES256_GCM,data:vuFTbQ==,iv:9yDTSwKXdWvt1lkVvl+QoC1wnE+qD653wYFMTuppYyM=,tag:Mdbzs4jCvKNtD3GUBuq6xg==,type:str] username: ENC[AES256_GCM,data:KkDjvb1N,iv:5Vv30U3IrFAAV5TbI9j5Tgbg+aS+Fz/q7phHs5gfFMg=,tag:iEKuvWTFr2yC3P+2+ugWuw==,type:str] rabbitmq: - celeryBrokerUrl: ENC[AES256_GCM,data:g866vnm8c+1VROAXphVUI2fQUkxmw0xEyz7QvRytI1cSani+C3rNW8aVoD1e2Cf9d1p0WnvsjxC4vdQTXUExYS1LiB0FTOCf8edr6j1coQ5CsLrdNVCn4Va5P0LWwgj4,iv:RShBvEWw2vD48kiwTQ3/8LfTFx/ifYEr/KgJbtX1lto=,tag:cCSEj+nK2m4teii1pGOTlw==,type:str] + celeryBrokerUrl: ENC[AES256_GCM,data:YeJ3+fQakxITppmjR9WfvArngsiOqIxVnD3XKP4+u4M+O8f8DX51DaEakjaMs9z8gmIgEKMwPLTG6w7DJrmUve5SESrTwuq8UBJjgRUuQI9pJTYY53ptNqpxOT7bkstxBZQAubTWlqVVYKtQbFw9EwbbvyE2d5JYoxcxf+MmEnV3W399R2mBlXMbInWtPCjv54+6ZOcbZ3UW,iv:C3ikenpLqSOC3HeI2pgPuOWwX9uhBg62Axwcgz1naic=,tag:rIzMYCRzEjd8kOJrKakuiA==,type:str] host: ENC[AES256_GCM,data:wolMpSLTdXiUoav37BJYi1Ze8R2z0Dg+L93nvjuUuVk=,iv:Yu0zzEK/rbftQB9SqDBzUlE6B66kSN6o2GUUFv3MzP4=,tag:5+3J7vd0okvJ2ISr26NWZg==,type:str] password: ENC[AES256_GCM,data:z1UL135iNu92XqTi7LOSIggBRbPoiDs+M+C9ss8yCVb3pQm3cnJRQHriUVVQNR37AuKMT/jYTdB0VfpC0DXGIw==,iv:0uSO9/ZCyu0sfI9ySg5RR4ftkVGU9wuhWICxHYtg4fk=,tag:cOByGF+CTJzP7njuM+jAhQ==,type:str] username: ENC[AES256_GCM,data:UqEYdiPk,iv:hQfljaXwcq7SVp48YmobIszg3tz7OKLTuSbRwncY8lI=,tag:/jbvYrZHMqhH9H2SsrkZSw==,type:str] @@ -38,8 +38,8 @@ sops: U1Y1U3hub0Q1eVlWZS9HU3dYelpGbHcK8zlP32ezjRDORF9Z8OdKib/Hm0gdL4v5 oakH+9etUi3LoXowDza9ZocCwfgCjmx4WhKFCw/n3eRT0zBk4o+OaQ== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-04-29T14:07:28Z" - mac: ENC[AES256_GCM,data:ipvEq7q4XMKVVsvBnPdyZbkaw6ng3SEswLo17Zk6Tgbd5H6i4K23n+yM977ZWdQFm8P1PZQiGiLHMv/mSOXJB1Xu89he1lIYUki8/02IxPwqDw9o2N37zrjOd6whRKARxMS/h1el9uV2v259FZPvz5I6Hv1hOpaEJCuTAsqhBYI=,iv:mFc7QBg42W8QYPhbsi6OHgxmwI6VyaoGMmOJYrUMQ5E=,tag:56r5Vqcn36TnC+MGw1B4WQ==,type:str] + lastmodified: "2024-04-29T14:29:43Z" + mac: ENC[AES256_GCM,data:zCnYH0GBK2JUV4jEnvqkUPlDqvvnSFTDgXiGEIC6LY5fGuM4ddG9vBGppb62Yz1+GwlE1WXDzEYi6s21dYhbTRINIyc9EQqq3xEJajSqAiH2LTnuqLtifUKTeSuACvqR6Fk/3EVDbNIWfoOqUMRJGABFErvflPg6RXzFw7SsOeE=,iv:p7Bz0nsRoaZqTXBOoQ3LAg2pMvzaalsH9kFUNx1YL6o=,tag:5S7cO3pbkJoisklZ1HgyYw==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.8.0 From 3687a3165ff104a667762f9dc3fec04327e24fb6 Mon Sep 17 00:00:00 2001 From: ausias-armesto Date: Mon, 29 Apr 2024 16:48:48 +0200 Subject: [PATCH 22/26] revert --- helm/ctdapp/templates/configmap-nodes.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/helm/ctdapp/templates/configmap-nodes.yaml b/helm/ctdapp/templates/configmap-nodes.yaml index 4ae230d4..44117ade 100644 --- a/helm/ctdapp/templates/configmap-nodes.yaml +++ b/helm/ctdapp/templates/configmap-nodes.yaml @@ -10,5 +10,4 @@ data: NODE_ADDRESS_3: http://hoprd-ctdapp-3:3001 NODE_ADDRESS_4: http://hoprd-ctdapp-4:3001 NODE_ADDRESS_5: http://hoprd-ctdapp-5:3001 - - + NODE_ADDRESS_X: http://hoprd-ctdapp-5:3001 From bc312f722200a90130d9a6b557aa47eb37361bb0 Mon Sep 17 00:00:00 2001 From: ausias-armesto Date: Mon, 29 Apr 2024 17:52:02 +0200 Subject: [PATCH 23/26] Distributing auto-funding across different time-zones --- helm/values-common.yaml | 1 - helm/values-prod-blue.yaml | 4 ++++ helm/values-prod-green.yaml | 4 ++++ helm/values-staging-blue.yaml | 5 +++++ helm/values-staging-green.yaml | 4 ++++ 5 files changed, 17 insertions(+), 1 deletion(-) diff --git a/helm/values-common.yaml b/helm/values-common.yaml index 523b3584..31735460 100644 --- a/helm/values-common.yaml +++ b/helm/values-common.yaml @@ -37,5 +37,4 @@ deployment: identityPool: funding: enabled: true - schedule: 0 1 * * 1 nativeAmount: 1 diff --git a/helm/values-prod-blue.yaml b/helm/values-prod-blue.yaml index a6379615..f2b1ea44 100644 --- a/helm/values-prod-blue.yaml +++ b/helm/values-prod-blue.yaml @@ -12,6 +12,10 @@ config: | allow_recursive: false strategies: [] +identityPool: + funding: + schedule: 0 8 * * 1 + identities: ctdapp-blue-node-1: identityFile: "eyJjcnlwdG8iOnsiY2lwaGVyIjoiYWVzLTEyOC1jdHIiLCJjaXBoZXJwYXJhbXMiOnsiaXYiOiJjNzQxOWVmMDlkZjE4OWQ5YzE1ZmVmNzE4ZGIyODRkYiJ9LCJjaXBoZXJ0ZXh0IjoiZjQ2ODIzZjJjYTE3OWFmNGU4MGQ4NjIyNTNhMTRhZjE1Zjk4YjhhM2NiN2Y1YzYxNThhYmIzMmQyZThhMDhmYjk4NTQ5YzU2M2ExOTM5N2I1MjVlMGYzMTBlYjllZGE2ODQyMTc4MzVmNTg2ZWQyNTRkZThmNDBkYTI4NjFjMWQ2YjdlOGM5ZWUwMzFmYzE3OTNiZDRiM2UwOWYzNmVkYWE5ZGJkMTI4YTNhNGViZjM4NzdiYWZhMDEyZjMzZTI0ZDBhZjJlYjgxNDgzMzk3NzdmOTkyNTAxMWE0NjEzZDQ4M2FlZTNiZDE5NTkzMjNlN2Y0ZWI3MmYwMWI4NzNmNzNmNjg1M2I0NDFiMmMzYWJmYjVkNmFjNWFhOWRjYWFiYjA0M2FlNWVhYzQyZjY2NjQ4MGY0NDUyMzI3YWQ0ODJlMTcwMTNkZmRjZmUwZmZiZmJmNDIwNjQiLCJrZGYiOiJzY3J5cHQiLCJrZGZwYXJhbXMiOnsiZGtsZW4iOjMyLCJuIjoyLCJwIjoxLCJyIjo4LCJzYWx0IjoiZGI2ZDE0ODM0NGNmNGZlZDM3ZTgyMWUyMDUyYTNlODU1NjBkMTJkYWIwOTkzY2I1MTFkZjU5Y2ViZjNlY2Q3MiJ9LCJtYWMiOiIwNzIzMDhkOGVlNTgyYjBkMjFjNzgxNGRjYTY3YTM1YjU3YjU5OGI0MTljYTkzZTIzZTljZWIyMTdmM2RkNzZhIn0sImlkIjoiMGY1Y2NjOTgtNTRhNi00ZjZjLTgyZGQtZWE3YWRiZTQ4OTYxIiwidmVyc2lvbiI6M30=" diff --git a/helm/values-prod-green.yaml b/helm/values-prod-green.yaml index f0c6e784..514d3339 100644 --- a/helm/values-prod-green.yaml +++ b/helm/values-prod-green.yaml @@ -12,6 +12,10 @@ config: | allow_recursive: false strategies: [] +identityPool: + funding: + schedule: 10 8 * * 1 + identities: ctdapp-green-node-1: identityFile: "" diff --git a/helm/values-staging-blue.yaml b/helm/values-staging-blue.yaml index c3db8693..332de830 100644 --- a/helm/values-staging-blue.yaml +++ b/helm/values-staging-blue.yaml @@ -12,6 +12,11 @@ config: | allow_recursive: false strategies: [] +identityPool: + funding: + schedule: 20 8 * * 1 + + identities: ctdapp-blue-node-1: identityFile: "eyJjcnlwdG8iOnsiY2lwaGVyIjoiYWVzLTEyOC1jdHIiLCJjaXBoZXJwYXJhbXMiOnsiaXYiOiIxODg5MDczNTE2MzAyZTE0NWM2YjEyZjRmMjZiZTM5MyJ9LCJjaXBoZXJ0ZXh0IjoiNzliZDA2OGQ4N2EyZTI1NWUzY2ViNDQ5Y2M4ZWM4ZGViOGI1YjMzMmJiYzcxMTJhMmNkYmM5NTRmYjkyMmMxMjkwNDU5NTI0NGRlNjQ4MzdkZDFiMmI2ZjUyY2Y3NDg3NGQ3MWFjMDFmMzIxZjE3MGFhZTk2ZWFlZmZmNDhlYzgyNjQ2ODk0N2E4YTRhNTQyM2RhYTQ5MTFkOTM1YzdiNGQwZjQ3ZjMwMTAxYWVjZTdkNzY5OGFjYjIyZGU1OGNhYmUxMDY0ZTU1MDk2NWNiNTAxZjUyYzU2MzQyMDQ1MTFhNTVmZWViZDhkYjkwZWQ0ODVjZGVmMzUwZTFkYTk5YWU2NDUyNmFiMTExODJmNTBiYjExZjQ5NzJlMTJlYWRiODNlZjA4NTIwNjUyMmFjYzRiYmMxZTdlNGRmNTQxMjA3OGE3YzM0MjRmODM3YjdkZjM5MGI0NDkiLCJrZGYiOiJzY3J5cHQiLCJrZGZwYXJhbXMiOnsiZGtsZW4iOjMyLCJuIjo4MTkyLCJwIjoxLCJyIjo4LCJzYWx0IjoiNzM2OTQ1ZmEwZTFjMTQ3MjRmN2Q0YWQ5MjYyOWExYmVmYTlhNDI4MjQ3ZmRmYzI1MTY4MDdlY2MxMTNmMjU0ZCJ9LCJtYWMiOiI4ODgzMzhmZjViNDk3MTJlZjMzMzFiMDlmNTY2NmIwY2IzZDkyNTdhNGQxNjk0M2U3ZjVmODQzY2I1YWIyOTk2In0sImlkIjoiMDdlOTUxMzEtMWU4ZC00YzI5LTk4OTQtZWVkZDU5NDJlMTM2IiwidmVyc2lvbiI6M30=" diff --git a/helm/values-staging-green.yaml b/helm/values-staging-green.yaml index f1702ca9..c5dcca77 100644 --- a/helm/values-staging-green.yaml +++ b/helm/values-staging-green.yaml @@ -12,6 +12,10 @@ config: | allow_recursive: false strategies: [] +identityPool: + funding: + schedule: 30 8 * * 1 + identities: ctdapp-green-node-1: identityFile: "eyJjcnlwdG8iOnsiY2lwaGVyIjoiYWVzLTEyOC1jdHIiLCJjaXBoZXJwYXJhbXMiOnsiaXYiOiI3YTU4MzJjYzhkMWNkYmE3Y2FkM2Y1MDM4MTc2ZWZhMCJ9LCJjaXBoZXJ0ZXh0IjoiZTAyZjAwYTlkNjY1NzA3Nzk5OGNhYzIzZjMzMzc5NmY1N2JjZTBlMWI2NWYwMWMxMWQ4ZGRkNGUzMTE1OGUwMDFhNDhkODNkYjcxNWVjNzhkNjJhODA2Mzk3OGE3NDM3OGZmNjQ4YzM3MzU0YTQ3MzcyNzFiY2E4YTVjMzY4NGNhZDQyM2Q4MmI5OWQ0ZTE5MzVkZjZjOTQ2ZjY4NzA1YzhmZWIzZGY2ZDYwMzhjZmFiZjZlY2I3Njc0MDM3ZWU2ZThlMDUwYzRlNGE3YTk5MDEyYzE3ZmViYzk3N2U5ZjNiYjFjYWNmMGYyZTQ0ZWFkYTA4Y2JhYmI2ZWRiMGE0MjAzZDExODZhYTBlNzE0Njk5NTEzMGU5YzZhZDRlMDNmNWRkZjFmZGMzNzMzYWY5MmM1NzJmODMyODNjN2RmZDhiYTlkNjhmNjQ0MTAwNjJhMTM1MWQ3ZTkiLCJrZGYiOiJzY3J5cHQiLCJrZGZwYXJhbXMiOnsiZGtsZW4iOjMyLCJuIjo4MTkyLCJwIjoxLCJyIjo4LCJzYWx0IjoiY2FhYzc5MmRkNjY2YWViNzFiMWE1ZDcyOTA1MDM4ZjViMWEzMDE5Y2U5NWJmODQ2MmU2ZmZlYzVkOWNmYWU4ZiJ9LCJtYWMiOiI3MmE5Mjg1OGU1ZjZkYjc2NjQyOGE2NGRlMjhmNDdhMTczN2FkMzlkZmRjZDljNjA3MjkxNzczMTgxYzliOGMzIn0sImlkIjoiNzIzYjdmOGQtNWZiMC00MjQzLWIyZDAtYjAxMmRmNWYwMzVkIiwidmVyc2lvbiI6M30=" From 14d690a14743743274fec7e0ab65626b42f01bdc Mon Sep 17 00:00:00 2001 From: Jean Demeusy Date: Tue, 30 Apr 2024 14:17:56 +0200 Subject: [PATCH 24/26] Update configuration values for ctdapp in staging environment and default values --- helm/ctdapp/templates/configmap-core.yaml | 32 +++++++++++++++ helm/ctdapp/templates/configmap-postman.yaml | 5 +++ helm/ctdapp/templates/deployment-core.yaml | 4 +- helm/ctdapp/templates/deployment-postman.yaml | 4 +- helm/ctdapp/values.yaml | 18 ++++---- helm/secrets-staging.sops.yaml | 8 +++- helm/values-prod.yaml | 41 +------------------ helm/values-staging.yaml | 17 +++++++- 8 files changed, 73 insertions(+), 56 deletions(-) diff --git a/helm/ctdapp/templates/configmap-core.yaml b/helm/ctdapp/templates/configmap-core.yaml index 58a15ab0..ffc7740f 100644 --- a/helm/ctdapp/templates/configmap-core.yaml +++ b/helm/ctdapp/templates/configmap-core.yaml @@ -5,6 +5,38 @@ 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_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 318609ea..1f8db947 100644 --- a/helm/ctdapp/values.yaml +++ b/helm/ctdapp/values.yaml @@ -1,15 +1,13 @@ environmentName: "" ctdapp: - - image: - core: - repository: europe-west6-docker.pkg.dev/ctdapp-391309/ctdapp/cover-traffic - pullPolicy: Always - tag: ba586d0 - postman: - repository: europe-west6-docker.pkg.dev/ctdapp-391309/ctdapp/cover-traffic - pullPolicy: Always - tag: ba586d0 + core: + repository: europe-west6-docker.pkg.dev/ctdapp-391309/ctdapp/cover-traffic + pullPolicy: Always + tag: ba586d0 + postman: + repository: europe-west6-docker.pkg.dev/ctdapp-391309/ctdapp/cover-traffic + pullPolicy: Always + tag: ba586d0 nameOverride: "" fullnameOverride: "" diff --git a/helm/secrets-staging.sops.yaml b/helm/secrets-staging.sops.yaml index 5c242646..c8e7696b 100644 --- a/helm/secrets-staging.sops.yaml +++ b/helm/secrets-staging.sops.yaml @@ -15,7 +15,13 @@ ctdapp: password: ENC[AES256_GCM,data:GHD4VfJVxva7YO6M7i2Xv8W8R2HqMfmuQot6XvEECBvkpyyzeiD9kxVRj+WRJG4y+v6dZ8WVffeamR3MnO+QpQ==,iv:FfSQ4hy953tt6ZXp2F3u26lGBpumicBQL2YvrYPoanQ=,tag:lcmmCiuj+Fyy7c4hlWtEAw==,type:str] 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: + subgraph: + # TODO: Update link here. + # They are the same as for production, except for "safesBalanceUrl" and "safesBalanceUrlBackup": + # - safesBalanceUrl: FEQcaX9qfh31YL2K7rxRN5a3sr9rjMWkguJnby7StNRo -> FcyLT3XGc2nEtaKjfB2SqigXsrEaGGBYsDfhEmsQ26dA + # - safesBalanceUrlBackup: hopr-nodes-dufour -> hopr-nodes-rotsee + + 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] diff --git a/helm/values-prod.yaml b/helm/values-prod.yaml index 6bfe79c7..88fa50ca 100644 --- a/helm/values-prod.yaml +++ b/helm/values-prod.yaml @@ -14,58 +14,19 @@ ctdapp: core: replicas: 1 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_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 + replicas: 1 \ No newline at end of file diff --git a/helm/values-staging.yaml b/helm/values-staging.yaml index 2d243529..67883cb5 100644 --- a/helm/values-staging.yaml +++ b/helm/values-staging.yaml @@ -8,5 +8,20 @@ green-nodes: ctdapp: core: replicas: 0 + tag: ba586d0 + extraEnvVars: + FLAG_NODE_OPEN_CHANNELS: "900" + FLAG_NODE_CLOSE_OLD_CHANNELS: "900" + FLAG_NODE_CLOSE_PENDING_CHANNELS: "1800" + FLAG_NODE_FUND_CHANNELS: "900" + + 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 From df53a31bafa957ec2f404aa1805061166e565de9 Mon Sep 17 00:00:00 2001 From: Jean Demeusy Date: Tue, 30 Apr 2024 14:22:25 +0200 Subject: [PATCH 25/26] Update configuration values for ctdapp in staging environment and default values --- helm/ctdapp/templates/configmap-core.yaml | 4 ++++ helm/values-prod.yaml | 17 ++++++----------- helm/values-staging.yaml | 5 ----- 3 files changed, 10 insertions(+), 16 deletions(-) diff --git a/helm/ctdapp/templates/configmap-core.yaml b/helm/ctdapp/templates/configmap-core.yaml index ffc7740f..cee5b449 100644 --- a/helm/ctdapp/templates/configmap-core.yaml +++ b/helm/ctdapp/templates/configmap-core.yaml @@ -21,6 +21,10 @@ data: 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" diff --git a/helm/values-prod.yaml b/helm/values-prod.yaml index 88fa50ca..c689c9e4 100644 --- a/helm/values-prod.yaml +++ b/helm/values-prod.yaml @@ -6,21 +6,15 @@ 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_DISTRIBUTE_REWARDS: "1" - FLAG_NODE_OPEN_CHANNELS: "900" - FLAG_NODE_CLOSE_OLD_CHANNELS: "900" - FLAG_NODE_CLOSE_PENDING_CHANNELS: "1800" - FLAG_NODE_FUND_CHANNELS: "900" - + DISTRIBUTION_MIN_ELIGIBLE_PEERS: "5" + DISTRIBUTION_MAX_APR_PERCENTAGE: "15.0" + GCP_BUCKET: hoprnet-ctdapp-prod ECONOMIC_MODEL_FILENAME: parameters-production.json @@ -29,4 +23,5 @@ ctdapp: CHANNEL_FUNDING_AMOUNT: "50" CHANNEL_MAX_AGE_SECONDS: "172800" postman: - replicas: 1 \ No newline at end of file + replicas: 1 + tag: v2.1.10 \ No newline at end of file diff --git a/helm/values-staging.yaml b/helm/values-staging.yaml index 67883cb5..782199d4 100644 --- a/helm/values-staging.yaml +++ b/helm/values-staging.yaml @@ -10,11 +10,6 @@ ctdapp: replicas: 0 tag: ba586d0 extraEnvVars: - FLAG_NODE_OPEN_CHANNELS: "900" - FLAG_NODE_CLOSE_OLD_CHANNELS: "900" - FLAG_NODE_CLOSE_PENDING_CHANNELS: "1800" - FLAG_NODE_FUND_CHANNELS: "900" - GCP_BUCKET: hoprnet-ctdapp-staging ECONOMIC_MODEL_FILENAME: parameters-staging.json From 97cc97b9f57d56cd521ee179908327de9545b7e7 Mon Sep 17 00:00:00 2001 From: ausias-armesto Date: Thu, 2 May 2024 10:47:25 +0200 Subject: [PATCH 26/26] Secrets updated --- helm/secrets-staging.sops.yaml | 17 +++++++---------- helm/values-prod.yaml | 5 ----- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/helm/secrets-staging.sops.yaml b/helm/secrets-staging.sops.yaml index c8e7696b..325c54f4 100644 --- a/helm/secrets-staging.sops.yaml +++ b/helm/secrets-staging.sops.yaml @@ -15,16 +15,13 @@ ctdapp: password: ENC[AES256_GCM,data:GHD4VfJVxva7YO6M7i2Xv8W8R2HqMfmuQot6XvEECBvkpyyzeiD9kxVRj+WRJG4y+v6dZ8WVffeamR3MnO+QpQ==,iv:FfSQ4hy953tt6ZXp2F3u26lGBpumicBQL2YvrYPoanQ=,tag:lcmmCiuj+Fyy7c4hlWtEAw==,type:str] 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: - # TODO: Update link here. - # They are the same as for production, except for "safesBalanceUrl" and "safesBalanceUrlBackup": - # - safesBalanceUrl: FEQcaX9qfh31YL2K7rxRN5a3sr9rjMWkguJnby7StNRo -> FcyLT3XGc2nEtaKjfB2SqigXsrEaGGBYsDfhEmsQ26dA - # - safesBalanceUrlBackup: hopr-nodes-dufour -> hopr-nodes-rotsee - - + 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: [] @@ -41,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 74409317..50f7178f 100644 --- a/helm/values-prod.yaml +++ b/helm/values-prod.yaml @@ -6,11 +6,6 @@ green-nodes: enabled: false ctdapp: - image: - core: - tag: v2.1.10 - postman: - tag: v2.1.10 core: replicas: 1 tag: v2.1.10