From c78e20ab54d34af83fdfdc8808f3ab35dfb4ea44 Mon Sep 17 00:00:00 2001 From: Pudong Zheng Date: Tue, 24 May 2022 14:47:07 +0000 Subject: [PATCH] [dev] Separate ssh IP and ws-proxy IP --- .werft/jobs/build/deploy-to-preview-environment.ts | 7 +++++++ .werft/platform-delete-preview-environments-cron.ts | 1 + 2 files changed, 8 insertions(+) diff --git a/.werft/jobs/build/deploy-to-preview-environment.ts b/.werft/jobs/build/deploy-to-preview-environment.ts index 726d228983fb5a..dcfb583aa3ad8d 100644 --- a/.werft/jobs/build/deploy-to-preview-environment.ts +++ b/.werft/jobs/build/deploy-to-preview-environment.ts @@ -452,6 +452,13 @@ async function addVMDNSRecord(werft: Werft, name: string, domain: string) { domain: `*.ws.${domain}`, projectId: "gitpod-core-dev", dnsZone: 'preview-gitpod-dev-com', + IP: ingressIP, + slice: installerSlices.DNS_ADD_RECORD + }), + createDNSRecord({ + domain: `*.ssh.ws.${domain}`, + projectId: "gitpod-core-dev", + dnsZone: 'preview-gitpod-dev-com', IP: proxyLBIP, slice: installerSlices.DNS_ADD_RECORD }), diff --git a/.werft/platform-delete-preview-environments-cron.ts b/.werft/platform-delete-preview-environments-cron.ts index 5c38d77eaeb92e..47b6115ab90ae2 100644 --- a/.werft/platform-delete-preview-environments-cron.ts +++ b/.werft/platform-delete-preview-environments-cron.ts @@ -69,6 +69,7 @@ class HarvesterPreviewEnvironment { async removeDNSRecords(sliceID: string) { werft.log(sliceID, "Deleting harvester related DNS records for the preview environment") await Promise.all([ + deleteDNSRecord('A', `*.ssh.ws.${this.name}.preview.gitpod-dev.com`, 'gitpod-core-dev', 'preview-gitpod-dev-com', sliceID), deleteDNSRecord('A', `*.ws.${this.name}.preview.gitpod-dev.com`, 'gitpod-core-dev', 'preview-gitpod-dev-com', sliceID), deleteDNSRecord('A', `*.${this.name}.preview.gitpod-dev.com`, 'gitpod-core-dev', 'preview-gitpod-dev-com', sliceID), deleteDNSRecord('A', `${this.name}.preview.gitpod-dev.com`, 'gitpod-core-dev', 'preview-gitpod-dev-com', sliceID),