Skip to content

Commit f70677e

Browse files
alexzyWualexzyWu
authored
Merge pull request #53 from alexzyWu/dev-0.3.0-cc
feat(cc): Update cc module
2 parents 85499cc + 5686777 commit f70677e

File tree

154 files changed

+14701
-2429
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

154 files changed

+14701
-2429
lines changed

‎cc/Makefile‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎cc/build/mlss-apigateway/Dockerfile‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#FROM dev.sf.dockerhub.stgwebank/webank/mlss-go-cc:golang-1.12
2-
FROM uat.sf.dockerhub.stgwebank/webank/mlss-di:ubuntu-latest
2+
#FROM uat.sf.dockerhub.stgwebank/webank/mlss-di:ubuntu-latest
3+
#FROM ubuntu:latest
4+
FROM golang-dlv:latest
35

46
COPY mlss-apigateway /apigateway/
57
WORKDIR /apigateway

‎cc/build/mlss-controlcenter/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#FROM dev.sf.dockerhub.stgwebank/webank/mlss-go-cc:golang-1.12
2-
FROM uat.sf.dockerhub.stgwebank/webank/mlss-di:ubuntu-latest
3-
2+
#FROM uat.sf.dockerhub.stgwebank/webank/mlss-di:ubuntu-latest
3+
FROM golang-dlv:latest
44
COPY mlss-controlcenter-go /cc/
55
WORKDIR /cc
66

‎cc/config/application.yml‎

Lines changed: 144 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,144 @@
1+
spring:
2+
profile: dev
3+
platformNS: mlss-dev
4+
datasource:
5+
driverClassName: com.mysql.jdbc.Driver
6+
# url: jdbc:mysql://127.0.0.1:3306/mlss_gzpc_bdap_dev_01?useUnicode=true&characterEncoding=utf-8
7+
url: jdbc:mysql://localhost:3306/mlss_local_db?useUnicode=true&characterEncoding=utf-8
8+
# url: jdbc:mysql://127.0.0.1:3306/mlss_local_db?useUnicode=true&characterEncoding=utf-8
9+
# username: root
10+
# password: 123456
11+
username: mlss_gzpc_bdap_dev
12+
# password: password
13+
password: password
14+
# ip: localhost
15+
# port: 3306
16+
# db: mlss_local_db
17+
ip: 127.0.0.1
18+
port: 3306
19+
db: mlss_gzpc_bdap_dev_01
20+
tokenDB:
21+
username: hdfs_gz_bdap
22+
password: password
23+
ip: 127.0.0.1
24+
port: 3306
25+
db: hdfs_gz_bdap_test_01
26+
server:
27+
port: 7777
28+
servlet:
29+
context-path: /cc
30+
session:
31+
timeout: 86400
32+
error:
33+
whitelabel:
34+
enabled: false
35+
36+
logging:
37+
level:
38+
root: INFO
39+
cn.webank.bdp.controlcenter.dao: DEBUG
40+
path: /var/log/controlcenter
41+
42+
core:
43+
interceptor:
44+
configs:
45+
- name: IpInterceptor
46+
add:
47+
- "/v1/auth/access/namespaces/**/notebooks/**"
48+
exclude:
49+
# - "/v1/**"
50+
- name: UserInterceptor
51+
add:
52+
- "/v1/**"
53+
exclude:
54+
- "/v1/login"
55+
- "/v1/logout"
56+
- "/v1/alerts"
57+
- "/v1/alerts/training"
58+
- "/v1/auth/access/namespaces/**/notebooks/**"
59+
- name: AuthInterceptor
60+
add:
61+
- "/v1/**"
62+
exclude:
63+
- "/v1/login"
64+
- "/v1/logout"
65+
- "/v1/alerts"
66+
- "/v1/alerts/training"
67+
- "/v1/auth/access/namespaces/**/notebooks/**"
68+
maxTokenSize: 10000
69+
maxTokenExpireHour: 24
70+
defaultTimestampTimeout: 2592000
71+
um:
72+
host: 127.0.0.1
73+
port: 8088
74+
appId: "0015395862955265"
75+
appToken: MLSS-DI
76+
appPem: "-----BEGIN PRIVATE KEY-----
77+
MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDAn+BWO+9o5DEH
78+
4yUrGGJgnIjlLDDLXuxjnq/vrl/+i/02b9usgWZQ6yLRVHao2FX7MfuFob90Xb8k
79+
5WB2pE3uEMBt3e4kq8WwO3CRJT0e+lkZvb0ygeUCSQQISJPiRMco0e8S2WWBVVUo
80+
6IwOLt5MvRw5H1VL7qrOaqjuKaK5FH35qm/dJsjNwnG8Xmi8zb8b0Mz57y49OXv7
81+
8fKXlc7pTBVpnspBWdPZzQcu1NRn76PjyR6cF9ZmLtQSHe0uz2tMqF7ps6Q0f/Ik
82+
jSYVhI6SWsRRAg3gmShvkLcwy6Ovt1zlQecESD+Uk1+YTmPW+2nQm3k0OX6P6oQV
83+
XJ6j2GgvAgMBAAECggEBALxJSuNgMLRKIfdAvCs06azgNhw1pviUL+Ns0TMrMyBB
84+
PGFC0+r6jcXZIi6WLmr7FIi3IdJM+jVIEbiCElnGX3qumzqJrefglBug7naifO1T
85+
71ZvFopRWEZ0kuF5+Dw72KV5GAVHxaW3gMe9EHIotBk03Wqkyx6vC/07Wyd6QVpB
86+
EGdfuNjLtDwT0KiBSXQ4e6cDjAI5KXfMDSD2x0J2EHqEy07nNCztckW7aJkPz4i/
87+
1AqPnnpUW2ovSUKVEOkbSmTZiS8ONow2XfvTrIioBj4Rnk136gRUsJ5NuiVqRh5L
88+
pNaARMhuv+cwu9oU78niOs7B7F92uAKYA1NjVyDxgKECgYEA40xpKPIrV4zjpfop
89+
3flghOu6i1F+YmEtCka2zH0h7KetkJGy3wh6y300g2oOsbPRAn5gW3A+3rzR+mKu
90+
h+mU3iw2Ug2jw0BslvMUMSzWQ/IZyb7Yn9F9+nueAHrZWCr5zJNzuXZrwqItbHqi
91+
NgidaLigi9LKoB/kCNKGnWlcnp8CgYEA2PKauQ8dEfoiLkaC6FL9dltD1kHbkmDm
92+
YHLFUPYmZNdua+R2q5ccZLR5KMcJxdBa9CvzCNEtuUJGLqICuKBUPqo6/6JEfHWh
93+
6Vxor84yIl40kKzveaeshnHRmXdN8xKR/BijsoI0zXRR4nbqloTfiLdpzhjMRiMz
94+
05t1+GNDHHECgYBgURHCuxPorpgMzjwNhs4CpU1QGgFfOOR4FU0CzAejG86tkz/j
95+
yNkX/39QLJH7dUIdN2YneSH7CrJD0qs4hp+BoeSG0qbRZyxcrragu+ozspSA6/Ep
96+
kAE9MkLa2zPca6GcseL49RhmyohLDpBMK0xggtPtTC52uezMXEGU1H/d6wKBgEhM
97+
6dV8vPJtyxBi/WORrNjR55SzFAr/cid4eFvX/Mmkpi8cz5O144eIQcyeMJqVKoqv
98+
TuqEU9mmxZ7q7T88Z3cO4mSpXmugBFqyKk1UyY58mMYSbCi+AZg4vGKJyReV+8Lp
99+
Lzzhedlyx4tSmDGbjKeSgJdn2kQRnUcLS1CBPC9xAoGAf8Qya9WsB5a0GkhYrAFU
100+
FoYyNfHWpXt8Hh1uja/X284vnVs+szQ1eB4CecsjLssmoPBAbidh0QHAHX36KehQ
101+
0qFNcF3ddBAves3tfXPikb2vrR4Cv2XnVvlzAdlFeiJs8I14E4oNwuNG661HpOnw
102+
JYexQ9KCFZMkvplb10Nr8fE=
103+
-----END PRIVATE KEY-----"
104+
sso:
105+
defaultService: http://127.0.0.1:7777/home.html
106+
casServiceUrlPrefix: http://127.0.0.1:8080/cas
107+
casLogin: http://127.0.0.1:8080/cas/login
108+
ssoLanding: http://127.0.0.1:7777/ssolanding.html
109+
ims:
110+
accessUrl: http://127.0.0.1:10812/ims_data_access/send_alarm_by_json.do
111+
subSystemId: 5265
112+
alertWay: 1,2,3
113+
alertReceiver: luckliu
114+
kube:
115+
apiConfig:
116+
sysProperty: "user.dir"
117+
defaultPath: "/certs/config"
118+
path: "/etc/config/kube-config"
119+
namespacedResourceConfig:
120+
defaultRQName: mlss-default-rq
121+
defaultRQCpu: 0
122+
defaultRQMem: 0Mi
123+
defaultRQGpu: 0
124+
es:
125+
# address: elasticsearch
126+
# port: 9300
127+
address: 127.0.0.1
128+
port: 30782
129+
learnerIndex: dlaas_learner_data
130+
dateIndex: logstash-
131+
gateway:
132+
bdpAddress: http://127.0.0.1:30795
133+
bdapAddress: http://127.0.0.1:30794
134+
bdapsafeAddress: http://127.0.0.1:30796
135+
authAddress:
136+
user: http://127.0.0.1:30800/cc/v1/inter/user
137+
auth: http://127.0.0.1:30800/cc/v1/inter/auth
138+
ip: http://127.0.0.1:30800/cc/v1/inter/ip
139+
cache:
140+
cacheTime: 24h
141+
defaultTimestampTimeout: 30000
142+
cookie:
143+
defaultTime: 86400
144+
path: "/"

‎cc/go.mod‎

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,47 @@
11
module mlss-controlcenter-go
22

3-
go 1.12
3+
go 1.13
44

55
require (
66
github.com/IBM/FfDL v0.1.1-rc
7-
github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d // indirect
87
github.com/caddyserver/caddy v1.0.4
98
github.com/dlclark/regexp2 v1.2.0
109
github.com/fastly/go-utils v0.0.0-20180712184237-d95a45783239 // indirect
1110
github.com/gin-contrib/location v0.0.1
1211
github.com/gin-gonic/gin v1.5.0
12+
github.com/go-ldap/ldap/v3 v3.2.4
1313
github.com/go-openapi/errors v0.19.3
1414
github.com/go-openapi/loads v0.19.4
1515
github.com/go-openapi/runtime v0.19.11
16-
github.com/go-openapi/spec v0.19.3
16+
github.com/go-openapi/spec v0.19.6
1717
github.com/go-openapi/strfmt v0.19.4
18-
github.com/go-openapi/swag v0.19.5
19-
github.com/go-openapi/validate v0.19.3
18+
github.com/go-openapi/swag v0.19.7
19+
github.com/go-openapi/validate v0.19.5
2020
github.com/google/uuid v1.1.1
2121
github.com/jehiah/go-strftime v0.0.0-20171201141054-1d33003b3869 // indirect
2222
github.com/jessevdk/go-flags v1.4.0
23+
github.com/jinzhu/copier v0.3.5
2324
github.com/jinzhu/gorm v1.9.12
2425
github.com/kubernetes-client/go v0.0.0-20200222171647-9dac5e4c5400
2526
github.com/lestrrat-go/file-rotatelogs v2.3.0+incompatible
2627
github.com/lestrrat-go/strftime v1.0.1 // indirect
27-
github.com/mattn/go-isatty v0.0.11 // indirect
2828
github.com/patrickmn/go-cache v2.1.0+incompatible
29-
github.com/pkg/errors v0.9.1 // indirect
30-
github.com/sirupsen/logrus v1.5.0
31-
github.com/spf13/viper v1.6.2
29+
github.com/prometheus/common v0.10.0
30+
github.com/seldonio/seldon-core/operator v0.0.0-20210122151420-b881f99ebc1f
31+
github.com/sirupsen/logrus v1.6.0
32+
github.com/spf13/viper v1.7.0
3233
github.com/tebeka/strftime v0.1.3 // indirect
33-
golang.org/x/net v0.0.0-20191027093000-83d349e8ac1a
34-
google.golang.org/grpc v1.27.1 // indirect
34+
golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb
3535
gopkg.in/cas.v2 v2.2.0
36-
gopkg.in/yaml.v2 v2.2.7
37-
k8s.io/api v0.0.0-20190620084959-7cf5895f2711
38-
k8s.io/apimachinery v0.17.2
36+
gopkg.in/yaml.v2 v2.4.0
37+
k8s.io/api v0.18.8
38+
k8s.io/apimachinery v0.18.8
3939
k8s.io/client-go v12.0.0+incompatible
40+
k8s.io/utils v0.0.0-20200729134348-d5654de09c73 // indirect
4041
)
42+
43+
replace k8s.io/api v0.18.8 => k8s.io/api v0.18.6
44+
45+
replace k8s.io/apimachinery v0.18.8 => k8s.io/apimachinery v0.18.6
46+
47+
replace k8s.io/client-go v12.0.0+incompatible => k8s.io/client-go v0.18.6

0 commit comments

Comments
 (0)