diff --git a/charts/portal/templates/service.yaml b/charts/portal/templates/service.yaml index dbd36564e29d71ce884603ab246dd9aa85b7deaa..8aba4937347193bf4f31f1d5205f64dff98c640d 100644 --- a/charts/portal/templates/service.yaml +++ b/charts/portal/templates/service.yaml @@ -12,7 +12,7 @@ spec: - name: portal-ui protocol: TCP port: 80 - targetPort: 80 + targetPort: 8080 selector: app: portal-ui type: ClusterIP diff --git a/templates/usma-api/usma-db-init.yaml b/templates/usma-api/usma-db-init.yaml new file mode 100644 index 0000000000000000000000000000000000000000..dcecbc49444a6a665dcffd66a9cbc3d0c8b35d94 --- /dev/null +++ b/templates/usma-api/usma-db-init.yaml @@ -0,0 +1,21 @@ +apiVersion: batch/v1 +kind: Job +metadata: + name: usma-db-init +spec: + template: + spec: + restartPolicy: Never + containers: + - name: usma-db-init + {{- if contains "/" .Values.usmaDbInit.image.repository }} + image: "{{ .Values.usmaDbInit.image.repository }}:{{ .Values.usmaDbInit.image.tag }}{{ template "beagle.imageArch" . }}" + {{- else }} + image: "{{ .Values.global.hub }}/{{ .Values.usmaDbInit.image.repository }}:{{ .Values.usmaDbInit.image.tag }}{{ template "beagle.imageArch" . }}" + {{- end }} + imagePullPolicy: Always + envFrom: + - configMapRef: + name: "usma" + backoffLimit: 2 + diff --git a/values.yaml b/values.yaml index e7a9e51d7eb7c0731a1644c336fa0323f0e0f6e9..80b97b9e7ee5545e09bf735ceede8132b0eba1ba 100644 --- a/values.yaml +++ b/values.yaml @@ -10,8 +10,8 @@ global: usma: conf: - DB_URL: "host=postgresql.test port=5432 user=postgres password=passwd123 dbname=usma sslmode=disable" - REDIS_URL: "redis://redis.test:6379" + DB_URL: "host=postgresql.usma port=5432 user=postgres password=passwd123 dbname=postgres sslmode=disable" + REDIS_URL: "redis://redis.usma:6379" REDIS_PASSWORD: "passwd123" LOCATION_KEY: "QKFBZ-PGGWJ-VZQFF-FHPA7-QWT5H-YHF4T" LOCATION_URL: "https://apis.map.qq.com/ws/location/v1/ip" @@ -50,6 +50,17 @@ usmaUi: repository: hub.wodcloud.com/usma/usma-ui tag: v2.2.2 +# 初始化数据库job +usmaDbInit: + image: + repository: usma-db-init + tag: v2.4.0 + +# 跨域的ingressroute +cros: + apaasNamespace: apaas # apaas命名空间 + cloudNamespace: beagle-system # 容器云命名空间 + # 统一门户 portal: enabled: true @@ -59,11 +70,10 @@ portal: conf: configmap: "window.serviceConfig = {\n apaas: 'https://apaas.hbyjkffn.hb.cegn.cn:30443/apaas/ui/#/',\n}" -cros: - apaasNamespace: apaas - cloudNamespace: beagle-system + +# redis中间件默认svc是 redis redis: - enabled: true + enabled: true image: repository: redis tag: 6.2.6 @@ -77,6 +87,7 @@ redis: #持久化存储类 storageClassName: "hostpath" +# postgresql中间件默认svc是 postgresql postgresql: enabled: true image: