Merge pull request #1142 from yyyangw/feature/helm_charts_update

修改“helm charts 部署方式的相关配置”

Author: Lingghh

helm-charts/tca/README.md

@@ -49,6 +49,11 @@ The command removes all the Kubernetes components associated with the chart and
 | `global.imagePullPolicy`                                | Global Docker image registry                            | `""`           |
 | `global.imagePullSecrets`                               | Global Docker registry secret names as an array         | `[]`           |
 
+To create a secret to pull an image from a private container image registry or repository:
+```Bash
+$ kubectl create secret docker-registry ${SECRET_NAME} --docker-server=${DOCKER_SERVER} --docker-username=${DOCKER_USERNAME} --docker-password=${DOCKER_PASSWORD} --docker-email=${DOCKER_EMAIL}
+```
+
 ### TCA Metric parameters
 | Name                                                    | Description                                             | Value          |
 | ------------------------------------------------------- | ------------------------------------------------------- | -------------- |

helm-charts/tca/templates/client/configmap-conf.yaml

@@ -39,7 +39,7 @@ data:
     [LICENSE_CONFIG]
     ; [可选]使用自研工具时，需要填写，默认不需要
     ; license服务器url, base_path, license
-    URL=
+    URL={{ .Values.tca.commonConfig.clsServerUrl }}
     BASE_PATH=
-    LICENSE=
+    LICENSE={{ .Values.tca.commonConfig.clsServerLicense }}
     

helm-charts/tca/templates/ingress.yml

@@ -9,6 +9,7 @@ metadata:
     chart: {{ template "tca.chart" . }}
     release: {{ .Release.Name }}
 spec:
+  ingressClassName: nginx
   rules:
     - host: {{ .Values.tca.commonConfig.publicUrl }}
       http:

helm-charts/tca/values.yaml

@@ -8,7 +8,7 @@ global:
   imagePullPolicy: IfNotPresent
   ## E.g.
   ## imagePullSecrets:
-  ##   - myRegistryKeySecretName
+  ##   -name: myRegistryKeySecretName
   ##
   imagePullSecrets: []
 

server/projects/main/Dockerfile

@@ -1,6 +1,6 @@
 FROM python:3.7-slim-bullseye
 
-ARG EXTRA_TOOLS="gnupg curl wget jq net-tools procps default-libmysqlclient-dev locales inotify-tools gcc telnet iputils-ping vim openssh-client"
+ARG EXTRA_TOOLS="gnupg curl wget jq net-tools procps default-libmysqlclient-dev locales inotify-tools gcc telnet iputils-ping vim openssh-client ncat"
 
 RUN set -ex && cd / \
     && apt-get update \

web/Dockerfile

@@ -2,7 +2,7 @@ FROM nginx:1.13.7
 
 RUN apt-get update && apt-get install -y unzip procps && rm /etc/nginx/conf.d/default.conf
 
-COPY ./tca-deploy-source /data/tca-deploy-source
+COPY tca-deploy-source /data/tca-deploy-source
 
-WORKDIR /data/tca-deploy-source
+WORKDIR /data/tca-deploy-source/