Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

merge from main repository #20

Merged
merged 105 commits into from
Dec 8, 2020
Merged

merge from main repository #20

merged 105 commits into from
Dec 8, 2020

Conversation

AlexAi27
Copy link
Owner

@AlexAi27 AlexAi27 commented Dec 8, 2020

No description provided.

DeveloperJim and others added 30 commits September 2, 2020 15:56
@DeveloperJim
Merge remote-tracking branch 'upstream/1.19.x'
64e1fcf
@DeveloperJim
fix: etcd registry, issue #570
22a1bbe
@DeveloperJim
fix: etcd registry issue fix, issue #570
e1a3112
@DeveloperJim
fix: mesosdriver, storage, usermanager support etcd registry, issue #570
2592da8
@DeveloperJim
Merge remote-tracking branch 'upstream/1.19.x' into go-micro
b1af917
@bryanhe-bupt
feature: bcs-gamedeployment-operator supports automatic canary step u…
dc05fef 
…pdating. issue #625
@bryanhe-bupt
Merge branch '1.19.x' of https://github.com/Tencent/bk-bcs into 1.19.x
685a08d
@DeveloperJim
Merge pull request #624 from Tencent/1.19.x
1e77a92 
1.19.x代码预发布
@bryanhe-bupt
feature: make automatic canary step updating compatible with old vers…
d17ae0d 
…ions. issue #625
@zmberg
fix: time.Ticker没有关闭，导致cpu使用率过高 #478
4ba4aba
@zmberg
fix: 删除bcs-check模块 #478
e9e1f13
@zmberg
fix: 删掉bcs-sd-prometheus目录 #478
20b7b6f
@DeveloperJim
Merge pull request #628 from zmberg/master
7f79265 
fix: time.Ticker没有关闭，导致cpu使用率过高 #478
@zmberg
fix: 删除ServiceMonitor时，没有删除对应的config文件 #630
8635528
@zmberg
fix: endpoints中nodeip字段错误 #633
a734f3e
@DeveloperJim
fix: mesosdriver, usermanager rule fix, issue #570
27dd6d2
@DeveloperJim
Merge pull request #631 from zmberg/master
a3e8ad4 
fix: 删除ServiceMonitor时，没有删除对应的config文件 #630
@DeveloperJim
Merge pull request #626 from bryanhe-bupt/1.19.x
b450dc0 
1.19.x
@DeveloperJim
Merge pull request #634 from DeveloperJim/go-micro
e75c9fc 
etcd服务发现特性合入
@abstractmj
fix: fix container-start.sh; fix that rsStartPort does not effects wh…
f667334 
…en isRsStartPortFixed is true; issue #583
@abstractmj
fix: fix metric problem; issue #621
00d4139
@DeveloperJim
Merge remote-tracking branch 'upstream/master'
36fd9d6
@DeveloperJim
fix: bcs-api compatible for bk iam v2 & v3, issue #567
50d401c
@DeveloperJim
fix: configuration for bkiam version, issue #567
5989222
@abstractmj
fix: split clb targets into mulitiple request; issue #638
668100f
@abstractmj
fix: fix some linter warning; issue #621
b7ba82d
@DeveloperJim
fix: gometalinter, issue #144
0425ce0
@DeveloperJim
fix: compilation err, issue #0
81f0858
@DeveloperJim
docs: 1.18.8 info update, issue #0
a43e9f8
@DeveloperJim
Merge pull request #637 from DeveloperJim/master
5740198 
bcs-api兼容bkiamv2与v3版本
DeveloperJim and others added 29 commits November 24, 2020 21:35
@DeveloperJim
Merge pull request #673 from DeveloperJim/master
ed6cbc9 
修复bcs-service-prometheus异常退出
@abstractmj
fix: close timer after return; issue #566
5f18c71
@DeveloperJim
Merge pull request #670 from abstractmj/fea-clb-controller-sts-mesos
9959e9e 
Feature clb controller sts mesos
@abstractmj
feature: add bcs webhook server design doc; issue #674
865ac59
@abstractmj
feature: modify webhook server doc; issue #674
ef84f83
@DeveloperJim
Merge pull request #668 from bryanhe-bupt/1.19.x_new
30bfe37 
feature: bcs-gamedeployment-operator support pod PreDeleteHook. issue…
@DeveloperJim
fix: bcs-container-executor ip panic, issue #675
7dadbf7
@DeveloperJim
fix: gomod mismatch, issue #0
e95ebb5
@DeveloperJim
Merge pull request #676 from DeveloperJim/master
6dab325 
Mesos IP问题修复
@abstractmj
feature: refactor bcs-webhook-server; issue #674
a758646
@abstractmj
fix: fix Makefile; issue #674
f42d089
@abstractmj
fix: register all plugins by import; issue #674
b2122cf
@abstractmj
fix: fix some bug for bcs-webhook-server; issue 674
d700cec
@bryanhe-bupt
feature: add bcs-hook-operator. issue #678
248ea77
@bryanhe-bupt
feature: refactor bcs-gamedeployment-operator，abstract hook-controlle…
f4a79f6 
…r as bcs-hook-operator. issue #679
@bryanhe-bupt
feature: bcs-gamestatefulset-operator support step by step auto-canar…
e2c3547 
…y and PreDeleteHook. issue #680
@bryanhe-bupt
feature: merge master into 1.19.x_new . issue #680
976f33e
@abstractmj
feature: add bcs-webhook-server docs; issue #674
e61007c
@bryanhe-bupt
fix: follow gometalinter. issue #144
78418a3
@abstractmj
fix: fix panic when annotation is empty, update docs; issue #674
01ff51f
@abstractmj
fix: fix log print; issue #674
0b3a2bd
@abstractmj
fix: fix log print problem; issue #674
c593968
@bryanhe-bupt
fix: fix a little mistake of go mod. issue #680
b2558d3
@AlexAi27
Merge pull request #18 from Tencent/master
eaddec0 
Merge from main repository
@DeveloperJim
Merge pull request #677 from abstractmj/fea-bcs-webhook-server-design
4bd1b1a 
Fea bcs webhook server design
@AlexAi27
fix: bcs-client access nil map; issue #682
6e1c530
@DeveloperJim
Merge pull request #681 from bryanhe-bupt/1.19.x_new
0319cc5 
GameStatefulSet & CanryUpdate
@DeveloperJim
Merge pull request #683 from AlexAi27/master
4c653b6 
修复bcs-client nil map问题
@DeveloperJim
chore: clean binary, issue #0
8944213
@AlexAi27 AlexAi27 merged commit 37e2ff9 into AlexAi27:dev_logbeat_container_with_multi_configs Dec 8, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@AlexAi27 @DeveloperJim @bryanhe-bupt @zmberg @abstractmj @wusendong