From 76ee4c90c3a3d0a2a7e4d5cf5d3121885811170d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Se=C3=A1n=20Dunne?= <sean.dunne@harness.io>
Date: Mon, 24 Jan 2022 15:39:03 +0000
Subject: [PATCH] [ONP-317]: fix email invite URL

---
 docker-compose/harness/docker-compose.yml         | 1 +
 docker-compose/harness/environment/manager.env    | 2 +-
 docker-compose/harness/environment/ng-manager.env | 1 +
 helm/harness/templates/manager.yaml               | 3 ++-
 helm/harness/templates/ng-manager.yaml            | 1 +
 5 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/docker-compose/harness/docker-compose.yml b/docker-compose/harness/docker-compose.yml
index 802f0e2..79b5324 100644
--- a/docker-compose/harness/docker-compose.yml
+++ b/docker-compose/harness/docker-compose.yml
@@ -43,6 +43,7 @@ services:
       - API_URL=http://${HARNESS_HOST:-host.docker.internal}
       - DELEGATE_GRPC_TARGET=${HARNESS_HOST:-host.docker.internal}:9879
       - LOG_STREAMING_SERVICE_BASEURL=http://${HARNESS_HOST:-host.docker.internal}/log-service/
+      - UI_SERVER_URL=http://${HARNESS_HOST:-host.docker.internal}
     expose:
       - '9090'
       - '9879'
diff --git a/docker-compose/harness/environment/manager.env b/docker-compose/harness/environment/manager.env
index 72fa15e..9814d75 100644
--- a/docker-compose/harness/environment/manager.env
+++ b/docker-compose/harness/environment/manager.env
@@ -31,6 +31,7 @@ EXECUTION_EVENT_LISTENER_COUNT=1
 FEATURES=RBAC,LDAP_SSO_PROVIDER,SHELL_SCRIPT_PROVISION,CUSTOM_DASHBOARD,GRAPHQL,SEND_SLACK_NOTIFICATION_FROM_DELEGATE,CONNECTORS_REF_SECRETS_MIGRATION,CDNG_ENABLED,NEXT_GEN_ENABLED,LOG_STREAMING_INTEGRATION,NG_CG_TASK_ASSIGNMENT_ISOLATION,NG_GIT_ERROR_EXPERIENCE
 GENERAL_NOTIFY_EVENT_LISTENER_COUNT=1
 GRAPHQL_ENABLED=false
+HARNESS_ENABLE_NG_AUTH_UI_PLACEHOLDER=true
 INSTANCE_SYNC_ITERATOR_THREAD_COUNT=2
 JAVA_ADVANCED_FLAGS=-XX:-TieredCompilation
 LICENSE_INFO=trialLicense
@@ -53,7 +54,6 @@ SERVER_MAX_THREADS=12
 SERVER_PORT=9090
 SERVICE_ACC=/opt/harness/svc/service_acc.json
 SETTING_ATTRIBUTE_VALIDATE_CONNECTIVITY_ITERATOR_THREAD_COUNT=2
-UI_SERVER_URL=http://proxy
 VAULT_SECRET_MANAGER_ITERATOR_THREAD_COUNT=2
 VERSION=1.0.72106
 WATCHER_METADATA_URL=http://proxy/storage/wingswatchers/watcherprod.txt
diff --git a/docker-compose/harness/environment/ng-manager.env b/docker-compose/harness/environment/ng-manager.env
index 7ac9ef5..11b3f36 100644
--- a/docker-compose/harness/environment/ng-manager.env
+++ b/docker-compose/harness/environment/ng-manager.env
@@ -13,6 +13,7 @@ EVENTS_FRAMEWORK_NETTY_THREADS=1
 EVENTS_FRAMEWORK_REDIS_URL=redis://redis:6379
 GIT_FULLSYNC_ENTITY_ITERATOR_THREAD_POOL_SIZE=2
 GRPC_SERVER_PORT=9979
+HARNESS_ENABLE_NG_AUTH_UI_PLACEHOLDER=true
 JAVA_ADVANCED_FLAGS=-XX:-TieredCompilation
 LICENSE_DEPLOY_VARIANT=COMMUNITY
 LOCK_CONFIG_REDIS_URL=redis://redis:6379
diff --git a/helm/harness/templates/manager.yaml b/helm/harness/templates/manager.yaml
index b3f0e35..bc4270e 100644
--- a/helm/harness/templates/manager.yaml
+++ b/helm/harness/templates/manager.yaml
@@ -75,6 +75,7 @@ data:
   FEATURES: RBAC,LDAP_SSO_PROVIDER,SHELL_SCRIPT_PROVISION,CUSTOM_DASHBOARD,GRAPHQL,SEND_SLACK_NOTIFICATION_FROM_DELEGATE,CONNECTORS_REF_SECRETS_MIGRATION,CDNG_ENABLED,NEXT_GEN_ENABLED,LOG_STREAMING_INTEGRATION,NG_CG_TASK_ASSIGNMENT_ISOLATION,NG_GIT_ERROR_EXPERIENCE
   GENERAL_NOTIFY_EVENT_LISTENER_COUNT: '{{ .Values.manager.config.general_notify_event_listener_count | default "1" }}'
   GRAPHQL_ENABLED: 'false'
+  HARNESS_ENABLE_NG_AUTH_UI_PLACEHOLDER: 'true'
   INSTANCE_SYNC_ITERATOR_THREAD_COUNT: '2'
   JAVA_ADVANCED_FLAGS: -XX:-TieredCompilation
   LICENSE_INFO: trialLicense
@@ -97,7 +98,7 @@ data:
   SERVER_PORT: '9090'
   SERVICE_ACC: /opt/harness/svc/service_acc.json
   SETTING_ATTRIBUTE_VALIDATE_CONNECTIVITY_ITERATOR_THREAD_COUNT: '2'
-  UI_SERVER_URL: http://proxy
+  UI_SERVER_URL: http://{{ .Values.harness_host | default "host.docker.internal" }}:{{ .Values.listen_port }}
   VAULT_SECRET_MANAGER_ITERATOR_THREAD_COUNT: '2'
   VERSION: 1.0.{{ .Values.versions.manager }}
   WATCHER_METADATA_URL: http://proxy/storage/wingswatchers/watcherprod.txt
diff --git a/helm/harness/templates/ng-manager.yaml b/helm/harness/templates/ng-manager.yaml
index f80de05..aa2ae66 100644
--- a/helm/harness/templates/ng-manager.yaml
+++ b/helm/harness/templates/ng-manager.yaml
@@ -22,6 +22,7 @@ data:
   EVENTS_FRAMEWORK_REDIS_URL: redis://redis:6379
   GIT_FULLSYNC_ENTITY_ITERATOR_THREAD_POOL_SIZE: '{{ .Values.ng_manager.config.git_fullsync_entity_iterator_thread_pool_size | default "2" }}'
   GRPC_SERVER_PORT: '9979'
+  HARNESS_ENABLE_NG_AUTH_UI_PLACEHOLDER: 'true'
   JAVA_ADVANCED_FLAGS: -XX:-TieredCompilation
   LICENSE_DEPLOY_VARIANT: COMMUNITY
   LOCK_CONFIG_REDIS_URL: redis://redis:6379