Commit Graph

1516 Commits

Author SHA1 Message Date
pfh
786a082fff Fix issue about label filter and I18n 2018-04-17 10:22:46 +08:00
pfh
e9052dd42a Merge remote-tracking branch 'upstream/master' into fixIssue 2018-04-17 10:19:16 +08:00
Steven Zou
ca8d3bdcc9
Merge pull request #4638 from vmware/use_redis_url_addr
Use redis URL address to replace host:port when connecting to redis server
2018-04-17 10:12:51 +08:00
pfh
bd28eb4541 Add Filter Label about imgs 2018-04-17 10:08:19 +08:00
Deng, Qian
9eec96afd6 Fix bug 4665 project admin can not change the role of some user 2018-04-16 18:57:26 +08:00
stonezdj
7e57c685ac Add project member search by name
Previous implementation contains the search user by name feature. This implementation can search user and user group by name.
2018-04-16 18:38:10 +08:00
Daniel Jiang
63ad0efd4f
Merge pull request #4637 from ywk253100/180412_bugfix
Bug fix
2018-04-13 19:39:50 +08:00
Yan
ab4018e967
Fix readonly error message and push existing image bug (#4654) 2018-04-13 19:22:28 +08:00
Steven Zou
adc2f8f124 Use redis URL address to replace host:port when connecting to redis server
replace tcp host:port with
'redis://arbitrary_usrname:password@ipaddress:port/database_index'

update prepare to generate config yaml file of job service based on harbor.cfg

update harbor.cfg default values
2018-04-13 19:19:56 +08:00
pengpengshui
4ab135a7ed
Merge pull request #4645 from pengpengshui/fixIssue
Fix issue about label filter #4636
2018-04-13 11:33:59 +08:00
Wenkai Yin 79628
ed0effb9c2 Bug fix
When deleting tags belonged to the same repository concurrently, the repository may be deleted by one API call and the other calls get 404. This commit logs a warning message and doesn't return 404.
2018-04-13 10:57:22 +08:00
pfh
9ebe8d64da Fix issue about label filter #4636 2018-04-13 09:49:17 +08:00
wangyan
04816222c0 Update ci test images to busybox 2018-04-12 18:21:20 -07:00
Steven Zou
b5b728bee3 Fix the vulnerability issues in the job service code
'Errors unhandled' in 'jobservice/job/impl/logger/job_logger.go'
'TLS InsecureSkipVerify set true' in 'jobservice/opm/hook_client.go'
2018-04-12 15:12:39 +08:00
stonezdj
de49165427 Refactor project member API
1) Remove the previous /api/projects/?:project_id/members/:userid
    2) Move the /api/projects/:project_id/projectmembers/?:pmid to
        /api/projects/:project_id/members/?:pmid
    3) Change the project member maintain ui to call new REST API
