From 0422d19ff2de7bcfbf147e65b85c346d6373e91c Mon Sep 17 00:00:00 2001 From: wusong Date: Mon, 7 Mar 2022 18:48:48 +0800 Subject: [PATCH 1/2] update k8s yaml --- k8s/crawlab-master.yaml | 21 +++++++++++++-------- k8s/crawlab-worker.yaml | 9 ++++++--- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/k8s/crawlab-master.yaml b/k8s/crawlab-master.yaml index b2274684..19efc720 100644 --- a/k8s/crawlab-master.yaml +++ b/k8s/crawlab-master.yaml @@ -5,20 +5,23 @@ metadata: namespace: crawlab spec: ports: - - port: 8080 + - port: 80 targetPort: 8080 - nodePort: 30088 + name: http + - name: grpc + port: 9666 + targetPort: 9666 selector: app: crawlab-master - type: NodePort + type: ClusterIP + --- apiVersion: apps/v1 -kind: StatefulSet +kind: Deployment metadata: name: crawlab-master namespace: crawlab spec: - serviceName: crawlab-master selector: matchLabels: app: crawlab-master @@ -28,11 +31,11 @@ spec: app: crawlab-master spec: containers: - - image: tikazyq/crawlab:latest + - image: crawlabteam/crawlab:latest imagePullPolicy: Always name: crawlab env: - - name: CRAWLAB_SERVER_MASTER + - name: CRAWLAB_NODE_MASTER value: "Y" - name: CRAWLAB_MONGO_HOST value: "mongo" @@ -50,4 +53,6 @@ spec: value: "hostname" ports: - containerPort: 8080 - name: crawlab \ No newline at end of file + name: crawlab + - containerPort: 9666 + name: grpc \ No newline at end of file diff --git a/k8s/crawlab-worker.yaml b/k8s/crawlab-worker.yaml index 2ee052d0..88409ebe 100644 --- a/k8s/crawlab-worker.yaml +++ b/k8s/crawlab-worker.yaml @@ -1,10 +1,9 @@ apiVersion: apps/v1 -kind: StatefulSet +kind: Deployment metadata: name: crawlab-worker namespace: crawlab spec: - serviceName: crawlab-worker replicas: 2 selector: matchLabels: @@ -19,7 +18,7 @@ spec: imagePullPolicy: Always name: crawlab env: - - name: CRAWLAB_SERVER_MASTER + - name: CRAWLAB_NODE_MASTER value: "N" - name: CRAWLAB_MONGO_HOST value: "mongo" @@ -33,3 +32,7 @@ spec: value: "Y" - name: CRAWLAB_SERVER_REGISTER_TYPE value: "hostname" + - name: CRAWLAB_GRPC_ADDRESS + value: "crawlab" + - name: CRAWLAB_FS_FILER_URL + value: "http://crawlab/api/filer" From c5a3034d052890bb1333498a43397b782ef940e9 Mon Sep 17 00:00:00 2001 From: wusong Date: Mon, 7 Mar 2022 19:03:56 +0800 Subject: [PATCH 2/2] update docker image Signed-off-by: wusong --- k8s/crawlab-worker.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s/crawlab-worker.yaml b/k8s/crawlab-worker.yaml index 88409ebe..271edc45 100644 --- a/k8s/crawlab-worker.yaml +++ b/k8s/crawlab-worker.yaml @@ -14,7 +14,7 @@ spec: app: crawlab-worker spec: containers: - - image: tikazyq/crawlab:latest + - image: crawlabteam/crawlab:latest imagePullPolicy: Always name: crawlab env: