From 1ae016cb72f7b8c76af1ab203c351cd0f65260a9 Mon Sep 17 00:00:00 2001 From: renebarbosafl <70078638+renebarbosafl@users.noreply.github.com> Date: Wed, 8 Nov 2023 16:39:16 -0300 Subject: [PATCH] infra: cluster migration (#743) This PR prepares marlowe-cardano for EKS cluster migration. Changes: 1. Adding some annotations on marlowe-proxy LoadBalancer as they are needed to create public instances of Network Load Balancer (they are private by default); 2. Removing opentelemetry-collector trait from marlowe-web-server, it's not needed anymore; 3. Changing DB hostname (New RDS instance is already synced); --- .../templates/marlowe-proxy.yaml | 4 ++++ .../templates/marlowe-web-server.yaml | 21 ------------------- deploy/marlowe-runtime/values.yaml | 2 +- 3 files changed, 5 insertions(+), 22 deletions(-) diff --git a/deploy/marlowe-runtime/templates/marlowe-proxy.yaml b/deploy/marlowe-runtime/templates/marlowe-proxy.yaml index eb9fca5b56..d16e244e41 100644 --- a/deploy/marlowe-runtime/templates/marlowe-proxy.yaml +++ b/deploy/marlowe-runtime/templates/marlowe-proxy.yaml @@ -58,6 +58,10 @@ spec: properties: annotations: "external-dns.alpha.kubernetes.io/hostname": "marlowe-runtime-{{ . }}.{{ $instance.parentDomain }}" + "service.beta.kubernetes.io/aws-load-balancer-name": "marlowe-runtime-{{ . }}-{{ $instanceName }}" + "service.beta.kubernetes.io/aws-load-balancer-nlb-target-type": "instance" + "service.beta.kubernetes.io/aws-load-balancer-scheme": "internet-facing" + "service.beta.kubernetes.io/aws-load-balancer-type": "external" type: LoadBalancer ports: - port: 3700 diff --git a/deploy/marlowe-runtime/templates/marlowe-web-server.yaml b/deploy/marlowe-runtime/templates/marlowe-web-server.yaml index cf12e2a6cb..764b5ebbe5 100644 --- a/deploy/marlowe-runtime/templates/marlowe-web-server.yaml +++ b/deploy/marlowe-runtime/templates/marlowe-web-server.yaml @@ -40,27 +40,6 @@ spec: - marlowe-runtime-{{ . }}-web.{{ $instance.parentDomain }} rules: - port: 3780 - - type: opentelemetry-collector - properties: - mode: sidecar - config: | - receivers: - otlp: - protocols: - http: - grpc: - processors: - - exporters: - logging: - - service: - pipelines: - traces: - receivers: [otlp] - processors: [] - exporters: [logging] - policies: - name: local-{{ $.Values.namespace }} properties: diff --git a/deploy/marlowe-runtime/values.yaml b/deploy/marlowe-runtime/values.yaml index 9fc34178b6..c58c1f1772 100644 --- a/deploy/marlowe-runtime/values.yaml +++ b/deploy/marlowe-runtime/values.yaml @@ -23,4 +23,4 @@ releaseName: marlowe-runtime databaseName: marlowe-runtime-database -databaseHost: dapps-marlowe-runtime-database.csguv6v6ban1.us-east-1.rds.amazonaws.com +databaseHost: prod-marlowe-runtime-db.csguv6v6ban1.us-east-1.rds.amazonaws.com