2018-04-11 17:49:33 +08:00
Daniel Jiang
1be9f9af20
Merge pull request #4627 from wy65701436/fix-readonly-issue
Log error when to write response body in readonly filter
2018-04-11 17:15:58 +08:00
pfh
8e4de81dfc Fix issue about links text and i18n 2018-04-11 14:50:55 +08:00
wangyan
d005ff941f log error when to write response body in readonly filter 2018-04-10 23:17:30 -07:00
Deng, Qian
4788a9fe3a Add deploy and add additional info on action bar 2018-04-10 20:50:51 +08:00
pengpengshui
0d576fb19b
Merge pull request #4610 from pengpengshui/fixIssue
Add bread crumb under project
2018-04-10 17:27:54 +08:00
pfh
5b6fe1fccc add bread crumb under project 2018-04-10 16:04:15 +08:00
Wenkai Yin
352c45b3ff Fix log API random failure on travis 2018-04-10 15:30:24 +08:00
pengpengshui
3cf075d9bb
Merge pull request #4602 from pengpengshui/labelCase
Label case
2018-04-09 18:07:36 +08:00
pfh
c80e33fd73 Midify label color panel about #4580 2018-04-09 15:54:30 +08:00
Steven Zou
2b799a576b
Merge pull request #4595 from vmware/enable_auth_checking
Apply auth checking to all the incoming requests
2018-04-09 12:50:34 +08:00
Steven Zou
85ae40f5ec Apply auth checking to all the incoming requests 2018-04-08 18:12:13 +08:00
pengpengshui
d94699dca3
Merge pull request #4585 from pengpengshui/fixIssue
Modify read only mode position, fix other issue
2018-04-08 17:46:06 +08:00
Steven Zou
529ad3e079
Merge pull request #4593 from vmware/add_more_log_2_js
Fix issue: failed to update the status of job if runtme error occurred
2018-04-08 14:03:34 +08:00
Daniel Jiang
9474a9773e
Merge pull request #4592 from reasonerjt/secret-in-header
Store secret in header instead of cookie
2018-04-08 13:32:10 +08:00
Steven Zou
233692c127 fix issue: job context may be nil pointer when trying to be closed in defer func 2018-04-08 13:03:23 +08:00
Deng, Qian
109c6a28fb Abstract repo click as a output event 2018-04-08 11:00:37 +08:00
Steven Zou
1cb40368f5 Fix issue: failed to update the status of job if runtme error occurred 2018-04-08 10:38:47 +08:00
Tan Jiang
ff06ec05c3 Store secret in header instead of cookie 2018-04-07 22:02:06 +08:00
Daniel Jiang
b5f52bc3fb
Merge pull request #4586 from reasonerjt/job-context-props
Read the system properties from scan job context
2018-04-07 10:23:30 +08:00
Daniel Jiang
b0860c9da0
Merge pull request #4584 from ywk253100/180404_dep
Update packages github.com/Sirupsen/logrus, github.com/gorilla/context and github.com/garyburd/redigo to new version
2018-04-05 12:25:22 +08:00
Tan Jiang
15580a5e8c Read the system properties from scan job context 2018-04-04 19:58:54 +08:00
pfh
9c5cc58f41 Modify read only mode position, fix other issue 2018-04-04 17:09:10 +08:00
stone
df63a73fd4
Merge pull request #4483 from stonezdj/api4assign_role_to_group4
Add REST API for assign role to group
2018-04-04 16:19:37 +08:00
stonezdj
9bcfaedc0e Add REST API for assign role to group 2018-04-04 13:39:42 +08:00
Qian Deng
1296a09034
Merge pull request #4577 from ninjadq/reduce_properties_in_hbr_repository
Reduce properties in hbr repository
2018-04-04 10:47:55 +08:00
Deng, Qian
0e3edeb0a8 Reduce properties in <hbr-repositry> 2018-04-03 19:55:31 +08:00
Deng, Qian
46ec21ae80 Fix bug vulnerability notification not showing 2018-04-03 18:00:09 +08:00
Steven Zou
44808650be Merge branch 'master' into job_service 2018-04-03 16:28:26 +08:00
Wenkai Yin
79f0ca96bc
Merge pull request #4572 from ywk253100/180402_job
Hide schedule job when listing replication jobs
2018-04-03 16:12:10 +08:00
Wenkai Yin
46ec8c70fa Update packages github.com/Sirupsen/logrus, github.com/gorilla/context and github.com/garyburd/redigo to new version 2018-04-03 11:48:06 +08:00
pengpengshui
73e32d1735
Merge pull request #4562 from pengpengshui/label
Modify label filter issue and add stick label to image case
2018-04-03 09:39:05 +08:00
Wenkai Yin
500651a5a1 Hide schedule job when listing replication jobs 2018-04-03 01:11:55 +08:00
Daniel Jiang
3af2b0caa5
Merge pull request #4568 from reasonerjt/scan-job-migrate
Scan job migrate
2018-04-02 21:40:30 +08:00
Tan Jiang
7aec4d9f21 Add UT and remove useless code. 2018-04-02 21:28:46 +08:00
Steven Zou
6c69a8cd05 Fix issue of stopping periodic job
improve op command by using cache
return 404 if no job found to stop
2018-04-02 18:08:03 +08:00
pfh
e5a757d78d Modify label filter issue and add stick label to image case 2018-04-02 14:45:52 +08:00
pengpengshui
6a1af52949
Merge pull request #4542 from pengpengshui/tagdetail
Add repo read only
2018-04-02 13:41:46 +08:00
Steven Zou
fee7f6ddef Merge branch 'job_service' into switch_job_service 2018-04-02 12:06:23 +08:00
Steven Zou
35fe857b07 Fix nil pointer issue in replication/target 2018-04-02 11:12:20 +08:00
Wenkai Yin
3436729d52
Merge pull request #4547 from ywk253100/180328_schedule_replication_job
Move schedule replication job to new jobservice
2018-03-30 21:03:45 +08:00
Steven Zou
0dd595ca63 Merge job_service into switch_job_service and fix conflicts 2018-03-30 19:30:56 +08:00
Steven Zou
ba91fc2861 Merge master into job_service and fix conflicts 2018-03-30 19:26:04 +08:00
Wenkai Yin
dd40f187ec Move schedule replication job to new jobservice 2018-03-30 17:44:05 +08:00
Steven Zou
250360307b Modify docker compose file template and make file to enable new job service
Fix typo in Makefile under photon

