From eb978ebbd5c30174f17a76d183da67eb8fdbaa65 Mon Sep 17 00:00:00 2001
From: Lai Jiang <jianglai@google.com>
Date: Sun, 16 Feb 2025 13:10:03 -0500
Subject: [PATCH] Let nomulus tool connect to sandbox GKE by default (#2674)

---
 core/src/main/java/google/registry/tools/RegistryCli.java | 5 ++++-
 jetty/deploy-nomulus-for-env.sh                           | 5 -----
 jetty/kubernetes/nomulus-backend.yaml                     | 4 ++++
 jetty/kubernetes/nomulus-console.yaml                     | 4 ++++
 jetty/kubernetes/nomulus-frontend.yaml                    | 4 ++++
 jetty/kubernetes/nomulus-pubapi.yaml                      | 4 ++++
 6 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/core/src/main/java/google/registry/tools/RegistryCli.java b/core/src/main/java/google/registry/tools/RegistryCli.java
index c25afd407..da5f03386 100644
--- a/core/src/main/java/google/registry/tools/RegistryCli.java
+++ b/core/src/main/java/google/registry/tools/RegistryCli.java
@@ -44,7 +44,10 @@ final class RegistryCli implements CommandRunner {
 
   private static final ImmutableSet<RegistryToolEnvironment> DEFAULT_GKE_ENVIRONMENTS =
       ImmutableSet.of(
-          RegistryToolEnvironment.ALPHA, RegistryToolEnvironment.CRASH, RegistryToolEnvironment.QA);
+          RegistryToolEnvironment.ALPHA,
+          RegistryToolEnvironment.CRASH,
+          RegistryToolEnvironment.QA,
+          RegistryToolEnvironment.SANDBOX);
 
   // The environment parameter is parsed twice: once here, and once with {@link
   // RegistryToolEnvironment#parseFromArgs} in the {@link RegistryTool#main} function.
diff --git a/jetty/deploy-nomulus-for-env.sh b/jetty/deploy-nomulus-for-env.sh
index f8cb07317..43e1cf407 100755
--- a/jetty/deploy-nomulus-for-env.sh
+++ b/jetty/deploy-nomulus-for-env.sh
@@ -52,11 +52,6 @@ for service in frontend backend console pubapi
 do
   sed s/BASE_DOMAIN/"${base_domain}"/g "./kubernetes/gateway/nomulus-route-${service}.yaml" | \
   kubectl apply -f -
-  # Don't enable IAP on pubapi.
-  if [[ "${service}" == pubapi ]]
-  then
-    continue
-  fi
   sed s/SERVICE/"${service}"/g "./kubernetes/gateway/nomulus-backend-policy-${environment}.yaml" | \
   kubectl apply -f -
   sed s/SERVICE/"${service}-canary"/g "./kubernetes/gateway/nomulus-backend-policy-${environment}.yaml" | \
diff --git a/jetty/kubernetes/nomulus-backend.yaml b/jetty/kubernetes/nomulus-backend.yaml
index 486cecc4a..a50458b3e 100644
--- a/jetty/kubernetes/nomulus-backend.yaml
+++ b/jetty/kubernetes/nomulus-backend.yaml
@@ -27,6 +27,10 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.name
+        - name: JETTY_WORKER_INSTANCE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
         - name: NAMESPACE_ID
           valueFrom:
             fieldRef:
diff --git a/jetty/kubernetes/nomulus-console.yaml b/jetty/kubernetes/nomulus-console.yaml
index d7a5a3359..926b3b967 100644
--- a/jetty/kubernetes/nomulus-console.yaml
+++ b/jetty/kubernetes/nomulus-console.yaml
@@ -27,6 +27,10 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.name
+        - name: JETTY_WORKER_INSTANCE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
         - name: NAMESPACE_ID
           valueFrom:
             fieldRef:
diff --git a/jetty/kubernetes/nomulus-frontend.yaml b/jetty/kubernetes/nomulus-frontend.yaml
index 7d15c70cc..7b96e635f 100644
--- a/jetty/kubernetes/nomulus-frontend.yaml
+++ b/jetty/kubernetes/nomulus-frontend.yaml
@@ -27,6 +27,10 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.name
+        - name: JETTY_WORKER_INSTANCE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
         - name: NAMESPACE_ID
           valueFrom:
             fieldRef:
diff --git a/jetty/kubernetes/nomulus-pubapi.yaml b/jetty/kubernetes/nomulus-pubapi.yaml
index 7b98ce63f..ce8cb333c 100644
--- a/jetty/kubernetes/nomulus-pubapi.yaml
+++ b/jetty/kubernetes/nomulus-pubapi.yaml
@@ -27,6 +27,10 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.name
+        - name: JETTY_WORKER_INSTANCE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
         - name: NAMESPACE_ID
           valueFrom:
             fieldRef: