Changing to a single externalUrl.

magda-io · May 28, 2018 · b14ba86 · b14ba86
1 parent b07acb3
commit b14ba86
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 7 deletions.
diff --git a/deploy/helm/magda-dev.yml b/deploy/helm/magda-dev.yml
@@ -131,7 +131,6 @@ correspondence-api:
     requests:
       cpu: 100m
       memory: 0
-  externalUrl: "https://magda-dev.terria.io"
   defaultRecipient: "[email protected]"
   smtpHostname: "smtp.mailgun.org"
   smtpPort: 2525
diff --git a/deploy/helm/magda/charts/correspondence-api/templates/deployment.yaml b/deploy/helm/magda/charts/correspondence-api/templates/deployment.yaml
@@ -21,7 +21,7 @@ spec:
             "/usr/src/app/component/dist/index.js",
             "--listenPort", "80",
             "--registryUrl", "http://registry-api/v0",
-            "--externalUrl", {{ .Values.externalUrl | quote }},
+            "--externalUrl", {{ .Values.global.externalUrl | quote }},
             "--smtpHostname", {{ .Values.smtpHostname | quote }},
             "--smtpPort", {{ .Values.smtpPort | default 587 | quote }},
             "--smtpSecure", {{ .Values.smtpSecure | default true | quote }},

diff --git a/deploy/helm/magda/charts/correspondence-api/values.yaml b/deploy/helm/magda/charts/correspondence-api/values.yaml
@@ -15,5 +15,4 @@ resources: {}
   #  cpu: 100m
   #  memory: 128Mi
 smtpPort: 587
-defaultRecipient: "[email protected]"
-externalUrl: "https://search.data.gov.au"
+defaultRecipient: "[email protected]"
diff --git a/deploy/helm/minikube-dev.yml b/deploy/helm/minikube-dev.yml
@@ -47,5 +47,4 @@ sleuther-format:
 correspondence-api:
   smtpPort: 2525
   defaultRecipient: "[email protected]"
-  externalUrl: "http://localhost"
   smtpHostname: "smtp.mailgun.org"
diff --git a/deploy/helm/preview.yml b/deploy/helm/preview.yml
@@ -127,7 +127,6 @@ correspondence-api:
     requests:
       cpu: 100m
       memory: 0
-  externalUrl: "https://magda-dev.terria.io"
   defaultRecipient: "[email protected]"
   smtpHostname: "smtp.mailgun.org"
   smtpPort: 2525
diff --git a/deploy/helm/search-data-gov-au.yml b/deploy/helm/search-data-gov-au.yml
@@ -150,7 +150,6 @@ correspondence-api:
         requests:
             cpu: 100m
             memory: 200Mi
-    externalUrl: "https://search.data.gov.au"
     defaultRecipient: "[email protected]"
     smtpHostname: "smtp.mailgun.org"
     smtpPort: 2525