Make GKE the default in alpha and qa (#2624)

proxy/deploy-proxy-for-env.sh

@@ -32,13 +32,13 @@ do
   gcloud container clusters get-credentials "${parts[0]}" \
     --project "${project}" --zone "${parts[1]}"
   sed s/GCP_PROJECT/${project}/g "./kubernetes/proxy-deployment-${environment}.yaml" | \
-  kubectl replace -f -
-  kubectl replace -f "./kubernetes/proxy-service.yaml" --force
+  kubectl apply -f -
+  kubectl apply -f "./kubernetes/proxy-service.yaml" --force
   # Alpha does not have canary
   if [[ ${environment} != "alpha" ]]; then
     sed s/GCP_PROJECT/${project}/g "./kubernetes/proxy-deployment-${environment}-canary.yaml" | \
-    kubectl replace -f -
-    kubectl replace -f "./kubernetes/proxy-service-canary.yaml" --force
+    kubectl apply -f -
+    kubectl apply -f "./kubernetes/proxy-service-canary.yaml" --force
   fi
   # Kills all running pods, new pods created will be pulling the new image.
   kubectl delete pods --all

proxy/src/main/java/google/registry/proxy/ProxyConfig.java

@@ -41,7 +41,6 @@ public class ProxyConfig {
 
   public String projectId;
   public String oauthClientId;
-  public boolean canary;
   public List<String> gcpScopes;
   public int serverCertificateCacheSeconds;
   public Gcs gcs;

proxy/src/main/java/google/registry/proxy/ProxyModule.java

@@ -281,8 +281,8 @@ public class ProxyModule {
   @Singleton
   @Provides
   @Named("canary")
-  static boolean provideIsCanary(ProxyConfig config) {
-    return config.canary;
+  boolean provideIsCanary(Environment env) {
+    return env.name().endsWith("_CANARY");
   }
 
   @Singleton

proxy/src/main/java/google/registry/proxy/config/default-config.yaml

@@ -8,9 +8,6 @@
 # GCP project ID
 projectId: your-gcp-project-id
 
-# Whether to connect to the canary (instead of regular) service.
-canary: false
-
 # OAuth client ID set as the audience of the OIDC token. This value must be the
 # same as the auth.oauthClientId value in Nomulus config file, which usually is
 # the IAP client ID, to allow the request to access IAP protected endpoints.