kpl2.0 config update

kpl_base/autodl/kpl-ssl-configmap-autodl.yaml

+apiVersion: v1
+data:
+  server.crt: |
+    -----BEGIN CERTIFICATE-----
+    MIICKTCCAbCgAwIBAgIJAOEzff/TB45/MAoGCCqGSM49BAMCMFMxCzAJBgNVBAYT
+    AkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBXaWRn
+    aXRzIFB0eSBMdGQxDDAKBgNVBAMMA0tQTDAeFw0yMDA2MDMwMzA2MDRaFw0zMDA2
+    MDEwMzA2MDRaMFMxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEw
+    HwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQxDDAKBgNVBAMMA0tQTDB2
+    MBAGByqGSM49AgEGBSuBBAAiA2IABDUlvu7GTOB4kYiqBuRqiLU3chqccZhMFL16
+    olmMX31M8EWA0VXj5JeMo4js7NcuBRfFp2JIdhqOroodz+Bu64nmhjbr7Qkglk14
+    XguoUrwycTAlba2JdBpXRXwY5uP7eqNQME4wHQYDVR0OBBYEFPQ81JjaE8UG4FyX
+    Hjo09H9dRkcEMB8GA1UdIwQYMBaAFPQ81JjaE8UG4FyXHjo09H9dRkcEMAwGA1Ud
+    EwQFMAMBAf8wCgYIKoZIzj0EAwIDZwAwZAIwSCzsAdwv5fJOlAMI6W+0s5whygR3
+    VQEq88EffPmjQ8Cn6rqWFzev4Cd5W18Qput9AjAjoBh5WdlK1N0sIZpRLaCYK7El
+    2vab3X1CbV8MkwGJU7Vnjav+w185kSNpbpF6idw=
+    -----END CERTIFICATE-----
+  server.key: |
+    -----BEGIN EC PARAMETERS-----
+    BgUrgQQAIg==
+    -----END EC PARAMETERS-----
+    -----BEGIN EC PRIVATE KEY-----
+    MIGkAgEBBDCc8hpwAUrmEZUnFeD4Fi/OnMT2fAXVtJ50FIR/HCWMD/pPDV1uKLZI
+    Hm6h6fRQX82gBwYFK4EEACKhZANiAAQ1Jb7uxkzgeJGIqgbkaoi1N3IanHGYTBS9
+    eqJZjF99TPBFgNFV4+SXjKOI7OzXLgUXxadiSHYajq6KHc/gbuuJ5oY26+0JIJZN
+    eF4LqFK8MnEwJW2tiXQaV0V8GObj+3o=
+    -----END EC PRIVATE KEY-----
+kind: ConfigMap
+metadata:
+  name: kpl-ssl
+  namespace: autodl

kpl_base/kpl/kpl-ssl-configmap.yaml

+apiVersion: v1
+data:
+  server.crt: |
+    -----BEGIN CERTIFICATE-----
+    MIICKTCCAbCgAwIBAgIJAOEzff/TB45/MAoGCCqGSM49BAMCMFMxCzAJBgNVBAYT
+    AkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBXaWRn
+    aXRzIFB0eSBMdGQxDDAKBgNVBAMMA0tQTDAeFw0yMDA2MDMwMzA2MDRaFw0zMDA2
+    MDEwMzA2MDRaMFMxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEw
+    HwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQxDDAKBgNVBAMMA0tQTDB2
+    MBAGByqGSM49AgEGBSuBBAAiA2IABDUlvu7GTOB4kYiqBuRqiLU3chqccZhMFL16
+    olmMX31M8EWA0VXj5JeMo4js7NcuBRfFp2JIdhqOroodz+Bu64nmhjbr7Qkglk14
+    XguoUrwycTAlba2JdBpXRXwY5uP7eqNQME4wHQYDVR0OBBYEFPQ81JjaE8UG4FyX
+    Hjo09H9dRkcEMB8GA1UdIwQYMBaAFPQ81JjaE8UG4FyXHjo09H9dRkcEMAwGA1Ud
+    EwQFMAMBAf8wCgYIKoZIzj0EAwIDZwAwZAIwSCzsAdwv5fJOlAMI6W+0s5whygR3
+    VQEq88EffPmjQ8Cn6rqWFzev4Cd5W18Qput9AjAjoBh5WdlK1N0sIZpRLaCYK7El
+    2vab3X1CbV8MkwGJU7Vnjav+w185kSNpbpF6idw=
+    -----END CERTIFICATE-----
+  server.key: |
+    -----BEGIN EC PARAMETERS-----
+    BgUrgQQAIg==
+    -----END EC PARAMETERS-----
+    -----BEGIN EC PRIVATE KEY-----
+    MIGkAgEBBDCc8hpwAUrmEZUnFeD4Fi/OnMT2fAXVtJ50FIR/HCWMD/pPDV1uKLZI
+    Hm6h6fRQX82gBwYFK4EEACKhZANiAAQ1Jb7uxkzgeJGIqgbkaoi1N3IanHGYTBS9
+    eqJZjF99TPBFgNFV4+SXjKOI7OzXLgUXxadiSHYajq6KHc/gbuuJ5oY26+0JIJZN
+    eF4LqFK8MnEwJW2tiXQaV0V8GObj+3o=
+    -----END EC PRIVATE KEY-----
+kind: ConfigMap
+metadata:
+  creationTimestamp: "2020-06-03T03:06:22Z"
+  name: kpl-ssl
+  namespace: kpl
+  resourceVersion: "61559587"
+  selfLink: /api/v1/namespaces/kpl/configmaps/kpl-ssl
+  uid: 4c6174b1-3847-4c29-a7e7-fcd7b6e011e9

kpl_deploy_yaml/4-kpl-frontend/kpl-frontend-svc.yaml

@@ -16,3 +16,7 @@ spec:
       name: port-81
       targetPort: 81
       nodePort: 30181
+    - port: 82
+      name: port-82
+      targetPort: 82
+      nodePort: 30182

kpl_deploy_yaml/4-kpl-frontend/kpl-frontend.yaml

@@ -27,6 +27,8 @@ spec:
             name: port-80
           - containerPort: 81
             name: port-81
+          - containerPort: 82
+            name: port-82
         livenessProbe:
           tcpSocket:
             port: port-80

kpl_deploy_yaml/5-kpl-backend/deploy-deployment.yaml

@@ -33,13 +33,14 @@ spec:
           - containerPort: 8921
             name: port-8921
         livenessProbe:
+          initialDelaySeconds: 10
           httpGet:
             path: /health
             port: port-8921
             scheme: HTTP
         resources:
           requests:
-            cpu: "500m"
+            cpu: "200m"
             memory: "512Mi"
           limits:
             cpu: "1000m"

kpl_deploy_yaml/5-kpl-backend/image-proxy-deployment.yaml

@@ -35,11 +35,12 @@ spec:
           - containerPort: 8922
             name: port-8922
         livenessProbe:
+          initialDelaySeconds: 10
           tcpSocket:
             port: port-8922
         resources:
           requests:
-            cpu: "500m"
+            cpu: "200m"
             memory: "512Mi"
           limits:
             cpu: "1000m"

kpl_deploy_yaml/5-kpl-backend/monitor-deployment.yaml

@@ -35,13 +35,14 @@ spec:
           - containerPort: 8920
             name: port-8920
         livenessProbe:
+          initialDelaySeconds: 10
           httpGet:
             path: /health
             port: port-8920
             scheme: HTTP
         resources:
           requests:
-            cpu: "500m"
+            cpu: "200m"
             memory: "512Mi"
           limits:
             cpu: "1000m"

kpl_deploy_yaml/5-kpl-backend/nginx.yaml

@@ -42,6 +42,7 @@ spec:
           - containerPort: 443
             name: port-443
         livenessProbe:
+          initialDelaySeconds: 10
           tcpSocket:
             port: port-80
         resources:

kpl_deploy_yaml/5-kpl-backend/quota-rpc-server-deployment.yaml

+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: kpl--quota-rpc-server
+  namespace: kpl
+spec:
+  replicas: 1
+  template:
+    metadata:
+      labels:
+        app: kpl--quota-rpc-server
+    spec:
+      imagePullSecrets:
+      - name: "harbor-secret"
+      serviceAccountName: kpl-serviceaccount
+      nodeSelector:
+        internal_service_node: "true"
+      containers:
+      - name: kpl--quota-rpc-server
+        image: DOCKER_REGISTRY/kpl-backend-v1:latest
+        imagePullPolicy: Always
+        volumeMounts:
+        - name: config
+          mountPath: /adl/bin/conf/app.yaml
+          subPath: app.yaml
+        command: ["kpl--quota-rpc-server"]
+        ports:
+          - containerPort: 9999
+            name: port-9999
+        livenessProbe:
+          tcpSocket:
+            port: port-9999
+        resources:
+          requests:
+            cpu: "300m"
+            memory: "300Mi"
+          limits:
+            cpu: "1000m"
+            memory: "1024Mi"
+      volumes:
+      - name: config
+        configMap:
+          name: cfg-kpl-backend

kpl_deploy_yaml/5-kpl-backend/quota-rpc-server-svc.yaml

+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app: kpl--quota-rpc-server
+  name: kpl--quota-rpc-server
+  namespace: kpl
+spec:
+  selector:
+    app: kpl--quota-rpc-server
+  ports:
+    - port: 9999
+      name: port-9999
+      targetPort: 9999

kpl_deploy_yaml/5-kpl-backend/server-deployment.yaml

@@ -34,14 +34,15 @@ spec:
           - containerPort: 8919
             name: port-8919
         livenessProbe:
+          initialDelaySeconds: 10
           httpGet:
             path: /health
             port: port-8919
             scheme: HTTP
         resources:
           requests:
-            cpu: "1000m"
-            memory: "1024Mi"
+            cpu: "400m"
+            memory: "512Mi"
           limits:
             cpu: "6000m"
             memory: "8Gi"

kpl_deploy_yaml/5-kpl-backend/worker-deployment.yaml

@@ -34,6 +34,7 @@ spec:
           - containerPort: 8080
             name: wport-8080
         livenessProbe:
+          initialDelaySeconds: 10
           httpGet:
             path: /health
             port: wport-8080
@@ -41,11 +42,11 @@ spec:
         args: ["kpl--script && kpl--worker"]
         resources:
           requests:
-            cpu: "500m"
-            memory: "512Mi"
+            cpu: "200m"
+            memory: "2048Mi"
           limits:
             cpu: "1000m"
-            memory: "1024Mi"
+            memory: "3000Mi"
       volumes:
       - name: kpl-volume
         persistentVolumeClaim:

kpl_deploy_yaml/5-kpl-backend/workspace-worker-deployment.yaml

@@ -34,6 +34,7 @@ spec:
           - containerPort: 8080
             name: wwport-8080
         livenessProbe:
+          initialDelaySeconds: 10
           httpGet:
             path: /health
             port: wwport-8080

sed-configmap/sed-config.sh

@@ -42,7 +42,7 @@ sudo sed -i s#mysql_password#$mysql_password#g `find $config_workspace -type f -
 sudo sed -i s#kpl_deploy#$kpl_deploy#g `find $config_workspace -type f -name "*.yaml"`
 sudo sed -i s#core_nginx#$core_nginx#g `find $config_workspace -type f -name "*.yaml"`
 sudo sed -i s#kpl_frontend#$kpl_frontend#g `find $config_workspace -type f -name "*.yaml"`
-sudo sed -i s#visit_uc_frontend#$visit_uc_frontend#g `find $config_workspace -type f -name "*.yaml"`
+#sudo sed -i s#visit_uc_frontend#$visit_uc_frontend#g `find $config_workspace -type f -name "*.yaml"`
 sudo sed -i s#kpl_stream#$kpl_stream#g `find $config_workspace -type f -name "*.yaml"`
 ###############################修改前端app.yaml#######################################
 sudo sed -i s#kpl_backend#$kpl_backend#g `find $config_workspace -type f -name "*.yaml"`