From 8c4a1de8f2311ca139b1e313e0b23d278520b2d8 Mon Sep 17 00:00:00 2001
From: Yi Yi <yiyi@microsoft.com>
Date: Thu, 5 Nov 2020 09:17:15 +0800
Subject: [PATCH 01/20] update

---
 .../pylon-config/location.conf.template       | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/src/pylon/deploy/pylon-config/location.conf.template b/src/pylon/deploy/pylon-config/location.conf.template
index b1e303203c..dbd168f842 100644
--- a/src/pylon/deploy/pylon-config/location.conf.template
+++ b/src/pylon/deploy/pylon-config/location.conf.template
@@ -284,6 +284,28 @@ location ~ ^/dshuttle/(.*)$ {
 }
 {%- endif %}
 
+{%- if MARKETPLACE_URI %}
+# Marketplace server
+location ~ ^/marketplace$ {
+  # Add '/' to the end of the URL, otherwise there will be a 404 error.
+  return 301 $scheme://$http_host$request_uri/;
+}
+location ~ ^/marketplace/(.*)$ {
+  proxy_pass {{MARKETPLACE_URI}}/$1$is_args$args;
+  sub_filter_types *;
+  sub_filter_once off;
+  sub_filter
+    'href="/'
+    'href="/marketplace/';
+  sub_filter
+    '<script src="/'
+    '<script src="/marketplace/';
+  sub_filter
+    '/api'
+    '/marketplace/api';
+}
+{%- endif %}
+
 # PAI web portal
 location ~ ^(.*)$ {
   proxy_pass {{PAI_WEB_PORTAL_URI}}$1$is_args$args;
@@ -327,6 +349,11 @@ location ~ ^(.*)$ {
     '{{DSHUTTLE_URI}}'
     '/dshuttle';
 {%- endif %}
+{%- if MARKETPLACE_URI %}
+  sub_filter
+    '{{MARKETPLACE_URI}}'
+    '/marketplace';
+{%- endif %}
 
   proxy_set_header    If-None-Match    $request_if_none_match;
   add_header          Etag             $response_etag;

From b83944616e54a1aeecfdeab2d4ca387e4d1fc859 Mon Sep 17 00:00:00 2001
From: Yi Yi <yiyi@microsoft.com>
Date: Thu, 5 Nov 2020 09:37:10 +0800
Subject: [PATCH 02/20] update

---
 src/pylon/deploy/pylon.yaml.template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/pylon/deploy/pylon.yaml.template b/src/pylon/deploy/pylon.yaml.template
index 65f14cd942..ebb267dd1b 100644
--- a/src/pylon/deploy/pylon.yaml.template
+++ b/src/pylon/deploy/pylon.yaml.template
@@ -82,6 +82,10 @@ spec:
 {% if cluster_cfg['cluster']['common']['dshuttle'] == 'true' %}
             - name: DSHUTTLE_URI
               value: {{ cluster_cfg['dshuttle']['uri'] }}
+{% endif %}
+{% if cluster_cfg['cluster']['common']['marketplace'] == 'true' %}
+            - name: MARKETPLACE_URI
+              value: {{ cluster_cfg['marketplace']['uri']}}
 {% endif %}
           ports:
             - name: pylon

From 23f71de8bcd23ae29e5b53e618440ee94d6f711d Mon Sep 17 00:00:00 2001
From: Yi Yi <yiyi@microsoft.com>
Date: Fri, 6 Nov 2020 03:36:03 +0800
Subject: [PATCH 03/20] update

---
 src/pylon/config/pylon.py                     |  4 ++++
 src/pylon/config/pylon.yaml                   |  4 ++++
 .../pylon-config/location.conf.template       | 24 +++++++------------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/pylon/config/pylon.py b/src/pylon/config/pylon.py
index 592bc9c6bf..d35f967e4c 100644
--- a/src/pylon/config/pylon.py
+++ b/src/pylon/config/pylon.py
@@ -43,11 +43,15 @@ def run(self):
             uriHttps = 'https://{0}'.format(self.service_configuration['domain'])
 
         webhdfs_legacy_port = self.service_configuration['webhdfs-legacy-port']
+        marketplace_api_uri = self.service_configuration['marketplace_api_uri']
+        marketplace_webportal_plugin = self.service_configuration['marketplace_webportal_plugin']
         ret = {
             'port': port,
             'uri': uri,
             'uri-https': uriHttps,
             'webhdfs-legacy-port': webhdfs_legacy_port,
+            'marketplace_api_uri': marketplace_api_uri,
+            'marketplace_webportal_plugin': marketplace_webportal_plugin,
         }
         if 'ssl' in self.service_configuration:
             ret['ssl'] = self.service_configuration['ssl']
diff --git a/src/pylon/config/pylon.yaml b/src/pylon/config/pylon.yaml
index 3a33263d54..913dae79d2 100644
--- a/src/pylon/config/pylon.yaml
+++ b/src/pylon/config/pylon.yaml
@@ -22,6 +22,10 @@ port: 80
 webhdfs-legacy-port: 50070
 deploy-service: false
 
+# For test
+marketplace_api_uri: http://10.151.40.234:9292
+marketplace_webportal_plugin: http://10.151.40.234:9293
+
 #ssl:
 #  # self-sign
 #  crt_name: xxxxxx
diff --git a/src/pylon/deploy/pylon-config/location.conf.template b/src/pylon/deploy/pylon-config/location.conf.template
index dbd168f842..15853cc66a 100644
--- a/src/pylon/deploy/pylon-config/location.conf.template
+++ b/src/pylon/deploy/pylon-config/location.conf.template
@@ -285,24 +285,16 @@ location ~ ^/dshuttle/(.*)$ {
 {%- endif %}
 
 {%- if MARKETPLACE_URI %}
-# Marketplace server
-location ~ ^/marketplace$ {
-  # Add '/' to the end of the URL, otherwise there will be a 404 error.
-  return 301 $scheme://$http_host$request_uri/;
+# marketplace rest server
+location ~ ^/marketplace/api(.*)$ {
+  proxy_pass {{MARKETPLACE_API_URI}}/api$1$is_args$args;
 }
+{%- endif %}
+
+{%- if MARKETPLACE_URI %}
+# marketplace webportal plugin
 location ~ ^/marketplace/(.*)$ {
-  proxy_pass {{MARKETPLACE_URI}}/$1$is_args$args;
-  sub_filter_types *;
-  sub_filter_once off;
-  sub_filter
-    'href="/'
-    'href="/marketplace/';
-  sub_filter
-    '<script src="/'
-    '<script src="/marketplace/';
-  sub_filter
-    '/api'
-    '/marketplace/api';
+  proxy_pass {{MARKETPLACE_WEBPORTAL_PLUGIN}}/$1;
 }
 {%- endif %}
 

From cc5e3cb28246927d83fa6db7fca895c080a0b8e6 Mon Sep 17 00:00:00 2001
From: Yi Yi <yiyi@microsoft.com>
Date: Fri, 6 Nov 2020 03:55:01 +0800
Subject: [PATCH 04/20] update

---
 src/pylon/deploy/pylon.yaml.template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/pylon/deploy/pylon.yaml.template b/src/pylon/deploy/pylon.yaml.template
index ebb267dd1b..3a2797e4ed 100644
--- a/src/pylon/deploy/pylon.yaml.template
+++ b/src/pylon/deploy/pylon.yaml.template
@@ -83,9 +83,13 @@ spec:
             - name: DSHUTTLE_URI
               value: {{ cluster_cfg['dshuttle']['uri'] }}
 {% endif %}
-{% if cluster_cfg['cluster']['common']['marketplace'] == 'true' %}
-            - name: MARKETPLACE_URI
-              value: {{ cluster_cfg['marketplace']['uri']}}
+{% if 'marketplace_api_uri' in cluster_cfg['pylon'] %}
+            - name: MARKETPLACE_API_URI
+              value: {{ cluster_cfg['pylon']['marketplace_api_uri']}}
+{% endif %}
+{% if 'marketplace_webportal_plugin' in cluster_cfg['pylon'] %}
+            - name: MARKETPLACE_WEBPORTAL_PLUGIN
+              value: {{ cluster_cfg['pylon']['marketplace_webportal_plugin']}}
 {% endif %}
           ports:
             - name: pylon

From 53f8ad065b5961c3fb4ae7845d139c88c73ff62e Mon Sep 17 00:00:00 2001
From: Yi Yi <yiyi@microsoft.com>
Date: Sun, 8 Nov 2020 15:49:15 +0800
Subject: [PATCH 05/20] add marketplace-db

---
 .../build/marketplace-db.k8s.dockerfile       |  4 ++
 src/marketplace-db/config/marketplace-db.py   | 27 ++++++++++++
 src/marketplace-db/config/marketplace-db.yaml | 11 +++++
 src/marketplace-db/deploy/delete.sh           | 10 +++++
 .../deploy/marketplace-db.yaml.template       | 43 +++++++++++++++++++
 src/marketplace-db/deploy/refresh.sh          | 11 +++++
 src/marketplace-db/deploy/service.yaml        |  0
 src/marketplace-db/deploy/start.sh.template   | 13 ++++++
 src/marketplace-db/deploy/stop.sh             |  6 +++
 9 files changed, 125 insertions(+)
 create mode 100644 src/marketplace-db/build/marketplace-db.k8s.dockerfile
 create mode 100644 src/marketplace-db/config/marketplace-db.py
 create mode 100644 src/marketplace-db/config/marketplace-db.yaml
 create mode 100644 src/marketplace-db/deploy/delete.sh
 create mode 100644 src/marketplace-db/deploy/marketplace-db.yaml.template
 create mode 100644 src/marketplace-db/deploy/refresh.sh
 create mode 100644 src/marketplace-db/deploy/service.yaml
 create mode 100644 src/marketplace-db/deploy/start.sh.template
 create mode 100644 src/marketplace-db/deploy/stop.sh

diff --git a/src/marketplace-db/build/marketplace-db.k8s.dockerfile b/src/marketplace-db/build/marketplace-db.k8s.dockerfile
new file mode 100644
index 0000000000..9a57b59d2c
--- /dev/null
+++ b/src/marketplace-db/build/marketplace-db.k8s.dockerfile
@@ -0,0 +1,4 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+FROM docker.io/postgres:12.0
diff --git a/src/marketplace-db/config/marketplace-db.py b/src/marketplace-db/config/marketplace-db.py
new file mode 100644
index 0000000000..fec350a172
--- /dev/null
+++ b/src/marketplace-db/config/marketplace-db.py
@@ -0,0 +1,27 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+import copy
+
+class Hivedscheduler:
+    def __init__(self, cluster_conf, service_conf, default_service_conf):
+        self.cluster_conf = cluster_conf
+        self.service_conf = dict(default_service_conf, **service_conf)
+
+    def validation_pre(self):
+        machine_list = self.cluster_conf['machine-list']
+        if len([host for host in machine_list if host.get('pai-master') == 'true']) < 1:
+            return False, '"pai-master=true" machine is required to deploy the marketplace-db service'
+        return True, None
+
+    def run(self):
+        result = copy.deepcopy(self.service_conf)
+        machine_list = self.cluster_conf['machine-list']
+        master_ip = [host['hostip'] for host in machine_list if host.get('pai-master') == 'true'][0]
+        result['host'] = master_ip
+        result['connection-str'] = 'postgresql://{}:{}@{}:{}/{}'.format(
+            result['user'], result['passwd'], result['host'], result['port'], result['db'])
+        return result
+
+    def validation_post(self, conf):
+        return True, None
diff --git a/src/marketplace-db/config/marketplace-db.yaml b/src/marketplace-db/config/marketplace-db.yaml
new file mode 100644
index 0000000000..a5cc89a6cc
--- /dev/null
+++ b/src/marketplace-db/config/marketplace-db.yaml
@@ -0,0 +1,11 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+service_type: "common"
+
+user: user
+passwd: passwd
+db: marketplace
+port: 9291
+max-connection: 1000
+data-path: /mnt/marketplace
diff --git a/src/marketplace-db/deploy/delete.sh b/src/marketplace-db/deploy/delete.sh
new file mode 100644
index 0000000000..5ceb907e38
--- /dev/null
+++ b/src/marketplace-db/deploy/delete.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+pushd $(dirname "$0") > /dev/null
+
+/bin/bash stop.sh || exit $?
+
+popd > /dev/null
diff --git a/src/marketplace-db/deploy/marketplace-db.yaml.template b/src/marketplace-db/deploy/marketplace-db.yaml.template
new file mode 100644
index 0000000000..abe51a8325
--- /dev/null
+++ b/src/marketplace-db/deploy/marketplace-db.yaml.template
@@ -0,0 +1,43 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+apiVersion: apps/v1
+kind: DaemonSet
+metadata:
+  name: marketplace-db-ds
+spec:
+  selector:
+    matchLabels:
+      app: marketplace-db
+  template:
+    metadata:
+      name: marketplace-db
+      labels:
+        app: marketplace-db
+    spec:
+      hostNetwork: true
+      containers:
+      - name: marketplace-db
+        image: {{ cluster_cfg["cluster"]["docker-registry"]["prefix"] }}marketplace-db:{{ cluster_cfg["cluster"]["docker-registry"]["tag"] }}
+        imagePullPolicy: Always
+        env:
+        - name: POSTGRES_USER
+          value: {{ cluster_cfg["marketplace-db"]["user"] }}
+        - name: POSTGRES_PASSWORD
+          value: {{ cluster_cfg["marketplace-db"]["passwd"] }}
+        - name: POSTGRES_DB
+          value: {{ cluster_cfg["marketplace-db"]["db"] }}
+        - name: PGDATA
+          value: /var/lib/postgresql/data/pgdata
+        args: ['-c', 'port={{- cluster_cfg["marketplace-db"]["port"] }}', '-N', '{{ cluster_cfg["marketplace-db"]["max-connection"] }}']
+        volumeMounts:
+        - name: marketplace-data-dir
+          mountPath: /var/lib/postgresql/data/pgdata
+          mountPropagation: "None"
+      volumes:
+        - name: marketplace-data-dir
+          hostPath:
+            path: '{{ cluster_cfg["marketplace-db"]["data-path"] }}'
+            type: DirectoryOrCreate
+      imagePullSecrets:
+      - name: {{ cluster_cfg["cluster"]["docker-registry"]["secret-name"] }}
diff --git a/src/marketplace-db/deploy/refresh.sh b/src/marketplace-db/deploy/refresh.sh
new file mode 100644
index 0000000000..bd50ad3ded
--- /dev/null
+++ b/src/marketplace-db/deploy/refresh.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+pushd $(dirname "$0") > /dev/null
+
+bash stop.sh
+bash start.sh
+
+popd > /dev/null
diff --git a/src/marketplace-db/deploy/service.yaml b/src/marketplace-db/deploy/service.yaml
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/marketplace-db/deploy/start.sh.template b/src/marketplace-db/deploy/start.sh.template
new file mode 100644
index 0000000000..0251fdc7da
--- /dev/null
+++ b/src/marketplace-db/deploy/start.sh.template
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+pushd $(dirname "$0") > /dev/null
+
+kubectl apply --overwrite=true -f marketplace-db.yaml || exit $?
+
+# Wait until the service is ready.
+PYTHONPATH="../../../deployment" python -m  k8sPaiLibrary.monitorTool.check_pod_ready_status -w -k app -v marketplace-db || exit $?
+
+popd > /dev/null
diff --git a/src/marketplace-db/deploy/stop.sh b/src/marketplace-db/deploy/stop.sh
new file mode 100644
index 0000000000..4f1c496084
--- /dev/null
+++ b/src/marketplace-db/deploy/stop.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+kubectl delete --ignore-not-found --now "daemonset/marketplace-db-ds"

From 7ac951b51d6612f318e1b8189c02cb8f6e472deb Mon Sep 17 00:00:00 2001
From: Yi Yi <yiyi@microsoft.com>
Date: Sun, 8 Nov 2020 16:10:37 +0800
Subject: [PATCH 06/20] update

---
 src/marketplace-db/deploy/service.yaml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/src/marketplace-db/deploy/service.yaml b/src/marketplace-db/deploy/service.yaml
index e69de29bb2..22f84dcd60 100644
--- a/src/marketplace-db/deploy/service.yaml
+++ b/src/marketplace-db/deploy/service.yaml
@@ -0,0 +1,20 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+cluster-type:
+  - k8s
+
+prerequisite:
+  - cluster-configuration
+
+template-list:
+  - marketplace-db.yaml
+  - start.sh
+
+start-script: start.sh
+stop-script: stop.sh
+delete-script: delete.sh
+refresh-script: refresh.sh
+
+deploy-rules:
+  - in: pai-master

From e0b523a105791556d2495e800456bf81439e769b Mon Sep 17 00:00:00 2001
From: Yi Yi <yiyi@microsoft.com>
Date: Sun, 8 Nov 2020 17:06:48 +0800
Subject: [PATCH 07/20] update

---
 src/marketplace-db/config/marketplace-db.yaml                   | 2 +-
 .../config/{marketplace-db.py => marketplace_db.py}             | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename src/marketplace-db/config/{marketplace-db.py => marketplace_db.py} (100%)

diff --git a/src/marketplace-db/config/marketplace-db.yaml b/src/marketplace-db/config/marketplace-db.yaml
index a5cc89a6cc..aa67b4bdca 100644
--- a/src/marketplace-db/config/marketplace-db.yaml
+++ b/src/marketplace-db/config/marketplace-db.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 
-service_type: "common"
+service_type: "k8s"
 
 user: user
 passwd: passwd
diff --git a/src/marketplace-db/config/marketplace-db.py b/src/marketplace-db/config/marketplace_db.py
similarity index 100%
rename from src/marketplace-db/config/marketplace-db.py
rename to src/marketplace-db/config/marketplace_db.py

From 2057812618a10ea73896a805a96e35693e7dc396 Mon Sep 17 00:00:00 2001
From: Yi Yi <yiyi@microsoft.com>
Date: Sun, 8 Nov 2020 17:09:30 +0800
Subject: [PATCH 08/20] fix

---
 src/marketplace-db/config/marketplace_db.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/marketplace-db/config/marketplace_db.py b/src/marketplace-db/config/marketplace_db.py
index fec350a172..e7ffd9c85d 100644
--- a/src/marketplace-db/config/marketplace_db.py
+++ b/src/marketplace-db/config/marketplace_db.py
@@ -3,7 +3,7 @@
 
 import copy
 
-class Hivedscheduler:
+class MarketplaceDB(object):
     def __init__(self, cluster_conf, service_conf, default_service_conf):
         self.cluster_conf = cluster_conf
         self.service_conf = dict(default_service_conf, **service_conf)

From 12f769edd0f0b153f166a03c7a2d528f11688999 Mon Sep 17 00:00:00 2001
From: Yi Yi <yiyi@microsoft.com>
Date: Sun, 8 Nov 2020 17:11:31 +0800
Subject: [PATCH 09/20] fix

---
 src/marketplace-db/config/marketplace_db.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/marketplace-db/config/marketplace_db.py b/src/marketplace-db/config/marketplace_db.py
index e7ffd9c85d..c4da3f9b11 100644
--- a/src/marketplace-db/config/marketplace_db.py
+++ b/src/marketplace-db/config/marketplace_db.py
@@ -3,7 +3,7 @@
 
 import copy
 
-class MarketplaceDB(object):
+class MarketplaceDb(object):
     def __init__(self, cluster_conf, service_conf, default_service_conf):
         self.cluster_conf = cluster_conf
         self.service_conf = dict(default_service_conf, **service_conf)

From cfc17f7c6c6ee2bed6dd1b3541ac6424a423f8a5 Mon Sep 17 00:00:00 2001
From: Yi Yi <yiyi@microsoft.com>
Date: Sun, 8 Nov 2020 18:10:51 +0800
Subject: [PATCH 10/20] add marketplace-restserver

---
 .../marketplace-restserver.k8s.dockerfile     |  4 ++
 .../config/marketplace-restserver.yaml        | 12 ++++++
 .../config/marketplace_restserver.py          | 26 +++++++++++++
 src/marketplace-restserver/deploy/delete.sh   | 10 +++++
 .../marketplace-restserver.yaml.template      | 39 +++++++++++++++++++
 src/marketplace-restserver/deploy/refresh.sh  | 11 ++++++
 .../deploy/service.yaml                       | 20 ++++++++++
 .../deploy/start.sh.template                  | 13 +++++++
 src/marketplace-restserver/deploy/stop.sh     |  6 +++
 9 files changed, 141 insertions(+)
 create mode 100644 src/marketplace-restserver/build/marketplace-restserver.k8s.dockerfile
 create mode 100644 src/marketplace-restserver/config/marketplace-restserver.yaml
 create mode 100644 src/marketplace-restserver/config/marketplace_restserver.py
 create mode 100644 src/marketplace-restserver/deploy/delete.sh
 create mode 100644 src/marketplace-restserver/deploy/marketplace-restserver.yaml.template
 create mode 100644 src/marketplace-restserver/deploy/refresh.sh
 create mode 100644 src/marketplace-restserver/deploy/service.yaml
 create mode 100644 src/marketplace-restserver/deploy/start.sh.template
 create mode 100644 src/marketplace-restserver/deploy/stop.sh

diff --git a/src/marketplace-restserver/build/marketplace-restserver.k8s.dockerfile b/src/marketplace-restserver/build/marketplace-restserver.k8s.dockerfile
new file mode 100644
index 0000000000..2f36509342
--- /dev/null
+++ b/src/marketplace-restserver/build/marketplace-restserver.k8s.dockerfile
@@ -0,0 +1,4 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+FROM docker.io/yiyione/marketplace-restserver:v1.2.0
diff --git a/src/marketplace-restserver/config/marketplace-restserver.yaml b/src/marketplace-restserver/config/marketplace-restserver.yaml
new file mode 100644
index 0000000000..58f179acfc
--- /dev/null
+++ b/src/marketplace-restserver/config/marketplace-restserver.yaml
@@ -0,0 +1,12 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+service_type: "k8s"
+
+
+db_user: user
+db_password: passwd
+db: marketplace
+db_host: postgres
+db_port: 9291
+server-port: 9292
diff --git a/src/marketplace-restserver/config/marketplace_restserver.py b/src/marketplace-restserver/config/marketplace_restserver.py
new file mode 100644
index 0000000000..272a9a11f0
--- /dev/null
+++ b/src/marketplace-restserver/config/marketplace_restserver.py
@@ -0,0 +1,26 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+import copy
+
+class MarketplaceRestserver(object):
+    def __init__(self, cluster_conf, service_conf, default_service_conf):
+        self.cluster_conf = cluster_conf
+        self.service_conf = dict(default_service_conf, **service_conf)
+
+    def validation_pre(self):
+        machine_list = self.cluster_conf['machine-list']
+        if len([host for host in machine_list if host.get('pai-master') == 'true']) < 1:
+            return False, '"pai-master=true" machine is required to deploy the marketplace-restserver service'
+        return True, None
+
+    def run(self):
+        result = copy.deepcopy(self.service_conf)
+        machine_list = self.cluster_conf['machine-list']
+        server_port = self.service_conf['server-port']
+        master_ip = [host['hostip'] for host in machine_list if host.get('pai-master') == 'true'][0]
+        result['uri'] = 'http://{0}:{1}'.format(master_ip, server_port)
+        return result
+
+    def validation_post(self, conf):
+        return True, None
diff --git a/src/marketplace-restserver/deploy/delete.sh b/src/marketplace-restserver/deploy/delete.sh
new file mode 100644
index 0000000000..5ceb907e38
--- /dev/null
+++ b/src/marketplace-restserver/deploy/delete.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+pushd $(dirname "$0") > /dev/null
+
+/bin/bash stop.sh || exit $?
+
+popd > /dev/null
diff --git a/src/marketplace-restserver/deploy/marketplace-restserver.yaml.template b/src/marketplace-restserver/deploy/marketplace-restserver.yaml.template
new file mode 100644
index 0000000000..7f0dcbe2b0
--- /dev/null
+++ b/src/marketplace-restserver/deploy/marketplace-restserver.yaml.template
@@ -0,0 +1,39 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+apiVersion: apps/v1
+kind: DaemonSet
+metadata:
+  name: marketplace-restserver-ds
+spec:
+  selector:
+    matchLabels:
+      app: marketplace-restserver
+  template:
+    metadata:
+      name: marketplace-restserver
+      labels:
+        app: marketplace-restserver
+    spec:
+      hostNetwork: true
+      containers:
+      - name: marketplace-restserver
+        image: {{ cluster_cfg["cluster"]["docker-registry"]["prefix"] }}marketplace-restserver:{{ cluster_cfg["cluster"]["docker-registry"]["tag"] }}
+        imagePullPolicy: Always
+        env:
+        - name: DB_USERNAME
+          value: {{ cluster_cfg["marketplace-restserver"]["db_user"] }}
+        - name: DB_PASSWORD
+          value: {{ cluster_cfg["marketplace-restserver"]["db_password"] }}
+        - name: DATABASE
+          value: {{ cluster_cfg["marketplace-restserver"]["db"] }}
+        - name: DB_HOST
+          value: {{ cluster_cfg["marketplace-restserver"]["db_host"] }}
+        - name: DB_PORT
+          value: {{ cluster_cfg["marketplace-restserver"]["db_host"] }}
+        - name: NODE_ENV
+          value: production
+        - name: PORT
+          value: {{ cluster_cfg["marketplace-restserver"]["server-port"] }}
+      imagePullSecrets:
+      - name: {{ cluster_cfg["cluster"]["docker-registry"]["secret-name"] }}
diff --git a/src/marketplace-restserver/deploy/refresh.sh b/src/marketplace-restserver/deploy/refresh.sh
new file mode 100644
index 0000000000..bd50ad3ded
--- /dev/null
+++ b/src/marketplace-restserver/deploy/refresh.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+pushd $(dirname "$0") > /dev/null
+
+bash stop.sh
+bash start.sh
+
+popd > /dev/null
diff --git a/src/marketplace-restserver/deploy/service.yaml b/src/marketplace-restserver/deploy/service.yaml
new file mode 100644
index 0000000000..8b22188561
--- /dev/null
+++ b/src/marketplace-restserver/deploy/service.yaml
@@ -0,0 +1,20 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+cluster-type:
+  - k8s
+
+prerequisite:
+  - cluster-configuration
+
+template-list:
+  - marketplace-restserver.yaml
+  - start.sh
+
+start-script: start.sh
+stop-script: stop.sh
+delete-script: delete.sh
+refresh-script: refresh.sh
+
+deploy-rules:
+  - in: pai-master
diff --git a/src/marketplace-restserver/deploy/start.sh.template b/src/marketplace-restserver/deploy/start.sh.template
new file mode 100644
index 0000000000..93d0d7753c
--- /dev/null
+++ b/src/marketplace-restserver/deploy/start.sh.template
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+pushd $(dirname "$0") > /dev/null
+
+kubectl apply --overwrite=true -f marketplace-restserver.yaml || exit $?
+
+# Wait until the service is ready.
+PYTHONPATH="../../../deployment" python -m  k8sPaiLibrary.monitorTool.check_pod_ready_status -w -k app -v marketplace-restserver || exit $?
+
+popd > /dev/null
diff --git a/src/marketplace-restserver/deploy/stop.sh b/src/marketplace-restserver/deploy/stop.sh
new file mode 100644
index 0000000000..ea204f1378
--- /dev/null
+++ b/src/marketplace-restserver/deploy/stop.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+kubectl delete --ignore-not-found --now "daemonset/marketplace-restserver-ds"

From c9ad18d769543f2845de8bf02aa316117674901c Mon Sep 17 00:00:00 2001
From: Yi Yi <yiyi@microsoft.com>
Date: Sun, 8 Nov 2020 18:39:00 +0800
Subject: [PATCH 11/20] update

---
 src/marketplace-restserver/config/marketplace-restserver.yaml   | 2 +-
 .../deploy/marketplace-restserver.yaml.template                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/marketplace-restserver/config/marketplace-restserver.yaml b/src/marketplace-restserver/config/marketplace-restserver.yaml
index 58f179acfc..adb5c225c8 100644
--- a/src/marketplace-restserver/config/marketplace-restserver.yaml
+++ b/src/marketplace-restserver/config/marketplace-restserver.yaml
@@ -8,5 +8,5 @@ db_user: user
 db_password: passwd
 db: marketplace
 db_host: postgres
-db_port: 9291
+db_port: "9291"
 server-port: 9292
diff --git a/src/marketplace-restserver/deploy/marketplace-restserver.yaml.template b/src/marketplace-restserver/deploy/marketplace-restserver.yaml.template
index 7f0dcbe2b0..0b635f455e 100644
--- a/src/marketplace-restserver/deploy/marketplace-restserver.yaml.template
+++ b/src/marketplace-restserver/deploy/marketplace-restserver.yaml.template
@@ -30,7 +30,7 @@ spec:
         - name: DB_HOST
           value: {{ cluster_cfg["marketplace-restserver"]["db_host"] }}
         - name: DB_PORT
-          value: {{ cluster_cfg["marketplace-restserver"]["db_host"] }}
+          value: {{ cluster_cfg["marketplace-restserver"]["db_port"] }}
         - name: NODE_ENV
           value: production
         - name: PORT

From f6b50c06c887af630cf14b97a72fda06a81ef97b Mon Sep 17 00:00:00 2001
From: Yi Yi <yiyi@microsoft.com>
Date: Sun, 8 Nov 2020 18:40:52 +0800
Subject: [PATCH 12/20] update

---
 src/marketplace-restserver/config/marketplace-restserver.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/marketplace-restserver/config/marketplace-restserver.yaml b/src/marketplace-restserver/config/marketplace-restserver.yaml
index adb5c225c8..3d744523b4 100644
--- a/src/marketplace-restserver/config/marketplace-restserver.yaml
+++ b/src/marketplace-restserver/config/marketplace-restserver.yaml
@@ -9,4 +9,4 @@ db_password: passwd
 db: marketplace
 db_host: postgres
 db_port: "9291"
-server-port: 9292
+server-port: "9292"

From eae904dccc9cfb2b4fdd51619284e983892abce9 Mon Sep 17 00:00:00 2001
From: Yi Yi <yiyi@microsoft.com>
Date: Sun, 8 Nov 2020 18:45:37 +0800
Subject: [PATCH 13/20] fix

---
 src/marketplace-restserver/config/marketplace-restserver.yaml | 4 ++--
 .../deploy/marketplace-restserver.yaml.template               | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/marketplace-restserver/config/marketplace-restserver.yaml b/src/marketplace-restserver/config/marketplace-restserver.yaml
index 3d744523b4..58f179acfc 100644
--- a/src/marketplace-restserver/config/marketplace-restserver.yaml
+++ b/src/marketplace-restserver/config/marketplace-restserver.yaml
@@ -8,5 +8,5 @@ db_user: user
 db_password: passwd
 db: marketplace
 db_host: postgres
-db_port: "9291"
-server-port: "9292"
+db_port: 9291
+server-port: 9292
diff --git a/src/marketplace-restserver/deploy/marketplace-restserver.yaml.template b/src/marketplace-restserver/deploy/marketplace-restserver.yaml.template
index 0b635f455e..45cb1c735c 100644
--- a/src/marketplace-restserver/deploy/marketplace-restserver.yaml.template
+++ b/src/marketplace-restserver/deploy/marketplace-restserver.yaml.template
@@ -30,10 +30,10 @@ spec:
         - name: DB_HOST
           value: {{ cluster_cfg["marketplace-restserver"]["db_host"] }}
         - name: DB_PORT
-          value: {{ cluster_cfg["marketplace-restserver"]["db_port"] }}
+          value: "{{ cluster_cfg["marketplace-restserver"]["db_port"] }}"
         - name: NODE_ENV
           value: production
         - name: PORT
-          value: {{ cluster_cfg["marketplace-restserver"]["server-port"] }}
+          value: "{{ cluster_cfg["marketplace-restserver"]["server-port"] }}"
       imagePullSecrets:
       - name: {{ cluster_cfg["cluster"]["docker-registry"]["secret-name"] }}

From 8bc05a77c71445e06dfde2c28f0754d1a9542ee9 Mon Sep 17 00:00:00 2001
From: Yi Yi <yiyi@microsoft.com>
Date: Sun, 8 Nov 2020 18:53:32 +0800
Subject: [PATCH 14/20] update pylon

---
 src/pylon/config/pylon.yaml                          | 1 -
 src/pylon/deploy/pylon-config/location.conf.template | 4 ++--
 src/pylon/deploy/pylon.yaml.template                 | 6 +++---
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/pylon/config/pylon.yaml b/src/pylon/config/pylon.yaml
index 913dae79d2..8522c4a853 100644
--- a/src/pylon/config/pylon.yaml
+++ b/src/pylon/config/pylon.yaml
@@ -23,7 +23,6 @@ webhdfs-legacy-port: 50070
 deploy-service: false
 
 # For test
-marketplace_api_uri: http://10.151.40.234:9292
 marketplace_webportal_plugin: http://10.151.40.234:9293
 
 #ssl:
diff --git a/src/pylon/deploy/pylon-config/location.conf.template b/src/pylon/deploy/pylon-config/location.conf.template
index 15853cc66a..469a4b26f3 100644
--- a/src/pylon/deploy/pylon-config/location.conf.template
+++ b/src/pylon/deploy/pylon-config/location.conf.template
@@ -284,14 +284,14 @@ location ~ ^/dshuttle/(.*)$ {
 }
 {%- endif %}
 
-{%- if MARKETPLACE_URI %}
+{%- if MARKETPLACE_API_URI %}
 # marketplace rest server
 location ~ ^/marketplace/api(.*)$ {
   proxy_pass {{MARKETPLACE_API_URI}}/api$1$is_args$args;
 }
 {%- endif %}
 
-{%- if MARKETPLACE_URI %}
+{%- if MARKETPLACE_WEBPORTAL_PLUGIN %}
 # marketplace webportal plugin
 location ~ ^/marketplace/(.*)$ {
   proxy_pass {{MARKETPLACE_WEBPORTAL_PLUGIN}}/$1;
diff --git a/src/pylon/deploy/pylon.yaml.template b/src/pylon/deploy/pylon.yaml.template
index 3a2797e4ed..287029bbe3 100644
--- a/src/pylon/deploy/pylon.yaml.template
+++ b/src/pylon/deploy/pylon.yaml.template
@@ -83,11 +83,11 @@ spec:
             - name: DSHUTTLE_URI
               value: {{ cluster_cfg['dshuttle']['uri'] }}
 {% endif %}
-{% if 'marketplace_api_uri' in cluster_cfg['pylon'] %}
+{% if cluster_cfg['cluster']['common']['marketplace'] == 'true' %}
             - name: MARKETPLACE_API_URI
-              value: {{ cluster_cfg['pylon']['marketplace_api_uri']}}
+              value: {{ cluster_cfg['marketplace-restserver']['uri']}}
 {% endif %}
-{% if 'marketplace_webportal_plugin' in cluster_cfg['pylon'] %}
+{% if cluster_cfg['cluster']['common']['marketplace'] == 'true' %}
             - name: MARKETPLACE_WEBPORTAL_PLUGIN
               value: {{ cluster_cfg['pylon']['marketplace_webportal_plugin']}}
 {% endif %}

From 5b360af2acbc06458e3a535e239060ff07263bb4 Mon Sep 17 00:00:00 2001
From: Yi Yi <yiyi@microsoft.com>
Date: Sun, 8 Nov 2020 18:55:28 +0800
Subject: [PATCH 15/20] update

---
 src/pylon/config/pylon.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/pylon/config/pylon.py b/src/pylon/config/pylon.py
index d35f967e4c..26dc98662c 100644
--- a/src/pylon/config/pylon.py
+++ b/src/pylon/config/pylon.py
@@ -43,14 +43,12 @@ def run(self):
             uriHttps = 'https://{0}'.format(self.service_configuration['domain'])
 
         webhdfs_legacy_port = self.service_configuration['webhdfs-legacy-port']
-        marketplace_api_uri = self.service_configuration['marketplace_api_uri']
         marketplace_webportal_plugin = self.service_configuration['marketplace_webportal_plugin']
         ret = {
             'port': port,
             'uri': uri,
             'uri-https': uriHttps,
             'webhdfs-legacy-port': webhdfs_legacy_port,
-            'marketplace_api_uri': marketplace_api_uri,
             'marketplace_webportal_plugin': marketplace_webportal_plugin,
         }
         if 'ssl' in self.service_configuration:

From 983ea527a0b993b6aa814d243ca6274788f5e3d7 Mon Sep 17 00:00:00 2001
From: Yi Yi <yiyi@microsoft.com>
Date: Sun, 8 Nov 2020 19:04:51 +0800
Subject: [PATCH 16/20] update

---
 src/pylon/deploy/pylon-config/location.conf.template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/pylon/deploy/pylon-config/location.conf.template b/src/pylon/deploy/pylon-config/location.conf.template
index 469a4b26f3..711cb0f6ea 100644
--- a/src/pylon/deploy/pylon-config/location.conf.template
+++ b/src/pylon/deploy/pylon-config/location.conf.template
@@ -287,7 +287,7 @@ location ~ ^/dshuttle/(.*)$ {
 {%- if MARKETPLACE_API_URI %}
 # marketplace rest server
 location ~ ^/marketplace/api(.*)$ {
-  proxy_pass {{MARKETPLACE_API_URI}}/api$1$is_args$args;
+  proxy_pass {{MARKETPLACE_API_URI}}/$1$is_args$args;
 }
 {%- endif %}
 
@@ -341,9 +341,14 @@ location ~ ^(.*)$ {
     '{{DSHUTTLE_URI}}'
     '/dshuttle';
 {%- endif %}
-{%- if MARKETPLACE_URI %}
+{%- if MARKETPLACE_API_URI %}
+  sub_filter
+    '{{MARKETPLACE_API_URI}}'
+    '/marketplace/api';
+{%- endif %}
+{%- if MARKETPLACE_WEBPORTAL_PLUGIN %}
   sub_filter
-    '{{MARKETPLACE_URI}}'
+    '{{MARKETPLACE_WEBPORTAL_PLUGIN}}'
     '/marketplace';
 {%- endif %}
 

From fcb9faf33d3c1022d500ec9afb47afc3191ef164 Mon Sep 17 00:00:00 2001
From: Yi Yi <yiyi@microsoft.com>
Date: Sun, 8 Nov 2020 19:31:13 +0800
Subject: [PATCH 17/20] update

---
 src/marketplace-restserver/config/marketplace-restserver.yaml | 2 +-
 src/marketplace-restserver/config/marketplace_restserver.py   | 2 ++
 src/pylon/deploy/pylon-config/location.conf.template          | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/marketplace-restserver/config/marketplace-restserver.yaml b/src/marketplace-restserver/config/marketplace-restserver.yaml
index 58f179acfc..c34b809559 100644
--- a/src/marketplace-restserver/config/marketplace-restserver.yaml
+++ b/src/marketplace-restserver/config/marketplace-restserver.yaml
@@ -7,6 +7,6 @@ service_type: "k8s"
 db_user: user
 db_password: passwd
 db: marketplace
-db_host: postgres
+# db_host: postgres
 db_port: 9291
 server-port: 9292
diff --git a/src/marketplace-restserver/config/marketplace_restserver.py b/src/marketplace-restserver/config/marketplace_restserver.py
index 272a9a11f0..457466ca90 100644
--- a/src/marketplace-restserver/config/marketplace_restserver.py
+++ b/src/marketplace-restserver/config/marketplace_restserver.py
@@ -20,6 +20,8 @@ def run(self):
         server_port = self.service_conf['server-port']
         master_ip = [host['hostip'] for host in machine_list if host.get('pai-master') == 'true'][0]
         result['uri'] = 'http://{0}:{1}'.format(master_ip, server_port)
+        if 'db_host' not in result:
+            result['db_host'] = master_ip
         return result
 
     def validation_post(self, conf):
diff --git a/src/pylon/deploy/pylon-config/location.conf.template b/src/pylon/deploy/pylon-config/location.conf.template
index 711cb0f6ea..99d07a0e0a 100644
--- a/src/pylon/deploy/pylon-config/location.conf.template
+++ b/src/pylon/deploy/pylon-config/location.conf.template
@@ -286,7 +286,7 @@ location ~ ^/dshuttle/(.*)$ {
 
 {%- if MARKETPLACE_API_URI %}
 # marketplace rest server
-location ~ ^/marketplace/api(.*)$ {
+location ~ ^/marketplace/api/(.*)$ {
   proxy_pass {{MARKETPLACE_API_URI}}/$1$is_args$args;
 }
 {%- endif %}

From 15b1756afc61d91edbda29abd0f26b95a7a321f7 Mon Sep 17 00:00:00 2001
From: Yi Yi <yiyi@microsoft.com>
Date: Sun, 8 Nov 2020 20:41:21 +0800
Subject: [PATCH 18/20] update

---
 .../config/marketplace-restserver.yaml        |  1 -
 .../marketplace-webportal.k8s.dockerfile      |  4 +++
 .../config/marketplace-webportal.yaml         |  7 +++++
 .../config/marketplace_webportal.py           | 28 ++++++++++++++++++
 src/marketplace-webportal/deploy/delete.sh    | 10 +++++++
 .../marketplace-webportal.yaml.template       | 29 +++++++++++++++++++
 src/marketplace-webportal/deploy/refresh.sh   | 11 +++++++
 src/marketplace-webportal/deploy/service.yaml | 20 +++++++++++++
 .../deploy/start.sh.template                  | 13 +++++++++
 src/marketplace-webportal/deploy/stop.sh      |  6 ++++
 .../pylon-config/location.conf.template       |  8 +++++
 11 files changed, 136 insertions(+), 1 deletion(-)
 create mode 100644 src/marketplace-webportal/build/marketplace-webportal.k8s.dockerfile
 create mode 100644 src/marketplace-webportal/config/marketplace-webportal.yaml
 create mode 100644 src/marketplace-webportal/config/marketplace_webportal.py
 create mode 100644 src/marketplace-webportal/deploy/delete.sh
 create mode 100644 src/marketplace-webportal/deploy/marketplace-webportal.yaml.template
 create mode 100644 src/marketplace-webportal/deploy/refresh.sh
 create mode 100644 src/marketplace-webportal/deploy/service.yaml
 create mode 100644 src/marketplace-webportal/deploy/start.sh.template
 create mode 100644 src/marketplace-webportal/deploy/stop.sh

diff --git a/src/marketplace-restserver/config/marketplace-restserver.yaml b/src/marketplace-restserver/config/marketplace-restserver.yaml
index c34b809559..03352991fe 100644
--- a/src/marketplace-restserver/config/marketplace-restserver.yaml
+++ b/src/marketplace-restserver/config/marketplace-restserver.yaml
@@ -3,7 +3,6 @@
 
 service_type: "k8s"
 
-
 db_user: user
 db_password: passwd
 db: marketplace
diff --git a/src/marketplace-webportal/build/marketplace-webportal.k8s.dockerfile b/src/marketplace-webportal/build/marketplace-webportal.k8s.dockerfile
new file mode 100644
index 0000000000..aed5623f4b
--- /dev/null
+++ b/src/marketplace-webportal/build/marketplace-webportal.k8s.dockerfile
@@ -0,0 +1,4 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+FROM docker.io/yiyione/marketplace-webportal:v1.2.0
diff --git a/src/marketplace-webportal/config/marketplace-webportal.yaml b/src/marketplace-webportal/config/marketplace-webportal.yaml
new file mode 100644
index 0000000000..a6cef7bff7
--- /dev/null
+++ b/src/marketplace-webportal/config/marketplace-webportal.yaml
@@ -0,0 +1,7 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+service_type: "k8s"
+
+# marketplace_api_uri: marketplace_api_uri
+server-port: 9293
diff --git a/src/marketplace-webportal/config/marketplace_webportal.py b/src/marketplace-webportal/config/marketplace_webportal.py
new file mode 100644
index 0000000000..25800f7f77
--- /dev/null
+++ b/src/marketplace-webportal/config/marketplace_webportal.py
@@ -0,0 +1,28 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+import copy
+
+class MarketplaceWebportal(object):
+    def __init__(self, cluster_conf, service_conf, default_service_conf):
+        self.cluster_conf = cluster_conf
+        self.service_conf = dict(default_service_conf, **service_conf)
+
+    def validation_pre(self):
+        machine_list = self.cluster_conf['machine-list']
+        if len([host for host in machine_list if host.get('pai-master') == 'true']) < 1:
+            return False, '"pai-master=true" machine is required to deploy the marketplace-webportal service'
+        return True, None
+
+    def run(self):
+        result = copy.deepcopy(self.service_conf)
+        machine_list = self.cluster_conf['machine-list']
+        server_port = self.service_conf['server-port']
+        master_ip = [host['hostip'] for host in machine_list if host.get('pai-master') == 'true'][0]
+        result['uri'] = 'http://{0}:{1}/plugin.js'.format(master_ip, server_port)
+        if 'marketplace_api_uri' not in result:
+            result['marketplace_api_uri'] = master_ip
+        return result
+
+    def validation_post(self, conf):
+        return True, None
diff --git a/src/marketplace-webportal/deploy/delete.sh b/src/marketplace-webportal/deploy/delete.sh
new file mode 100644
index 0000000000..5ceb907e38
--- /dev/null
+++ b/src/marketplace-webportal/deploy/delete.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+pushd $(dirname "$0") > /dev/null
+
+/bin/bash stop.sh || exit $?
+
+popd > /dev/null
diff --git a/src/marketplace-webportal/deploy/marketplace-webportal.yaml.template b/src/marketplace-webportal/deploy/marketplace-webportal.yaml.template
new file mode 100644
index 0000000000..2f4876d7d4
--- /dev/null
+++ b/src/marketplace-webportal/deploy/marketplace-webportal.yaml.template
@@ -0,0 +1,29 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+apiVersion: apps/v1
+kind: DaemonSet
+metadata:
+  name: marketplace-webportal-ds
+spec:
+  selector:
+    matchLabels:
+      app: marketplace-webportal
+  template:
+    metadata:
+      name: marketplace-webportal
+      labels:
+        app: marketplace-webportal
+    spec:
+      hostNetwork: true
+      containers:
+      - name: marketplace-webportal
+        image: {{ cluster_cfg["cluster"]["docker-registry"]["prefix"] }}marketplace-webportal:{{ cluster_cfg["cluster"]["docker-registry"]["tag"] }}
+        imagePullPolicy: Always
+        env:
+        - name: MARKETPLACE_API_URL
+          value: {{ cluster_cfg["marketplace-webportal"]["marketplace_api_uri"] }}
+        - name: SERVER_PORT
+          value: "{{ cluster_cfg["marketplace-webportal"]["server-port"] }}"
+      imagePullSecrets:
+      - name: {{ cluster_cfg["cluster"]["docker-registry"]["secret-name"] }}
diff --git a/src/marketplace-webportal/deploy/refresh.sh b/src/marketplace-webportal/deploy/refresh.sh
new file mode 100644
index 0000000000..bd50ad3ded
--- /dev/null
+++ b/src/marketplace-webportal/deploy/refresh.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+pushd $(dirname "$0") > /dev/null
+
+bash stop.sh
+bash start.sh
+
+popd > /dev/null
diff --git a/src/marketplace-webportal/deploy/service.yaml b/src/marketplace-webportal/deploy/service.yaml
new file mode 100644
index 0000000000..d4f9879c06
--- /dev/null
+++ b/src/marketplace-webportal/deploy/service.yaml
@@ -0,0 +1,20 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+cluster-type:
+  - k8s
+
+prerequisite:
+  - cluster-configuration
+
+template-list:
+  - marketplace-webportal.yaml
+  - start.sh
+
+start-script: start.sh
+stop-script: stop.sh
+delete-script: delete.sh
+refresh-script: refresh.sh
+
+deploy-rules:
+  - in: pai-master
diff --git a/src/marketplace-webportal/deploy/start.sh.template b/src/marketplace-webportal/deploy/start.sh.template
new file mode 100644
index 0000000000..acd1954dc8
--- /dev/null
+++ b/src/marketplace-webportal/deploy/start.sh.template
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+pushd $(dirname "$0") > /dev/null
+
+kubectl apply --overwrite=true -f marketplace-webportal.yaml || exit $?
+
+# Wait until the service is ready.
+PYTHONPATH="../../../deployment" python -m  k8sPaiLibrary.monitorTool.check_pod_ready_status -w -k app -v marketplace-webportal || exit $?
+
+popd > /dev/null
diff --git a/src/marketplace-webportal/deploy/stop.sh b/src/marketplace-webportal/deploy/stop.sh
new file mode 100644
index 0000000000..0eae959b5d
--- /dev/null
+++ b/src/marketplace-webportal/deploy/stop.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+kubectl delete --ignore-not-found --now "daemonset/marketplace-webportal-ds"
diff --git a/src/pylon/deploy/pylon-config/location.conf.template b/src/pylon/deploy/pylon-config/location.conf.template
index 99d07a0e0a..9a5db88714 100644
--- a/src/pylon/deploy/pylon-config/location.conf.template
+++ b/src/pylon/deploy/pylon-config/location.conf.template
@@ -286,6 +286,10 @@ location ~ ^/dshuttle/(.*)$ {
 
 {%- if MARKETPLACE_API_URI %}
 # marketplace rest server
+location ~ ^/marketplace/api$ {
+  # Add '/' to the end of the URL, otherwise there will be a 404 error.
+  return 301 $scheme://$http_host$request_uri/;
+}
 location ~ ^/marketplace/api/(.*)$ {
   proxy_pass {{MARKETPLACE_API_URI}}/$1$is_args$args;
 }
@@ -293,6 +297,10 @@ location ~ ^/marketplace/api/(.*)$ {
 
 {%- if MARKETPLACE_WEBPORTAL_PLUGIN %}
 # marketplace webportal plugin
+location ~ ^/marketplace$ {
+  # Add '/' to the end of the URL, otherwise there will be a 404 error.
+  return 301 $scheme://$http_host$request_uri/;
+}
 location ~ ^/marketplace/(.*)$ {
   proxy_pass {{MARKETPLACE_WEBPORTAL_PLUGIN}}/$1;
 }

From 1895c3955bd41fec1ae7f99ccbb20d7f87530076 Mon Sep 17 00:00:00 2001
From: Yi Yi <yiyi@microsoft.com>
Date: Sun, 8 Nov 2020 23:26:44 +0800
Subject: [PATCH 19/20] update

---
 src/marketplace-webportal/config/marketplace-webportal.yaml | 1 +
 src/marketplace-webportal/config/marketplace_webportal.py   | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/marketplace-webportal/config/marketplace-webportal.yaml b/src/marketplace-webportal/config/marketplace-webportal.yaml
index a6cef7bff7..de69d0be87 100644
--- a/src/marketplace-webportal/config/marketplace-webportal.yaml
+++ b/src/marketplace-webportal/config/marketplace-webportal.yaml
@@ -4,4 +4,5 @@
 service_type: "k8s"
 
 # marketplace_api_uri: marketplace_api_uri
+api-port: 9292
 server-port: 9293
diff --git a/src/marketplace-webportal/config/marketplace_webportal.py b/src/marketplace-webportal/config/marketplace_webportal.py
index 25800f7f77..1ece0ebe99 100644
--- a/src/marketplace-webportal/config/marketplace_webportal.py
+++ b/src/marketplace-webportal/config/marketplace_webportal.py
@@ -18,10 +18,11 @@ def run(self):
         result = copy.deepcopy(self.service_conf)
         machine_list = self.cluster_conf['machine-list']
         server_port = self.service_conf['server-port']
+        api_port = self.service_conf['api-port']
         master_ip = [host['hostip'] for host in machine_list if host.get('pai-master') == 'true'][0]
         result['uri'] = 'http://{0}:{1}/plugin.js'.format(master_ip, server_port)
         if 'marketplace_api_uri' not in result:
-            result['marketplace_api_uri'] = master_ip
+            result['marketplace_api_uri'] = 'http://{0}:{1}/api'.format(master_ip, api_port)
         return result
 
     def validation_post(self, conf):

From ac4e9a858f022d6e7642fb8a72d894bf287280aa Mon Sep 17 00:00:00 2001
From: Yi Yi <yiyi@microsoft.com>
Date: Mon, 9 Nov 2020 15:55:10 +0800
Subject: [PATCH 20/20] update

---
 .../build/marketplace-restserver.k8s.dockerfile                | 2 +-
 .../build/marketplace-webportal.k8s.dockerfile                 | 2 +-
 src/marketplace-webportal/config/marketplace_webportal.py      | 2 +-
 src/pylon/config/pylon.py                                      | 2 --
 src/pylon/config/pylon.yaml                                    | 3 ---
 src/pylon/deploy/pylon.yaml.template                           | 2 +-
 6 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/marketplace-restserver/build/marketplace-restserver.k8s.dockerfile b/src/marketplace-restserver/build/marketplace-restserver.k8s.dockerfile
index 2f36509342..005c719740 100644
--- a/src/marketplace-restserver/build/marketplace-restserver.k8s.dockerfile
+++ b/src/marketplace-restserver/build/marketplace-restserver.k8s.dockerfile
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 
-FROM docker.io/yiyione/marketplace-restserver:v1.2.0
+FROM docker.io/openpai/pai-marketplace-restserver:v1.2.0
diff --git a/src/marketplace-webportal/build/marketplace-webportal.k8s.dockerfile b/src/marketplace-webportal/build/marketplace-webportal.k8s.dockerfile
index aed5623f4b..a2f12ff94a 100644
--- a/src/marketplace-webportal/build/marketplace-webportal.k8s.dockerfile
+++ b/src/marketplace-webportal/build/marketplace-webportal.k8s.dockerfile
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 
-FROM docker.io/yiyione/marketplace-webportal:v1.2.0
+FROM docker.io/openpai/pai-marketplace-webportal:v1.2.0
diff --git a/src/marketplace-webportal/config/marketplace_webportal.py b/src/marketplace-webportal/config/marketplace_webportal.py
index 1ece0ebe99..7a807e4b3c 100644
--- a/src/marketplace-webportal/config/marketplace_webportal.py
+++ b/src/marketplace-webportal/config/marketplace_webportal.py
@@ -20,7 +20,7 @@ def run(self):
         server_port = self.service_conf['server-port']
         api_port = self.service_conf['api-port']
         master_ip = [host['hostip'] for host in machine_list if host.get('pai-master') == 'true'][0]
-        result['uri'] = 'http://{0}:{1}/plugin.js'.format(master_ip, server_port)
+        result['uri'] = 'http://{0}:{1}'.format(master_ip, server_port)
         if 'marketplace_api_uri' not in result:
             result['marketplace_api_uri'] = 'http://{0}:{1}/api'.format(master_ip, api_port)
         return result
diff --git a/src/pylon/config/pylon.py b/src/pylon/config/pylon.py
index 26dc98662c..592bc9c6bf 100644
--- a/src/pylon/config/pylon.py
+++ b/src/pylon/config/pylon.py
@@ -43,13 +43,11 @@ def run(self):
             uriHttps = 'https://{0}'.format(self.service_configuration['domain'])
 
         webhdfs_legacy_port = self.service_configuration['webhdfs-legacy-port']
-        marketplace_webportal_plugin = self.service_configuration['marketplace_webportal_plugin']
         ret = {
             'port': port,
             'uri': uri,
             'uri-https': uriHttps,
             'webhdfs-legacy-port': webhdfs_legacy_port,
-            'marketplace_webportal_plugin': marketplace_webportal_plugin,
         }
         if 'ssl' in self.service_configuration:
             ret['ssl'] = self.service_configuration['ssl']
diff --git a/src/pylon/config/pylon.yaml b/src/pylon/config/pylon.yaml
index 8522c4a853..3a33263d54 100644
--- a/src/pylon/config/pylon.yaml
+++ b/src/pylon/config/pylon.yaml
@@ -22,9 +22,6 @@ port: 80
 webhdfs-legacy-port: 50070
 deploy-service: false
 
-# For test
-marketplace_webportal_plugin: http://10.151.40.234:9293
-
 #ssl:
 #  # self-sign
 #  crt_name: xxxxxx
diff --git a/src/pylon/deploy/pylon.yaml.template b/src/pylon/deploy/pylon.yaml.template
index 287029bbe3..7f6e804d2d 100644
--- a/src/pylon/deploy/pylon.yaml.template
+++ b/src/pylon/deploy/pylon.yaml.template
@@ -89,7 +89,7 @@ spec:
 {% endif %}
 {% if cluster_cfg['cluster']['common']['marketplace'] == 'true' %}
             - name: MARKETPLACE_WEBPORTAL_PLUGIN
-              value: {{ cluster_cfg['pylon']['marketplace_webportal_plugin']}}
+              value: {{ cluster_cfg['marketplace-webportal']['uri']}}
 {% endif %}
           ports:
             - name: pylon