From b14ba864765a88388726f78ca63502bcf7296ed3 Mon Sep 17 00:00:00 2001 From: Alex Gilleran Date: Mon, 28 May 2018 19:18:17 +1000 Subject: [PATCH] Changing to a single externalUrl. --- deploy/helm/magda-dev.yml | 1 - .../magda/charts/correspondence-api/templates/deployment.yaml | 2 +- deploy/helm/magda/charts/correspondence-api/values.yaml | 3 +-- deploy/helm/minikube-dev.yml | 1 - deploy/helm/preview.yml | 1 - deploy/helm/search-data-gov-au.yml | 1 - 6 files changed, 2 insertions(+), 7 deletions(-) diff --git a/deploy/helm/magda-dev.yml b/deploy/helm/magda-dev.yml index 488fffa4f1..1a79617121 100644 --- 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: "magda-test@googlegroups.com" smtpHostname: "smtp.mailgun.org" smtpPort: 2525 \ No newline at end of file diff --git a/deploy/helm/magda/charts/correspondence-api/templates/deployment.yaml b/deploy/helm/magda/charts/correspondence-api/templates/deployment.yaml index 1ab4439787..500b3f0829 100644 --- 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 index 5cc0f497f1..6e25790919 100644 --- 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: "mail@example.com" -externalUrl: "https://search.data.gov.au" \ No newline at end of file +defaultRecipient: "mail@example.com" \ No newline at end of file diff --git a/deploy/helm/minikube-dev.yml b/deploy/helm/minikube-dev.yml index ff4384ed61..dde7de76e0 100644 --- a/deploy/helm/minikube-dev.yml +++ b/deploy/helm/minikube-dev.yml @@ -47,5 +47,4 @@ sleuther-format: correspondence-api: smtpPort: 2525 defaultRecipient: "alex.gilleran+magda@csiro.it" - externalUrl: "http://localhost" smtpHostname: "smtp.mailgun.org" \ No newline at end of file diff --git a/deploy/helm/preview.yml b/deploy/helm/preview.yml index f93dd9dd05..7c6f687777 100644 --- 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: "magda-test@googlegroups.com" smtpHostname: "smtp.mailgun.org" smtpPort: 2525 \ No newline at end of file diff --git a/deploy/helm/search-data-gov-au.yml b/deploy/helm/search-data-gov-au.yml index c3c614cb8b..28ed563b8f 100644 --- 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: "data@digital.gov.au" smtpHostname: "smtp.mailgun.org" smtpPort: 2525