Cleanup deployment code (GoogleCloudPlatform#872)

alanhughes · Sep 8, 2020 · 12c8968 · 12c8968
1 parent dc4df46
commit 12c8968
Show file tree

Hide file tree

Showing 39 changed files with 53 additions and 607 deletions.
diff --git a/WCP-WS/deployment.yaml b/WCP-WS/deployment.yaml
diff --git a/WCP-WS/service.yaml b/WCP-WS/service.yaml
diff --git a/WCP-WS/tf-deployment.yaml b/WCP-WS/tf-deployment.yaml
@@ -19,7 +19,7 @@ spec:
     spec:
       containers:
         - name: study-meta-data
-          image: gcr.io/heroes-hat-dev-apps/study-meta-data:latest
+          image: gcr.io/fda-mystudies-dev-apps/study-meta-data:latest
           env:
             - name: DB_USER
               valueFrom:
@@ -70,7 +70,7 @@ spec:
         - name: cloudsql-proxy
           image: gcr.io/cloudsql-docker/gce-proxy:latest
           command: ["/cloud_sql_proxy",
-            "-instances=heroes-hat-dev-data:us-east1:my-studies=tcp:3306",
+            "-instances=fda-mystudies-dev-data:us-east1:mystudies=tcp:3306",
             "-credential_file=/secrets/gcloud_key/key.json"]
           volumeMounts:
           - name: gcloud-key-volume

diff --git a/WCP/deployment.yaml b/WCP/deployment.yaml
diff --git a/WCP/fdahpStudyDesigner/src/main/resources/application_local.properties b/WCP/fdahpStudyDesigner/src/main/resources/application_local.properties
@@ -8,7 +8,7 @@ sslfactory.value=javax.net.ssl.SSLSocketFactory
 # Use hostname of smtp-relay if enabled.
 from.email.use_ip_whitelist=${SMTP_USE_IP_WHITELIST}
 # Domain should be the email domain excluding the end,
-# i.e. rocketturtle instead of rocketturtle.net
+# i.e. domain instead of domain.com
 from.email.domain=${FROM_EMAIL_DOMAIN}
 
 #For server

diff --git a/WCP/service.yaml b/WCP/service.yaml
diff --git a/WCP/tf-deployment.yaml b/WCP/tf-deployment.yaml
@@ -18,7 +18,7 @@ spec:
     spec:
       containers:
         - name: study-designer
-          image: gcr.io/heroes-hat-dev-apps/study-designer:latest
+          image: gcr.io/fda-mystudies-dev-apps/study-designer:latest
           env:
             - name: DB_USER
               valueFrom:
@@ -85,7 +85,7 @@ spec:
         - name: cloudsql-proxy
           image: gcr.io/cloudsql-docker/gce-proxy:latest
           command: ["/cloud_sql_proxy",
-            "-instances=heroes-hat-dev-data:us-east1:my-studies=tcp:3306",
+            "-instances=fda-mystudies-dev-data:us-east1:mystudies=tcp:3306",
             "-credential_file=/secrets/gcloud_key/key.json"]
           volumeMounts:
           - name: gcloud-key-volume

diff --git a/auth-server-ws/deployment.yaml b/auth-server-ws/deployment.yaml
diff --git a/auth-server-ws/service.yaml b/auth-server-ws/service.yaml
diff --git a/...ava/com/google/cloud/healthcare/fdamystudies/config/ApplicationPropertyConfiguration.java b/...ava/com/google/cloud/healthcare/fdamystudies/config/ApplicationPropertyConfiguration.java
@@ -56,7 +56,7 @@ public class ApplicationPropertyConfiguration implements Serializable {
   private Boolean useIpWhitelist;
 
   // Domain to use with the IP whitelist relay.
-  // Must be in the form rocketturtle rather than rocketturtle.net.
+  // Must be in the form domain rather than domain.com.
   @Value("${from.email.domain}")
   private String fromDomain;
 

diff --git a/auth-server-ws/tf-deployment.yaml b/auth-server-ws/tf-deployment.yaml
@@ -18,7 +18,7 @@ spec:
     spec:
       containers:
         - name: auth-server-ws
-          image: gcr.io/heroes-hat-dev-apps/auth-server-ws:latest
+          image: gcr.io/fda-mystudies-dev-apps/auth-server-ws:latest
           env:
             - name: DB_USER
               valueFrom:
@@ -65,7 +65,7 @@ spec:
             readOnly: true
         - name: cloudsql-proxy
           image: gcr.io/cloudsql-docker/gce-proxy:latest
-          command: ['/cloud_sql_proxy', '-instances=heroes-hat-dev-data:us-east1:my-studies=tcp:3306', '-credential_file=/secrets/gcloud_key/key.json']
+          command: ['/cloud_sql_proxy', '-instances=fda-mystudies-dev-data:us-east1:mystudies=tcp:3306', '-credential_file=/secrets/gcloud_key/key.json']
           volumeMounts:
           - name: gcloud-key-volume
             mountPath: /secrets/gcloud_key