From 3a82d0d8e19494d03af5612d7288c1d879f9781a Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Wed, 12 Jan 2022 16:16:52 -0700 Subject: [PATCH 1/3] Use a wildcard cert on DigitalOcean in the staging environment If this works, we'll use it for production as well and delete the other certs. Co-Authored-By: Max Brunsfeld --- crates/server/k8s/environments/staging.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/server/k8s/environments/staging.sh b/crates/server/k8s/environments/staging.sh index f068a07b4d85cf16e2f138723e80044a0319c43d..230ccba08a151dd1f76dfb541a9b5ed310768d27 100644 --- a/crates/server/k8s/environments/staging.sh +++ b/crates/server/k8s/environments/staging.sh @@ -1 +1 @@ -ZED_LOAD_BALANCER_CERT_ID=b0d48941-4895-4d75-a966-fe5a571b1fff +ZED_LOAD_BALANCER_CERT_ID=2634d353-1ab4-437f-add2-4ffd8f315233 From e71b989041a3dd4968a2e826316d93a5b750a7fd Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Wed, 12 Jan 2022 16:28:09 -0700 Subject: [PATCH 2/3] Use the same wildcard certificate on production and staging Co-Authored-By: Max Brunsfeld --- crates/server/k8s/environments/production.sh | 1 - crates/server/k8s/environments/staging.sh | 1 - crates/server/k8s/manifest.template.yml | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/crates/server/k8s/environments/production.sh b/crates/server/k8s/environments/production.sh index 58c2ba81c6452b885264383a9ed9a14a13e7dabc..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 --- a/crates/server/k8s/environments/production.sh +++ b/crates/server/k8s/environments/production.sh @@ -1 +0,0 @@ -ZED_LOAD_BALANCER_CERT_ID=6f857971-20fb-4c68-a7d6-35fef9e5ec4c diff --git a/crates/server/k8s/environments/staging.sh b/crates/server/k8s/environments/staging.sh index 230ccba08a151dd1f76dfb541a9b5ed310768d27..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 --- a/crates/server/k8s/environments/staging.sh +++ b/crates/server/k8s/environments/staging.sh @@ -1 +0,0 @@ -ZED_LOAD_BALANCER_CERT_ID=2634d353-1ab4-437f-add2-4ffd8f315233 diff --git a/crates/server/k8s/manifest.template.yml b/crates/server/k8s/manifest.template.yml index b59f6d874dc38feadd6afbc013bd980c1e7c9323..e1c33d4e49872f5cbba627373506ed9d899efce4 100644 --- a/crates/server/k8s/manifest.template.yml +++ b/crates/server/k8s/manifest.template.yml @@ -11,7 +11,7 @@ metadata: name: zed annotations: service.beta.kubernetes.io/do-loadbalancer-tls-ports: "443" - service.beta.kubernetes.io/do-loadbalancer-certificate-id: "${ZED_LOAD_BALANCER_CERT_ID}" + service.beta.kubernetes.io/do-loadbalancer-certificate-id: "2634d353-1ab4-437f-add2-4ffd8f315233" spec: type: LoadBalancer selector: From a93502bb642d38b444055a7b38424ea89c3bf316 Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Wed, 12 Jan 2022 16:33:41 -0700 Subject: [PATCH 3/3] Add placeholder environment variables to our deploy We have the ability to define environment-specific environment variables, but don't current need it. This keeps these files in place while avoiding noise from running `export` with no args due to the files being empty. Co-Authored-By: Max Brunsfeld --- crates/server/k8s/environments/production.sh | 1 + crates/server/k8s/environments/staging.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/crates/server/k8s/environments/production.sh b/crates/server/k8s/environments/production.sh index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..331019bd4080aaa9934a24c24f86bf8344db83a8 100644 --- a/crates/server/k8s/environments/production.sh +++ b/crates/server/k8s/environments/production.sh @@ -0,0 +1 @@ +ZED_ENVIRONMENT=production diff --git a/crates/server/k8s/environments/staging.sh b/crates/server/k8s/environments/staging.sh index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0feacbadf6afe244251380b7da2c1e3a87712224 100644 --- a/crates/server/k8s/environments/staging.sh +++ b/crates/server/k8s/environments/staging.sh @@ -0,0 +1 @@ +ZED_ENVIRONMENT=staging