From 5c99f9d0af1494b1f0bc216bff2bff437c0c78c2 Mon Sep 17 00:00:00 2001
From: yyyangw <1135905221@qq.com>
Date: Wed, 24 Jul 2024 16:24:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E2=80=9Chelm=20charts=20?=
 =?UTF-8?q?=E9=83=A8=E7=BD=B2=E6=96=B9=E5=BC=8F=E7=9A=84=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 helm-charts/tca/README.md                            | 5 +++++
 helm-charts/tca/templates/client/configmap-conf.yaml | 4 ++--
 helm-charts/tca/templates/ingress.yml                | 1 +
 helm-charts/tca/values.yaml                          | 2 +-
 server/projects/main/Dockerfile                      | 2 +-
 web/Dockerfile                                       | 4 ++--
 6 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/helm-charts/tca/README.md b/helm-charts/tca/README.md
index 46ef79a4d..ecb2bb04c 100644
--- a/helm-charts/tca/README.md
+++ b/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          |
 | ------------------------------------------------------- | ------------------------------------------------------- | -------------- |
diff --git a/helm-charts/tca/templates/client/configmap-conf.yaml b/helm-charts/tca/templates/client/configmap-conf.yaml
index 425a6fac2..60b5d5e3a 100644
--- a/helm-charts/tca/templates/client/configmap-conf.yaml
+++ b/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 }}
     
\ No newline at end of file
diff --git a/helm-charts/tca/templates/ingress.yml b/helm-charts/tca/templates/ingress.yml
index eeea66321..dbe81e76b 100644
--- a/helm-charts/tca/templates/ingress.yml
+++ b/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:
diff --git a/helm-charts/tca/values.yaml b/helm-charts/tca/values.yaml
index 3ada57116..3908f9311 100644
--- a/helm-charts/tca/values.yaml
+++ b/helm-charts/tca/values.yaml
@@ -8,7 +8,7 @@ global:
   imagePullPolicy: IfNotPresent
   ## E.g.
   ## imagePullSecrets:
-  ##   - myRegistryKeySecretName
+  ##   -name: myRegistryKeySecretName
   ##
   imagePullSecrets: []
 
diff --git a/server/projects/main/Dockerfile b/server/projects/main/Dockerfile
index 2a1cd09af..cf74e0da7 100644
--- a/server/projects/main/Dockerfile
+++ b/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 \
diff --git a/web/Dockerfile b/web/Dockerfile
index 4a13dc814..365b4af6a 100644
--- a/web/Dockerfile
+++ b/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/