Fix version tag issue of redis container

Assign container name for redis container

Update docker compose template to enable network for redis

Remove exposed ports of redis from compose yaml tpl
2018-03-30 16:52:55 +08:00
Yan
892d9bf023
bypass docker client retry on push in readonly mode (#4524) 2018-03-29 23:49:00 -07:00
Daniel Jiang
07d7d467e7
Merge pull request #4539 from reasonerjt/trust-admiral-cert
Trust Root CA of VIC appliance when accessing Admiral
2018-03-30 13:30:15 +08:00
pfh
a43451c7ea Add repo read only and modify label issue 2018-03-30 11:38:45 +08:00
Steven Zou
013028ef4a Replace old job service package with V2 (rename packages) 2018-03-30 11:22:29 +08:00
Steven Zou
bfbb949034 Use the new job service(v2) to replace the old one 2018-03-29 23:30:03 +08:00
Steven Zou
d1899c840d Merge branch 'master' into job_service 2018-03-29 23:25:20 +08:00
Tan Jiang
5dd75bb0b0 Trust Root CA of VIC appliance when accessing Admiral 2018-03-29 19:53:41 +08:00
Steven Zou
9889d4badd Add UT cases for package pool 2018-03-29 19:50:44 +08:00
Deng, Qian
74cbfcb926 Add cardview for harbor 2018-03-29 19:37:23 +08:00
Deng, Qian
557c68a57c Abstract repo click as a output event 2018-03-29 19:37:23 +08:00
Steven Zou
e454456de2 Merge branch 'job_service' into add_ut_period 2018-03-28 19:54:03 +08:00
Qian Deng
6ca2f39186
Merge pull request #4491 from danielefranceschi/master
fix size suffix label for >1GB images
2018-03-28 18:44:43 +08:00
Steven Zou
d7aa1dacf0 Add UT cases for package period 2018-03-28 17:35:57 +08:00
Daniel Jiang
2c2cbd9c52
Merge pull request #4510 from reasonerjt/master
Add indexes to job tables and bump up schema version.
2018-03-28 16:58:16 +08:00
Steven Zou
75f4f7e0a4
Merge pull request #4513 from vmware/steven_job_service
Add UT cases for package opm (update travis yaml to start redis conta…
2018-03-28 16:30:03 +08:00
Tan Jiang
b6df6cf169 Add indexes to job tables and bump up schema version. 2018-03-28 16:15:54 +08:00
Wenkai Yin
22e06c46e3
Merge pull request #4512 from ywk253100/180328_replication_hook
Handle replication job status hook
2018-03-28 16:10:51 +08:00
Steven Zou
33c3603af2 Add waiting time before triggering http request 2018-03-28 15:57:59 +08:00
Steven Zou
d3909bb633 Add UT cases for package opm (update travis yaml to start redis container)
Fix data race issue in opm package
2018-03-28 15:28:34 +08:00
Wenkai Yin
55035ada2d
Merge pull request #4490 from ywk253100/180326_label
Delete the mapping relationship between resources and labels when the label is deleted
2018-03-28 14:38:01 +08:00
Steven Zou
d183226570
Merge pull request #4507 from vmware/steven_job_service
Fix the issue of causing config test failed
2018-03-28 14:16:09 +08:00
Qian Deng
a12c213cd1
Merge pull request #4494 from pengpengshui/tagdetail
Modify tag detail page and fix label bugs
2018-03-28 14:10:01 +08:00
Steven Zou
ee2da73c71 Refactor the job stats manager (remove useless object references) 2018-03-28 12:51:55 +08:00
Steven Zou
3ce31586df Fix the issue of causing config test failed 2018-03-28 12:40:36 +08:00
Steven Zou
b943bed6e6 Refactor redis pool and job stats manager for clarifying functions
also add UT cases for logger and part of opm package

Fix config test case issue
2018-03-28 12:11:45 +08:00
Daniel Jiang
0918a0ac7e
Merge pull request #4504 from reasonerjt/scan-job-migrate
Integrate with status hook of jobservice
2018-03-28 09:50:49 +08:00
Tan Jiang
0abf53c112 fix golint 2018-03-27 21:30:37 +08:00
Tan Jiang
be97a91650 Integrate with jobservice webhook 2018-03-27 21:27:52 +08:00
wangyan
01487b8221 Add readonly into systeminfo 2018-03-27 04:29:20 -07:00
Steven Zou
02b73b50f2 Merge branch 'job_service' of https://github.com/vmware/harbor into job_service 2018-03-27 18:19:30 +08:00
Steven Zou
660d2610ba Add UT cases for api,core and config package
do changes to enable interfaces
2018-03-27 18:17:46 +08:00
pfh
22fa1ba189 Add control about label for admiral and standalone 2018-03-27 14:31:18 +08:00
pfh
42fa690f90 Modify tag detail page and fix label bugs 2018-03-27 10:12:37 +08:00
Tan Jiang
c859616e25 fix golint and go vet issue 2018-03-26 22:10:01 +08:00
Daniele Franceschi
71eeebec6f
fix rendering suffix for >1GB images 2018-03-26 14:48:13 +02:00
Tan Jiang
582deea9e7 resolve conflict 2018-03-26 18:11:39 +08:00
Tan Jiang
41ce0891ab Trigger scan job from UI. 2018-03-26 18:07:21 +08:00
Wenkai Yin
38568a1d2c
Merge pull request #4485 from ywk253100/180326_period_job
Create a job to call UI's replication API to do the period replication job
2018-03-26 17:31:10 +08:00
Steven Zou
e966698939 Extarct out redis pool initialization code to bootstrap 2018-03-26 16:38:53 +08:00
Tan Jiang
745b21abbc Merge remote-tracking branch 'upstream/master' into scan-job-migrate 2018-03-26 15:39:42 +08:00
Steven Zou
7663592551 Merge branch 'job_service' of https://github.com/vmware/harbor into job_service 2018-03-26 15:30:36 +08:00
Steven Zou
5e2543833b Replace log in commmon package to logger in logger package for loose couple 2018-03-26 15:30:16 +08:00
stone
203b1b52bb
Merge pull request #4415 from stonezdj/user_group_and_project_member
Add DAO for user group and project member
2018-03-26 15:21:20 +08:00
stonezdj
49d960b060 Add DAO for project member and user group 2018-03-26 14:38:32 +08:00
yixingj
cb64ad96ff Make endpoint configurable
Move all the endpoint to harbor.cfg
2018-03-26 10:50:18 +08:00
Tan Jiang
381ecc3521 Merge with master 2018-03-26 10:37:17 +08:00
Wenkai Yin
dd156ca243 Handle replication job status hook 2018-03-24 21:18:58 +08:00
Wenkai Yin
1fea594c3d Trigger replication job from UI with new jobservice 2018-03-24 18:10:50 +08:00
Steven Zou
ba85378ac3 Merge branch 'job_service' of https://github.com/vmware/harbor into job_service 2018-03-24 16:45:46 +08:00
Steven Zou
4cc9e0bf47 Close the open IO stream used by the job logger after job eixting 2018-03-24 16:45:26 +08:00
Wenkai Yin
85f357ec6b Delete the mapping relationship between resources and labels when the label is deleted 2018-03-24 02:22:51 +08:00
Wenkai Yin
e63d5a1c06 Create a job to call UI's replication API to do the period replication job 2018-03-23 23:53:15 +08:00
Wenkai Yin
837f46872a
Merge pull request #4463 from ywk253100/180313_replication_job
Migrate replication job to the new jobservice
2018-03-23 19:04:12 +08:00
Wenkai Yin
ed08a42e4b Migrate replication job to the new jobservice 2018-03-23 18:36:37 +08:00
Yan
cbcca015b0
add read only mode to stop docker push (#4433) 2018-03-23 03:16:08 -07:00
Steven Zou
75e29782f6 Implement job context for harbor jobs
initialize DAO
get configurations from admin server
2018-03-23 17:26:41 +08:00
Steven Zou
e160804be2 Fix nil job returned bug 2018-03-23 13:50:23 +08:00
pfh
71124d08dd Add label module 2018-03-23 09:58:06 +08:00
Steven Zou
49bb9bfceb Add logger sweeper to periodically clear outdated log files created by the jobs 2018-03-22 23:44:08 +08:00
Daniel Jiang
b4a4eb11c6
Merge pull request #4459 from ywk253100/180321_package_upgrade
Upgrade packages used by Harbor
2018-03-22 19:03:10 +08:00
Steven Zou
579b70c5e4 Inject logger into the execution context of running job for logging
define logger interface
implement a logger base on common log package
add getting log API
inject logger to the job execution context
2018-03-22 18:29:39 +08:00
Steven Zou
b001180d26 Merge branch 'job_service' of https://github.com/vmware/harbor into job_service 2018-03-22 13:43:12 +08:00
Steven Zou
e5f8beb35f Support status hook mechanism to report job status changes
refactor scheduler to extarct separate sub/pub system
fix bug in getJob
return all the stats data of running pools in the health check API
2018-03-22 13:41:00 +08:00
Wenkai Yin
c6e65d2ded Fuzzy matching repository name in GET repositories API 2018-03-22 13:38:26 +08:00
Wenkai Yin
0b7d4af4c1 Upgrade packages used by Harbor 2018-03-22 13:10:49 +08:00
Tan Jiang
b8ec419c8e Add missed package to fix compilation issue 2018-03-21 16:59:32 +08:00
Tan Jiang
483496ed93 remove swp file 2018-03-21 16:32:21 +08:00
Tan Jiang
613464bc16 Migrate scan job to job service V1 phase1 2018-03-21 16:25:32 +08:00
Tan Jiang
6303785b1b Merge branch 'job_service' of https://github.com/vmware/harbor into scan-job-migrate 2018-03-21 13:06:40 +08:00
Yan
5edbd00318
Revise harbor build version (#4445) 2018-03-21 13:03:49 +08:00
Wenkai Yin
838b439560 Implement filter repository and tags by label API 2018-03-21 10:51:06 +08:00
Wenkai Yin
a7a72f78bd Return role and repository count info in GET project API 2018-03-20 19:09:06 +08:00
Steven Zou
ac544b3ead Support job related operational actions
support stop job
support cancel running generic job
support retry failed job
support checkin details progress of job
2018-03-20 18:03:04 +08:00
Tan Jiang
00825d3ca4 Merge branch 'job_service' of https://github.com/vmware/harbor into scan-job-migrate 2018-03-20 17:37:27 +08:00
Steven Zou
fbc24d85db Support job operation actions like stop/cancel 2018-03-16 19:38:51 +08:00
Tan Jiang
b1d1e039dc Merge branch 'job_service' of https://github.com/vmware/harbor into scan-job-migrate 2018-03-16 15:30:53 +08:00
Daniel Jiang
cbedf099b5
Merge pull request #4342 from yixingjia/apimonitor
Add monitor API for Harbor components
2018-03-16 14:56:58 +08:00
Steven Zou
2f97970484 Support update job status for both generic and periodic job
refactor scheduler
refactor period.enqueuer
add stats manager component
2018-03-15 20:23:42 +08:00
Steven Zou
be75145858 Implement API service of getting job stats 2018-03-15 14:33:57 +08:00
Steven Zou
ea912729ec fix golint issues in code 2018-03-15 12:31:54 +08:00
Steven Zou
4b4e0ddfff Refactor job programming model
refine job context
remove setXXX injection methods in job.Interface
use parameters of Run to pass context and parameters
2018-03-15 12:26:01 +08:00
yixingj
4255ed167a Add monitor API for Harbor components.
1>AdminServer.
2>UI.
2018-03-15 10:39:55 +08:00
Steven Zou
28d02931d2 Support saving job stats to the baclend for the redis workerpool 2018-03-15 09:56:07 +08:00
stonezdj
44fc373c6d Add LDAP Group Search Configure Param 2018-03-15 06:16:47 +08:00
Steven Zou
b61dc39278 Refactor the job execution context interface 2018-03-14 19:17:38 +08:00
Steven Zou
5f5fb5b6ec Refine the context related things
change job context to interface
move job conetxt to the env package
move the concrete job implementation to separate folder
2018-03-14 18:24:53 +08:00
Steven Zou
414c36205c Support API service of checking stats of the worker pool 2018-03-14 16:59:00 +08:00
Steven Zou
6b46844565 Add sweeper to clear the outdated data before the workerpool is starting 2018-03-14 15:52:00 +08:00
Daniel Jiang
0efd8e3c54
Merge pull request #4396 from ywk253100/180309_label_resource
Implement adding/removing labels to/from repositories and images API
2018-03-14 14:15:31 +08:00
Wenkai Yin
bcf81224ad Update according to the comments 2018-03-14 13:42:19 +08:00
Steven Zou
7b8971e930 Implement periodically enqueue job feature
add scheduler based on redis
add job wrapper for redis driver
other necessary modules
2018-03-13 23:58:07 +08:00