Cleanup preview-env manifests after verifying smoke-tests

astriaorg · Sep 12, 2024 · 464308d · 464308d
1 parent 6c78032
commit 464308d
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 58 deletions.
diff --git a/dev/argocd/pr-preview-envs/evm-appset.yaml b/dev/argocd/pr-preview-envs/evm-appset.yaml
@@ -82,37 +82,24 @@ spec:
                     enabled: false
                     annotations:
                       external-dns.alpha.kubernetes.io/hostname: explorer.evm.pr-{{.number}}.dev.astria.org
-                      external-dns.alpha.kubernetes.io/ttl: "30"
-                      external-dns.alpha.kubernetes.io/cloudflare-proxied: "true"
-                      nginx.ingress.kubernetes.io/ssl-passthrough: "true"
-                      nginx.ingress.kubernetes.io/limit-connections: '2'
-                      nginx.ingress.kubernetes.io/limit-rpm: '60'
+                      external-dns.alpha.kubernetes.io/ttl: "60"
                     hostname: explorer.evm.pr-{{.number}}.dev.astria.org
-                    className: nginx
                 frontend:
                   ingress:
                     enabled: false
                     annotations:
                       external-dns.alpha.kubernetes.io/hostname: explorer.evm.pr-{{.number}}.dev.astria.org
-                      external-dns.alpha.kubernetes.io/ttl: "30"
-                      external-dns.alpha.kubernetes.io/cloudflare-proxied: "true"
-                      nginx.ingress.kubernetes.io/ssl-passthrough: "true"
-                      nginx.ingress.kubernetes.io/limit-connections: '2'
-                      nginx.ingress.kubernetes.io/limit-rpm: '60'
+                      external-dns.alpha.kubernetes.io/ttl: "60"
                     hostname: explorer.evm.pr-{{.number}}.dev.astria.org
-                    className: nginx
 
               evm-faucet:
                 ingress:
                     annotations:
                       external-dns.alpha.kubernetes.io/hostname: faucet.evm.pr-{{.number}}.dev.astria.org
-                      external-dns.alpha.kubernetes.io/ttl: "30"
-                      external-dns.alpha.kubernetes.io/cloudflare-proxied: "true"
-                      nginx.ingress.kubernetes.io/ssl-passthrough: "true"
-                      nginx.ingress.kubernetes.io/limit-connections: '2'
-                      nginx.ingress.kubernetes.io/limit-rpm: '60'
-                    hostname: faucet.evm.pr-{{.number}}.dev.astria.org
-                    className: nginx
+                      external-dns.alpha.kubernetes.io/ttl: "60"
+                    hostname: pr-{{.number}}.dev.astria.org
+                    hosts:
+                      - faucet.evm.pr-{{.number}}.dev.astria.org
 
               evm-rollup:
                 config:
@@ -128,27 +115,16 @@ spec:
                     pullPolicy: Always
                 ingress:
                   enabled: true
+                  hostname: pr-{{.number}}.dev.astria.org
                   services:
                     rpc:
                       annotations:
                         external-dns.alpha.kubernetes.io/hostname: rpc.evm.pr-{{.number}}.dev.astria.org
-                        external-dns.alpha.kubernetes.io/ttl: "30"
-                        external-dns.alpha.kubernetes.io/cloudflare-proxied: "true"
-                        nginx.ingress.kubernetes.io/ssl-passthrough: "true"
-                        nginx.ingress.kubernetes.io/limit-connections: '2'
-                        nginx.ingress.kubernetes.io/limit-rpm: '60'
-                      hosts:
-                        - rpc.evm.pr-{{.number}}.dev.astria.org
+                        external-dns.alpha.kubernetes.io/ttl: "60"
                     ws:
                       annotations:
                         external-dns.alpha.kubernetes.io/hostname: ws.evm.pr-{{.number}}.dev.astria.org
-                        external-dns.alpha.kubernetes.io/ttl: "30"
-                        external-dns.alpha.kubernetes.io/cloudflare-proxied: "true"
-                        nginx.ingress.kubernetes.io/ssl-passthrough: "true"
-                        nginx.ingress.kubernetes.io/limit-connections: '2'
-                        nginx.ingress.kubernetes.io/limit-rpm: '60'
-                      hosts:
-                        - ws.evm.pr-{{.number}}.dev.astria.org
+                        external-dns.alpha.kubernetes.io/ttl: "60"
                 resources:
                   conductor:
                     requests:

diff --git a/dev/argocd/pr-preview-envs/sequencer-appset.yaml b/dev/argocd/pr-preview-envs/sequencer-appset.yaml
@@ -37,6 +37,15 @@ spec:
   template:
     metadata:
       name: pr-{{.number}}-sequencer-0
+      # labels:
+      #   number: {{ .number }}
+      #   branch: {{ .branch }}
+      #   branch_slug: {{ .branch_slug }}
+      #   target_branch_slug: {{ .target_branch_slug }}
+      #   head_sha: {{ .head_sha }}
+      #   head_short_sha: {{ .head_short_sha }}
+      #   head_short_sha_7: {{ .head_short_sha_7 }}
+      #   labels: {{ .labels }}
     spec:
       destination:
         namespace: pr-{{.number}}
@@ -83,36 +92,13 @@ spec:
                   hostname: sequencer.pr-{{.number}}.dev.astria.org
                   annotations:
                     external-dns.alpha.kubernetes.io/hostname: grpc.sequencer.pr-{{.number}}.dev.astria.org
-                    external-dns.alpha.kubernetes.io/ttl: "30"
-                    external-dns.alpha.kubernetes.io/cloudflare-proxied: "true"
-                    kubernetes.io/ingress.class: nginx
-                    nginx.ingress.kubernetes.io/ssl-passthrough: "true"
-                    cert-manager.io/cluster-issuer: "cloudflare-issuer"
-                  service:
-                    name: node0-sequencer-grpc-service
-                    port: 8080
-                  path: '/'
-                  pathType: Prefix
-                  hosts:
-                    - grpc.sequencer.pr-{{.number}}.dev.astria.org
+                    external-dns.alpha.kubernetes.io/ttl: "60"
                 rpc:
                   enabled: true
                   hostname: sequencer.pr-{{.number}}.dev.astria.org
                   annotations:
                     external-dns.alpha.kubernetes.io/hostname: rpc.sequencer.pr-{{.number}}.dev.astria.org
-                    external-dns.alpha.kubernetes.io/ttl: "30"
-                    external-dns.alpha.kubernetes.io/cloudflare-proxied: "true"
-                    kubernetes.io/ingress.class: nginx
-                    nginx.ingress.kubernetes.io/ssl-passthrough: "true"
-                    cert-manager.io/cluster-issuer: "cloudflare-issuer"
-                  service:
-                    name: node0-sequencer-rpc-service
-                    port: 26657
-                  path: '/'
-                  pathType: Prefix
-
-                  hosts:
-                    - rpc.sequencer.pr-{{.number}}.dev.astria.org
+                    external-dns.alpha.kubernetes.io/ttl: "60"
 
               sequencer-relayer:
                 config: