feat(isntall): Update install file

1、Add Model Factory Deployment in prophecis helm chart.
2、Add Log Collector yaml and helm chart.
3、Add prophecis sql script.

install/Prophecis/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v1
 appVersion: "1.0"
 description: Helm chart for MLSS
-name: Prophecis
+name: MLSS
 version: 0.1.0

install/Prophecis/templates/cc/cc-configmap.yml

@@ -33,18 +33,20 @@ data:
       platformNS: {{.Values.namespace}}
       datasource:
         driverClassName: com.mysql.jdbc.Driver
-        url: jdbc:mysql://{{.Values.database.server}}/{{.Values.database.name}}?useUnicode=true&characterEncoding=utf-8
-        username: {{.Values.database.user}}
-        password: {{.Values.database.pwd}}
-        ip: {{.Values.database.server}}
-        port: {{.Values.database.port}}
-        db: {{.Values.database.name}}
+        url: jdbc:mysql://{{.Values.db.server}}/{{.Values.db.name}}?useUnicode=true&characterEncoding=utf-8
+        username: {{.Values.db.user}}
+        password: {{.Values.db.pwd}}
+        ip: {{.Values.db.server}}
+        port: {{.Values.db.port}}
+        db: {{.Values.db.name}}
       admin:
-        user: admin
-        password: admin
+        user: {{.Values.cc.admin.user}}
+        password: {{.Values.cc.admin.password}}
       ldap: 
         server: {{.Values.cc.ldap.address}}
         baseDN: {{.Values.cc.ldap.baseDN}}
+    encodeFlag: {{.Values.encodeFlag}}
+    aideAddress: {{.Values.cc.aideAddress}}
     server:
       port: 6666
       servlet:
@@ -77,7 +79,7 @@ data:
           - "/v1/auth/access/namespaces/**/notebooks/**"
         - name: AuthInterceptor
           add:
-          - "/v1/**"
+          - "/v1/**"  
           exclude:
           - "/v1/login"
           - "/v1/logout"
@@ -99,7 +101,7 @@ data:
         learnerIndex: dlaas_learner_data
         dateIndex: logstash-
       gateway:
-         bdapAddress: http://127.0.0.1:30803
+        bdapAddress: {{.Values.gateway.address}}
       authAddress:
         user: http://controlcenter-go:6666/cc/v1/inter/user
         auth: http://controlcenter-go:6666/cc/v1/inter/auth
@@ -110,6 +112,10 @@ data:
       cookie:
         defaultTime: 86400
         path: "/"
+      mlss:
+        gid: {{.Values.cc.mlss.gid}}
+        uid: {{.Values.cc.mlss.uid}}
+
 
   logback-spring-xml: |
     <?xml version="1.0" encoding="UTF-8"?>
@@ -203,7 +209,6 @@ data:
             <appender-ref ref="FILE_ERROR"/>
         </root>
     </configuration>
-
   server-crt: |
     -----BEGIN CERTIFICATE-----
     MIICzDCCAbQCCQCVrtRO5rcr1DANBgkqhkiG9w0BAQUFADAoMQswCQYDVQQGEwJD
@@ -251,3 +256,4 @@ data:
     CB8vT/N7IEL9IjjmYo2JMNYiqMHmS9rTId8e9tdTgi8AAkYupkDGIqMkUeewgnxx
     k+1+nsLxQD6MWoNiquRPPAL+bt/KV3FWMB4FsOK1cW3XrD/UrF1Dlg==
     -----END RSA PRIVATE KEY-----
+

install/Prophecis/templates/cc/cc-deployment.yml

@@ -13,6 +13,10 @@ spec:
   minReadySeconds: 5
   strategy:
     type: Recreate
+#    type: RollingUpdate
+#    rollingUpdate:
+#      maxSurge: 1
+#      maxUnavailable: 1
   template:
     metadata:
       labels:
@@ -21,28 +25,26 @@ spec:
       serviceAccountName: cc-go-sa
       containers:
       - name: cc
-        image: {{.Values.server_repository}}:{{.Values.cc.image.tag}}
-        imagePullPolicy: Always
+        image: {{.Values.image.registry}}:{{.Values.cc.image.tag}}
+        imagePullPolicy: {{.Values.image.pullPolicy}}
         ports:
-
-        - containerPort: 6666
-        - containerPort: 443
+        - containerPort: {{.Values.cc.containerPort.portHttp}}
+        - containerPort: {{.Values.cc.containerPort.portHttps}}
         command:
         - /bin/bash
         - -c
-        - "./mlss-controlcenter-go --host=0.0.0.0 --scheme=http --port=6666 --scheme=https --tls-port=443 --tls-certificate=/etc/config/server.crt --tls-key=/etc/config/server.key"
-        env:
-        - name: UM_SA_PWD
-          value: sa
-        - name: UM_OTHER_PWD
-          value: other
+        args:
+        #- /go/bin/dlv  --listen=:40006 --headless=true --api-version=2 exec   ./mlss-controlcenter-go -- --host 0.0.0.0  --scheme http  --port {{.Values.cc.containerPort.portHttp}}  --scheme https  --tls-port {{.Values.cc.containerPort.portHttps}} --tls-certificate /etc/config/server.crt  --tls-key /etc/config/server.key
+        -  ./mlss-controlcenter-go --host 0.0.0.0  --scheme http  --port {{.Values.cc.containerPort.portHttp}}  --scheme https  --tls-port {{.Values.cc.containerPort.portHttps}} --tls-certificate /etc/config/server.crt  --tls-key /etc/config/server.key
         volumeMounts:
         - name: config-volume
           mountPath: /etc/config
         - name: log-volume
           mountPath: /var/log/controlcenter
         - name: timezone-volume
           mountPath: /etc/localtime
+        - name: mlss-data
+          mountPath: /data/bdap-ss/mlss-data
       imagePullSecrets:
       - name: hubsecret-go
       volumes:
@@ -60,11 +62,16 @@ spec:
             path: server.key
       - name: log-volume
         hostPath:
-          path: /appcom/log/controlcenter/{{.Values.namespace}}
+          path: {{.Values.cc.spec.volumes.hostPath.path}}/{{.Values.namespace}}
       - name: timezone-volume
         hostPath:
           path: /usr/share/zoneinfo/Asia/Shanghai
           type: File
+      - name: mlss-data
+        hostPath:
+          path: {{.Values.cc.spec.volumes.hostPath.mlssData}} 
+      # other nodes may not connect to UM/DB/IMS
+#      nodeName: {{.Values.cc.deployNode}}
       nodeSelector:
         {{range $key,$val := .Values.platformNodeSelectors}}
           {{$key}}: {{$val}}

install/Prophecis/templates/cc/cc-gateway-configmap.yml

@@ -13,34 +13,55 @@ data:
       userOrAuthApi: /userOrAuthInterceptor
       ipApi: /ipInterceptor
     noteBook:
-      authUrl: /cc/v1/auth/access/namespaces/*/notebooks/*
-
+      authUrl: /cc/v1/auth/access/namespaces/*/notebooks/*  
+    
   Caddyfile: |
     :8081 {
       root /home
       auth_request {
         check {
           path /cc/v1/*
-          path /di/v1/*
           api /userOrAuthInterceptor
+          except GET /di/v1/dssUserInfo
+          except GET /mf/v1/dashboard?clusterName=bdp
+          except GET /cc/v1/groups/group/storage/bdap
+          except GET /cc/v1/namespaces/myNamespace
           except GET /cc/v1/login /cc/v1/logout /cc/v1/auth/access/namespaces/*/notebooks/*
+          except GET /cc/v1/auth/access/mlflow/uri/*
           except POST /cc/v1/alerts  /cc/v1/alerts/training
           except GET /cc/v1/inter/user
           except POST /cc/v1/LDAPlogin
           except GET /cc/v1/getrsapubkey
+
+        }
+
+        check {
+          path /di/v1/*
+          except GET /di/v1/dssUserInfo
+        }
+
+        check {
+          path /mlflow/ajax-api/2.0/*
+          api /userOrAuthInterceptor
         }
 
+        #check {
+        #  path /mf/v1/*
+        #  except GET /mf/v1/dashboard?clusterName=bdp 
+        #}
+
         #check {
           #path /notebook/*
           #api /ipInterceptor
-        #}
+        #}     
       }
 
       timeouts 5m
 
       errors error.log
       log access.log
       gzip
+      #proxy /cc https://controlcenter-go {
       proxy /cc http://controlcenter-go:6666 {
         header_upstream MLSS-Token {MLSS-Token}
         header_upstream MLSS-RealIP {remote}
@@ -76,11 +97,11 @@ data:
         websocket
       }
 
-      proxy /di di-restapi:80 {
+      proxy /di {{.Values.gateway.address}}:30960 {
         header_upstream MLSS-Token {MLSS-Token}
         header_upstream MLSS-RealIP {remote}
         header_upstream X-Real-IP {remote}
-        header_upstream MLSS-UserID {MLSS-UserID}
+        header_upstream MLSS-Userid {MLSS-Userid}
         header_upstream MLSS-Auth-Type {MLSS-Auth-Type}
         header_upstream MLSS-UIURL {MLSS-UIURL}
         header_upstream MLSS-Passwd {MLSS-Passwd}
@@ -128,4 +149,3 @@ data:
     lnGyr00Jcoj26dwN8bxDmgrmkbJKeVgqUXgys9Hc2Vl1c9jv0NGbrI7YcAxCwHxj
     NW/H5Z/FuR0A0ifTo5UgziamPGj0sB/OmZE/TPOSTFsaiM2IudAjwE8S32ihgJzo
     -----END CERTIFICATE-----
-

install/Prophecis/templates/cc/cc-gateway-deploy.yml

@@ -3,7 +3,7 @@ kind: Deployment
 metadata:
   name: controlcenter-gateway-deployment
   namespace: {{.Values.namespace}}
-  labels:
+  labels: 
     app: controlcenter-gateway-deployment
 spec:
   replicas: 1
@@ -18,16 +18,20 @@ spec:
       labels:
         app: controlcenter-gateway
     spec:
+      #serviceAccountName: cc-go-sa
       containers:
       - name: cc-gateway
-        image: {{.Values.server_repository}}:{{.Values.ccGateway.image.tag}}
-        imagePullPolicy: Always
+        image: {{.Values.image.registry}}:{{.Values.ccGateway.image.tag}}
+        imagePullPolicy: {{.Values.image.pullPolicy}}
         ports:
         - containerPort: 8081
-        command:
-          - /apigateway/mlss-apigateway
-          - -conf
-          - /caddy-config/Caddyfile
+        command: ["/bin/sh", "-c"]
+        args:
+          #- /bin/sh /go/bin/dlv  --listen=:40005 --headless=true --api-version=2 exec  /apigateway/mlss-apigateway -conf /caddy-config/Caddyfile
+          #- /go/bin/dlv  --listen=:40005 --headless=true --api-version=2 exec  /apigateway/mlss-apigateway --  -conf /caddy-config/Caddyfile
+          -  /apigateway/mlss-apigateway  -conf /caddy-config/Caddyfile
+        #args:
+        #  - PATH="$PATH:/apigateway"
         volumeMounts:
         - name: config-volume
           mountPath: /caddy-config

install/Prophecis/templates/cc/cc-gateway-service.yml

@@ -6,11 +6,12 @@ metadata:
 spec:
   selector:
     app: controlcenter-gateway
-  type: NodePort
+  type: {{.Values.cc.service.type}}
   ports:
   - protocol: TCP
-    port: 8081
-    targetPort: 8081
-    nodePort: 30778
+    port: {{.Values.ccGateway.service.port}}
+    targetPort: {{.Values.ccGateway.service.targetPort}}
+    nodePort: {{.Values.ccGateway.service.nodePort}}
     name: main
+
 #  externalTrafficPolicy: Local

install/Prophecis/templates/cc/cc-rbac.yml

@@ -256,6 +256,18 @@ rules:
   - list
   - create
   - delete
+- apiGroups:
+  - machinelearning.seldon.io
+  resources:
+  - seldondeployments
+  verbs:
+  - create
+  - delete
+  - deletecollection
+  - patch
+  - update
+  - list
+  - get
 - apiGroups:
   - rbac.authorization.k8s.io
   resources:

install/Prophecis/templates/cc/cc-service.yml

@@ -6,14 +6,14 @@ metadata:
 spec:
   selector:
     app: controlcenter-go
-  type: NodePort
+  type: {{.Values.cc.service.type}}
   ports:
   - protocol: TCP
-    port: 6666
-    targetPort: 6666
-    nodePort: 30801
+    port: {{.Values.cc.service.port}}
+    targetPort: {{.Values.cc.service.targetPort}}
     name: http
   - protocol: TCP
-    port: 443
-    targetPort: 443
+    port: {{.Values.cc.service.portHttps}}
+    targetPort: {{.Values.cc.service.targetPortHttps}}
     name: https
+#  externalTrafficPolicy: Local

install/Prophecis/templates/di/lcm-deployment.yml

@@ -62,7 +62,7 @@ spec:
             #path: /root/.helm
         #- name: nfs-chart-volume
           #nfs:
-            #server: 10.107.105.207
+            #server: 127.0.0.1
             #path: /data/nfs/charts
 ################################
 

install/Prophecis/templates/infrastructure/etcd.yml

@@ -21,8 +21,8 @@ metadata:
 spec:
   serviceName: etcd
   replicas: 1
-  selector:
-    matchLabels:
+  selector: 
+    matchLabels: 
       app: etcd
   template:
     metadata:
@@ -64,8 +64,10 @@ spec:
         - new
     #    image: quay.io/coreos/etcd:latest
     #    imagePullPolicy: IfNotPresent
-        image: {{.Values.server_repository}}:etcd-latest
-        imagePullPolicy: Always
+        image: {{.Values.image.registry}}:etcd-latest
+    {{ if .Values.image.pullPolicy }}
+        imagePullPolicy: {{.Values.image.pullPolicy}}
+    {{end}}
         name: etcd0
         ports:
         - containerPort: 2379

install/Prophecis/templates/infrastructure/mongo-configmap.yml

@@ -20,12 +20,12 @@ data:
     try{
       // var db = connect('test');
       var admindb = connect('admin');
-      if(admindb.system.users.find({'user':'mlss','db':'admin'}).count() == 0){
+      if(admindb.system.users.find({'user':'{{.Values.mongo.username}}','db':'admin'}).count() == 0){
           print('Ready to addUser...');
-          admindb.createUser({user:'mlss',pwd:'mlss',roles:["userAdminAnyDatabase","readWriteAnyDatabase"]});
+          admindb.createUser({user:'{{.Values.mongo.username}}',pwd:'{{.Values.mongo.password}}',roles:["userAdminAnyDatabase","readWriteAnyDatabase"]});
       }else{
         print('Already exist user, updating now.');
-        admindb.updateUser('mlss',{pwd:'mlss', roles:["userAdminAnyDatabase","readWriteAnyDatabase"]});
+        admindb.updateUser('{{.Values.mongo.username}}',{pwd:'{{.Values.mongo.password}}', roles:["userAdminAnyDatabase","readWriteAnyDatabase"]});
       }
     }catch(err){
       print('Error occured:' + err);