diff --git a/.github/workflows/dockerpush.yml b/.github/workflows/dockerpush.yml index cda73dfe..94215c33 100644 --- a/.github/workflows/dockerpush.yml +++ b/.github/workflows/dockerpush.yml @@ -2,11 +2,11 @@ name: Docker Image CI on: push: - branches: [ master, release, develop ] + branches: [ develop ] pull_request: branches: [ master ] release: - types: [created] + types: [ published ] env: IMAGE_NAME: crawlabteam/crawlab diff --git a/backend/go.mod b/backend/go.mod index f71b00db..cfa6ddd2 100644 --- a/backend/go.mod +++ b/backend/go.mod @@ -2,4 +2,4 @@ module crawlab go 1.16 -require github.com/crawlab-team/crawlab-core v0.6.0-beta.20220221.1800 +require github.com/crawlab-team/crawlab-core v0.6.0-beta.20220420.1200 diff --git a/backend/go.sum b/backend/go.sum index b434d31d..2f382f79 100644 --- a/backend/go.sum +++ b/backend/go.sum @@ -122,11 +122,11 @@ github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfc github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/crawlab-team/crawlab-core v0.0.1/go.mod h1:6dJHMvrmIJbfYHhYNeGZkGOLEBvur+yGiFzLCRXx92k= -github.com/crawlab-team/crawlab-core v0.6.0-beta.20220221.1800 h1:YPhY7kSj8PB1+lNUkV2uFHt2kKmfNdx+m+SKGA3b+y8= -github.com/crawlab-team/crawlab-core v0.6.0-beta.20220221.1800/go.mod h1:mkhhinUpJKGgjmctvcnmTPl9sAGMdCYznoeFtR6QnN8= +github.com/crawlab-team/crawlab-core v0.6.0-beta.20220420.1200 h1:ngwvPofCVO7dhvpnAInjdJnwPX0iOTc7GmGJnqXD2Wc= +github.com/crawlab-team/crawlab-core v0.6.0-beta.20220420.1200/go.mod h1:KqfjSkEclVY39nC58bsq3MLcuXbDnsPp/ClcBDkqOF0= github.com/crawlab-team/crawlab-db v0.0.2/go.mod h1:o7o4rbcyAWlFGHg9VS7V7tM/GqRq+N2mnAXO71cZA78= -github.com/crawlab-team/crawlab-db v0.1.3 h1:RqLoXGZEMUH1B8SQB5OcNmJeyY2xILvwyhv4X9faWl4= -github.com/crawlab-team/crawlab-db v0.1.3/go.mod h1:kPkGZ1P802XdbFFb8byMpZfNG2lWTNoWNRy4beS0/QY= +github.com/crawlab-team/crawlab-db v0.6.0-beta.20220417.1300 h1:2EymVIiOspX28qNC1Qon3W1fzXKQ8hi6ho3QtXB4w6k= +github.com/crawlab-team/crawlab-db v0.6.0-beta.20220417.1300/go.mod h1:gfeF0nAnFuup6iYvgHkY0in/HpO/+JktXqVNMdhoxhU= github.com/crawlab-team/crawlab-fs v0.0.0/go.mod h1:k2VXprQspLAmbgO5sSpqMjg/xP4iKDkW4RyTWY8eTZM= github.com/crawlab-team/crawlab-fs v0.6.0-beta.20211101.1940 h1:KFZ39oe/QyhhRhXYZSmzDZl3L/JUEPkiiaf4+/iuboY= github.com/crawlab-team/crawlab-fs v0.6.0-beta.20211101.1940/go.mod h1:dA1G6xeiClbTMkjRuoagGrcKfQ97jJZRAhZUSwrKdoI= diff --git a/frontend/package.json b/frontend/package.json index c3aff0e8..99e856c2 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -23,7 +23,7 @@ "@fortawesome/vue-fontawesome": "^3.0.0-5", "atom-material-icons": "^3.0.0", "codemirror": "^5.59.1", - "crawlab-ui": "^0.6.0-beta.20220221.1800", + "crawlab-ui": "^0.6.0-beta.20220419", "echarts": "^5.1.2", "element-plus": "^1.3.0-beta.10", "vue": "^3.2", diff --git a/frontend/yarn.lock b/frontend/yarn.lock index e8ad70b7..ce812860 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -977,6 +977,11 @@ resolved "https://registry.npmmirror.com/@element-plus/icons/-/icons-0.0.11.tgz#9b187c002774548b911850d17fa5fc2f9a515f57" integrity sha512-iKQXSxXu131Ai+I9Ymtcof9WId7kaXvB1+WRfAfpQCW7UiAMYgdNDqb/u0hgTo2Yq3MwC4MWJnNuTBEpG8r7+A== +"@fortawesome/fontawesome-common-types@6.1.1", "@fortawesome/fontawesome-common-types@^6.1.0": + version "6.1.1" + resolved "https://registry.npmmirror.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.1.1.tgz#7dc996042d21fc1ae850e3173b5c67b0549f9105" + integrity sha512-wVn5WJPirFTnzN6tR95abCx+ocH+3IFLXAgyavnf9hUmN0CfWoDjPT/BAWsUVwSlYYVBeCLJxaqi7ZGe4uSjBA== + "@fortawesome/fontawesome-common-types@^0.3.0": version "0.3.0" resolved "https://registry.npmmirror.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.3.0.tgz#949995a05c0d8801be7e0a594f775f1dbaa0d893" @@ -989,6 +994,13 @@ dependencies: "@fortawesome/fontawesome-common-types" "^0.3.0" +"@fortawesome/fontawesome-svg-core@^6.1.0": + version "6.1.1" + resolved "https://registry.npmmirror.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.1.1.tgz#3424ec6182515951816be9b11665d67efdce5b5f" + integrity sha512-NCg0w2YIp81f4V6cMGD9iomfsIj7GWrqmsa0ZsPh59G7PKiGN1KymZNxmF00ssuAlo/VZmpK6xazsGOwzKYUMg== + dependencies: + "@fortawesome/fontawesome-common-types" "6.1.1" + "@fortawesome/free-brands-svg-icons@^6.0.0": version "6.0.0" resolved "https://registry.npmmirror.com/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-6.0.0.tgz#c69830ec2fad38c95945867f4e6927bf33cce6f8" @@ -996,6 +1008,13 @@ dependencies: "@fortawesome/fontawesome-common-types" "^0.3.0" +"@fortawesome/free-brands-svg-icons@^6.1.0": + version "6.1.1" + resolved "https://registry.npmmirror.com/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-6.1.1.tgz#3580961d4f42bd51dc171842402f23a18a5480b1" + integrity sha512-mFbI/czjBZ+paUtw5NPr2IXjun5KAC8eFqh1hnxowjA4mMZxWz4GCIksq6j9ZSa6Uxj9JhjjDVEd77p2LN2Blg== + dependencies: + "@fortawesome/fontawesome-common-types" "6.1.1" + "@fortawesome/free-regular-svg-icons@^6.0.0": version "6.0.0" resolved "https://registry.npmmirror.com/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-6.0.0.tgz#f3cb91dac643472fe8138024b93fbfbdf05675cc" @@ -1003,6 +1022,13 @@ dependencies: "@fortawesome/fontawesome-common-types" "^0.3.0" +"@fortawesome/free-regular-svg-icons@^6.1.0": + version "6.1.1" + resolved "https://registry.npmmirror.com/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-6.1.1.tgz#3f2f58262a839edf0643cbacee7a8a8230061c98" + integrity sha512-xXiW7hcpgwmWtndKPOzG+43fPH7ZjxOaoeyooptSztGmJxCAflHZxXNK0GcT0uEsR4jTGQAfGklDZE5NHoBhKg== + dependencies: + "@fortawesome/fontawesome-common-types" "6.1.1" + "@fortawesome/free-solid-svg-icons@^6.0.0": version "6.0.0" resolved "https://registry.npmmirror.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.0.0.tgz#bed4a501b631c6cfa35c09830f7cb63ffca1589d" @@ -1010,6 +1036,13 @@ dependencies: "@fortawesome/fontawesome-common-types" "^0.3.0" +"@fortawesome/free-solid-svg-icons@^6.1.0": + version "6.1.1" + resolved "https://registry.npmmirror.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.1.1.tgz#3369e673f8fe8be2fba30b1ec274d47490a830a6" + integrity sha512-0/5exxavOhI/D4Ovm2r3vxNojGZioPwmFrKg0ZUH69Q68uFhFPs6+dhAToh6VEQBntxPRYPuT5Cg1tpNa9JUPg== + dependencies: + "@fortawesome/fontawesome-common-types" "6.1.1" + "@fortawesome/vue-fontawesome@^3.0.0-5": version "3.0.0-5" resolved "https://registry.npmmirror.com/@fortawesome/vue-fontawesome/-/vue-fontawesome-3.0.0-5.tgz#6251e6917198362fa56510eb256cfb6aa6d30a32" @@ -3439,16 +3472,17 @@ cosmiconfig@^5.0.0: js-yaml "^3.13.1" parse-json "^4.0.0" -crawlab-ui@^0.6.0-beta.20220221.1800: - version "0.6.0-beta.20220221.1800" - resolved "https://registry.npmmirror.com/crawlab-ui/-/crawlab-ui-0.6.0-beta.20220221.1800.tgz#59e88809e3596cfc5ca2d1545f6bd8f541202ed5" - integrity sha512-WNv0qDSyeTvaxrr9hd35bwJ3sCmOyRLVnSWbNIWoSVb9l+J9NQxeBtAuNWeaHPsxFd1x8w0eNpHB2IPhTZy3VQ== +crawlab-ui@^0.6.0-beta.20220419: + version "0.6.0-beta.20220419" + resolved "https://registry.npmmirror.com/crawlab-ui/-/crawlab-ui-0.6.0-beta.20220419.tgz#74978a9629ed406b7476edee3ffedade901fa02f" + integrity sha512-impV4hRb7hChmJ+U2Qh/9CGgua+h3pMpFA7W3xcftGoJxDDRoVKJqPrTzaf7z9FCSZO+y7nYS6fa3rF/8ZU4eA== dependencies: "@element-plus/icons" "^0.0.11" - "@fortawesome/fontawesome-svg-core" "^1.3.0" - "@fortawesome/free-brands-svg-icons" "^6.0.0" - "@fortawesome/free-regular-svg-icons" "^6.0.0" - "@fortawesome/free-solid-svg-icons" "^6.0.0" + "@fortawesome/fontawesome-common-types" "^6.1.0" + "@fortawesome/fontawesome-svg-core" "^6.1.0" + "@fortawesome/free-brands-svg-icons" "^6.1.0" + "@fortawesome/free-regular-svg-icons" "^6.1.0" + "@fortawesome/free-solid-svg-icons" "^6.1.0" "@fortawesome/vue-fontawesome" "^3.0.0-5" "@popperjs/core" "^2.6.0" "@types/codemirror" "^0.0.103" @@ -3467,7 +3501,7 @@ crawlab-ui@^0.6.0-beta.20220221.1800: cron-parser "^3.5.0" cronstrue "^1.114.0" dayjs "^1.10.5" - echarts "^5.1.2" + echarts "^5.3.2" element-plus "^1.3.0-beta.10" font-awesome "^4.7.0" getos "^3.2.1" @@ -4095,6 +4129,14 @@ echarts@^5.1.2: tslib "2.3.0" zrender "5.3.0" +echarts@^5.3.2: + version "5.3.2" + resolved "https://registry.npmmirror.com/echarts/-/echarts-5.3.2.tgz#0a7b3be8c48a48b2e7cb1b82121df0c208d42d2c" + integrity sha512-LWCt7ohOKdJqyiBJ0OGBmE9szLdfA9sGcsMEi+GGoc6+Xo75C+BkcT/6NNGRHAWtnQl2fNow05AQjznpap28TQ== + dependencies: + tslib "2.3.0" + zrender "5.3.1" + ee-first@1.1.1: version "1.1.1" resolved "https://registry.npmmirror.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" @@ -6456,9 +6498,9 @@ minimatch@~3.0.2: brace-expansion "^1.1.7" minimist@>=1.2.3, minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.5: - version "1.2.5" - resolved "https://registry.npmmirror.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" - integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== + version "1.2.6" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44" + integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q== minipass-collect@^1.0.2: version "1.0.2" @@ -10104,3 +10146,10 @@ zrender@5.3.0: integrity sha512-Ln2QB5uqI1ftNYMtCRxd+XDq6MOttLgam2tmhKAVA+j0ko47UT+VNlDvKTkqe4K2sJhBvB0EhYNLebqlCTjatQ== dependencies: tslib "2.3.0" + +zrender@5.3.1: + version "5.3.1" + resolved "https://registry.npmmirror.com/zrender/-/zrender-5.3.1.tgz#fa8e63ac7e719cfd563831fe8c42a9756c5af384" + integrity sha512-7olqIjy0gWfznKr6vgfnGBk7y4UtdMvdwFmK92vVQsQeDPyzkHW1OlrLEKg6GHz1W5ePf0FeN1q2vkl/HFqhXw== + dependencies: + tslib "2.3.0" 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..271edc45 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: @@ -15,11 +14,11 @@ spec: app: crawlab-worker spec: containers: - - image: tikazyq/crawlab:latest + - image: crawlabteam/crawlab:latest 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"