Commit Graph

4411 Commits

Author SHA1 Message Date
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
Daniel Jiang
199ebdb751
Merge pull request #4544 from reasonerjt/cfg-upgrade-fix
Configuration migrator should support python3
2018-03-30 17:13:41 +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
Tan Jiang
b1923bf219 Refine the python file to make it run on python3 2018-03-30 14:41:12 +08:00
Daniel Jiang
24dfad4afe Return zero when input version is same as target (#4535) 2018-03-29 23:17:07 -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
Tan Jiang
2debdb7229 Return zero when input version is same as target 2018-03-30 11:34:51 +08:00
Steven Zou
4e3a0b599f Merge branch 'job_service' into switch_job_service 2018-03-30 11:23:47 +08:00
Steven Zou
d5a696d821 Merge branch 'master' into job_service 2018-03-30 11:23:20 +08:00
Steven Zou
013028ef4a Replace old job service package with V2 (rename packages) 2018-03-30 11:22:29 +08:00
Steven Zou
afd3ffd63c
Merge pull request #4472 from yixingjia/redisserver
Add Redis docker file
2018-03-30 11:21:23 +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
Steven Zou
0e7822278e
Merge pull request #4536 from vmware/add_ut_for_pool
Add UT cases for package pool
2018-03-29 23:16:21 +08:00
Qian Deng
c33ed6f957
Merge pull request #4487 from ninjadq/add_grid_view
Add grid view
2018-03-29 20:13:04 +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
Jesse Hu
debcf7858a
Merge pull request #4521 from vmware/clair-http-proxy
Add http_proxy configuration for Clair service
2018-03-29 14:04:34 +08:00
Jesse Hu
7c866511f0
Merge pull request #4519 from lucaim/master
Adding LDAP authentication to helm chart
2018-03-29 11:53:15 +08:00
Steven Zou
ebf860367a
Merge pull request #4520 from vmware/add_ut_period
Add UT cases for package period
2018-03-29 10:45:49 +08:00
Steven Zou
e454456de2 Merge branch 'job_service' into add_ut_period 2018-03-28 19:54:03 +08:00
Jesse Hu
87c622141b Add http_proxy configuration for Clair service
Clair needs Internet access to download vulnerabilities data.

Fix issue https://github.com/vmware/harbor/issues/4272
2018-03-28 18:49:40 +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
sigsbee
9baee6b88c
Add LDAP case and add delay to project config to avoid case fail (#4486)
* Add LDAP case and add delay to project config to avoid case fail
2018-03-28 16:45:49 +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
73f0a9db13 Merge branch 'steven_job_service' of https://github.com/vmware/harbor into steven_job_service 2018-03-28 15:29:07 +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
Steven Zou
3dc8610bb7 Add UT cases for package opm (update travis yaml to start redis container) 2018-03-28 14:54:41 +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
Jesse Hu
95791a9fa8 Update Harbor helm chart README.md [Skip CI] (#4479)
* Update Harbor helm chart README.md

* More update in harbor chart README.md

* require 'Helm CLI 2.8.0+'
2018-03-28 14:24:34 +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
Daniel Jiang
5c1314d286
Merge pull request #4503 from wy65701436/add-readonly-sysinfo
Add readonly into systeminfo
2018-03-28 13:00:32 +08:00
Wenkai Yin
d28bad4806
Merge pull request #4506 from ywk253100/180327_replication_job
Trigger replication job from UI with new jobservice
2018-03-28 12:57:04 +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
0562f9fa35 Fix conflicts 2018-03-28 12:13:16 +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
Steven Zou
4541d4b53f Merge branch 'job_service' of https://github.com/vmware/harbor into job_service 2018-03-28 11:26:36 +08:00
Steven Zou
76785c3cb1 Refactor redis pool and job stats manager for clarifying functions
also add UT cases for logger and part of opm package
2018-03-28 11:24:59 +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