From 97fc2c0b66ab873e6e7b6bbc5ab00de87dafac29 Mon Sep 17 00:00:00 2001 From: Lai Jiang Date: Fri, 21 Feb 2025 11:30:32 -0500 Subject: [PATCH] Add an annotation to the deployment (#2683) This allows us to easily tell which tag was deployed. Also set the gateway to use named address so they are stable, and so that we can attach an IPv6 record to it. Auto-provisioned addresses are IPv4 only. --- jetty/kubernetes/gateway/nomulus-gateway.yaml | 5 +++++ jetty/kubernetes/nomulus-backend.yaml | 2 ++ jetty/kubernetes/nomulus-console.yaml | 2 ++ jetty/kubernetes/nomulus-frontend.yaml | 2 ++ jetty/kubernetes/nomulus-pubapi.yaml | 2 ++ release/cloudbuild-release.yaml | 2 ++ 6 files changed, 15 insertions(+) diff --git a/jetty/kubernetes/gateway/nomulus-gateway.yaml b/jetty/kubernetes/gateway/nomulus-gateway.yaml index e59b3fb1d..a57bc6c5d 100644 --- a/jetty/kubernetes/gateway/nomulus-gateway.yaml +++ b/jetty/kubernetes/gateway/nomulus-gateway.yaml @@ -4,6 +4,11 @@ metadata: name: nomulus spec: gatewayClassName: gke-l7-global-external-managed-mc + addresses: + - type: NamedAddress + value: nomulus-ipv4-address + - type: NamedAddress + value: nomulus-ipv6-address listeners: - name: http protocol: HTTP diff --git a/jetty/kubernetes/nomulus-backend.yaml b/jetty/kubernetes/nomulus-backend.yaml index aad8a1969..68b734de4 100644 --- a/jetty/kubernetes/nomulus-backend.yaml +++ b/jetty/kubernetes/nomulus-backend.yaml @@ -2,6 +2,8 @@ apiVersion: apps/v1 kind: Deployment metadata: name: backend + annotations: + tag: "latest" spec: selector: matchLabels: diff --git a/jetty/kubernetes/nomulus-console.yaml b/jetty/kubernetes/nomulus-console.yaml index e8b8fd82c..34b13cb06 100644 --- a/jetty/kubernetes/nomulus-console.yaml +++ b/jetty/kubernetes/nomulus-console.yaml @@ -2,6 +2,8 @@ apiVersion: apps/v1 kind: Deployment metadata: name: console + annotations: + tag: "latest" spec: selector: matchLabels: diff --git a/jetty/kubernetes/nomulus-frontend.yaml b/jetty/kubernetes/nomulus-frontend.yaml index a286a58b2..f5b66f108 100644 --- a/jetty/kubernetes/nomulus-frontend.yaml +++ b/jetty/kubernetes/nomulus-frontend.yaml @@ -2,6 +2,8 @@ apiVersion: apps/v1 kind: Deployment metadata: name: frontend + annotations: + tag: "latest" spec: selector: matchLabels: diff --git a/jetty/kubernetes/nomulus-pubapi.yaml b/jetty/kubernetes/nomulus-pubapi.yaml index 402e9ce68..8a204c2c7 100644 --- a/jetty/kubernetes/nomulus-pubapi.yaml +++ b/jetty/kubernetes/nomulus-pubapi.yaml @@ -2,6 +2,8 @@ apiVersion: apps/v1 kind: Deployment metadata: name: pubapi + annotations: + tag: "latest" spec: selector: matchLabels: diff --git a/release/cloudbuild-release.yaml b/release/cloudbuild-release.yaml index 9c6d4f4e0..93975e112 100644 --- a/release/cloudbuild-release.yaml +++ b/release/cloudbuild-release.yaml @@ -188,6 +188,7 @@ steps: do # non-canary sed s/GCP_PROJECT/${PROJECT_ID}/g ./jetty/kubernetes/nomulus-${service}.yaml | \ + sed s/latest/${TAG_NAME}/g | \ sed s/ENVIRONMENT/${env}/g | \ sed s/PROXY_ENV/"${env}"/g | \ sed s/EPP/"epp"/g > ./jetty/kubernetes/nomulus-${env}-${service}.yaml @@ -203,6 +204,7 @@ steps: fi # canary sed s/GCP_PROJECT/${PROJECT_ID}/g ./jetty/kubernetes/nomulus-${service}.yaml | \ + sed s/latest/${TAG_NAME}/g | \ sed s/ENVIRONMENT/${env}/g | \ sed s/PROXY_ENV/"${env}_canary"/g | \ sed s/EPP/"epp-canary"/g | \