From 3385d4e8a33bfb96b097610c8526b3ac5946a98b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=A5=E5=9B=BD=E5=8D=8E?= Date: Fri, 27 Jun 2025 15:50:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B1=B1=E8=A5=BF=E4=BF=A1=E6=81=AF=E9=99=A2?= =?UTF-8?q?=E4=BA=91=E6=97=B6=E4=BB=A3apaas=E6=94=BF=E5=8A=A1=E4=BA=91?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=8E=AF=E5=A2=83=E7=BB=9F=E4=B8=80=E7=94=A8?= =?UTF-8?q?=E6=88=B7charts(amd)=20init?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- step.yaml | 2 +- templates/configmap.yaml | 2 +- templates/file-upload/ingressroute.yaml | 10 ++--- templates/file-upload/service.yaml | 3 +- templates/ingresshost.yaml | 2 +- templates/sms/configmap.yaml | 20 --------- templates/sms/deployment.yaml | 44 -------------------- templates/sms/ingressroute.yaml | 17 -------- templates/sms/service.yaml | 19 --------- templates/usma-api/ingressroute.yaml | 10 ++--- templates/usma-api/service.yaml | 4 +- templates/usma-login/api/ingressroute.yaml | 11 +++-- templates/usma-login/api/service.yaml | 4 +- templates/usma-login/ui/ingressroute.yaml | 11 +++-- templates/usma-login/ui/service.yaml | 3 +- templates/usma-ui.yaml | 4 +- templates/usma-ui/ingressroute.yaml | 11 +++-- templates/usma-ui/service.yaml | 3 ++ values.yaml | 47 ++++++++++------------ 19 files changed, 62 insertions(+), 165 deletions(-) delete mode 100644 templates/sms/configmap.yaml delete mode 100644 templates/sms/deployment.yaml delete mode 100644 templates/sms/ingressroute.yaml delete mode 100644 templates/sms/service.yaml diff --git a/step.yaml b/step.yaml index 92bd673..557977b 100644 --- a/step.yaml +++ b/step.yaml @@ -2,4 +2,4 @@ configInfo: - name: global.host text: 地址 type: text - value: "bg-usma.ysdpaas.local" + value: "bg-usma.zwyycs.local" diff --git a/templates/configmap.yaml b/templates/configmap.yaml index cc68a35..8198a45 100644 --- a/templates/configmap.yaml +++ b/templates/configmap.yaml @@ -9,5 +9,5 @@ data: TOKEN_KEY: usmaToken # GIN_MODE: "release" LOG_DIR_PREFIX: "/app/log" - USMA_HOST: "https://{{ .Values.global.host }}" + USMA_HOST: "http://{{ .Values.global.host }}" {{ toYaml .Values.usma.conf | indent 2 }} diff --git a/templates/file-upload/ingressroute.yaml b/templates/file-upload/ingressroute.yaml index b4e1783..4b19c16 100644 --- a/templates/file-upload/ingressroute.yaml +++ b/templates/file-upload/ingressroute.yaml @@ -2,16 +2,14 @@ apiVersion: bcc.bd-apaas.com/v1alpha1 kind: IngressRoute metadata: name: file-upload - namespace: {{ .Release.Namespace }} + namespace: {{ .Release.Namespace }} spec: entryPoints: - - websecure + - web routes: - - kind: Rule - match: Host(`{{ .Values.global.host }}`) && PathPrefix(`/bgfile`) + - kind: Rule + match: Host(`bg-usma.zwyycs.local`) && PathPrefix(`/bgfile`) services: - kind: Service name: file-upload port: 80 - tls: - certResolver: default diff --git a/templates/file-upload/service.yaml b/templates/file-upload/service.yaml index f0a9479..c502b9f 100644 --- a/templates/file-upload/service.yaml +++ b/templates/file-upload/service.yaml @@ -13,7 +13,8 @@ spec: port: 80 protocol: TCP targetPort: 80 + nodePort: 30094 selector: app: file-upload - type: ClusterIP + type: NodePort sessionAffinity: None diff --git a/templates/ingresshost.yaml b/templates/ingresshost.yaml index db910cd..c2592c6 100644 --- a/templates/ingresshost.yaml +++ b/templates/ingresshost.yaml @@ -4,5 +4,5 @@ metadata: name: usma namespace: {{ .Release.Namespace }} spec: - host: {{ .Values.global.host }} + host: bg-usma.zwyycs.local diff --git a/templates/sms/configmap.yaml b/templates/sms/configmap.yaml deleted file mode 100644 index 2733fe0..0000000 --- a/templates/sms/configmap.yaml +++ /dev/null @@ -1,20 +0,0 @@ -kind: ConfigMap -apiVersion: v1 -metadata: - name: sms-verify-api - namespace: {{ .Release.Namespace }} -data: - GIN_MODE: "debug" - REDIS_URL: {{ .Values.usma.conf.REDIS_URL }} - REDIS_PASSWORD: {{ .Values.usma.conf.REDIS_PASSWORD }} - ACCESS_KEY_ID: "LTAI4GBcVubRjzX7ABPcHnhB" - ACCESS_SECRET: "dYE2dtABFOqYtK1ijcrits0yedHkw7" - TPL_CODE_LOGIN: "SMS_212925130" - TPL_CODE_PWD: "SMS_212925127" - TPL_CODE_REGISTRY: "SMS_212925128" - TPL_CODE_LOGIN_ABNORMAL: "SMS_212925129" - TPL_CODE_ID_CARD: "SMS_460741011" - TPL_CODE_MOBILE: "SMS_212925126" - TPL_CODE_SYSTEM: "SMS_229477217" - SIGN_NAME: "比格数据" - SMS_MODE: "aliYun" diff --git a/templates/sms/deployment.yaml b/templates/sms/deployment.yaml deleted file mode 100644 index 6ed8f21..0000000 --- a/templates/sms/deployment.yaml +++ /dev/null @@ -1,44 +0,0 @@ -kind: Deployment -apiVersion: apps/v1 -metadata: - name: sms-verify-api - namespace: {{ .Release.Namespace }} - labels: -{{ include "sms-verify-api.labels" . | indent 4 }} - app: sms-verify-api - versoin: {{ .Values.smsVerifyApi.image.tag }} -spec: - replicas: 1 - selector: - matchLabels: - app: sms-verify-api - template: - metadata: - labels: -{{ include "sms-verify-api.labels" . | indent 8 }} - app: sms-verify-api - version: {{ .Values.smsVerifyApi.image.tag }} - spec: - volumes: - - name: localtime - hostPath: - path: /etc/localtime - type: '' - containers: - - name: sms-verify-api - {{- if contains "/" .Values.smsVerifyApi.image.repository }} - image: "{{ .Values.smsVerifyApi.image.repository }}:{{ .Values.smsVerifyApi.image.tag }}{{ template "beagle.imageArch" . }}" - {{- else }} - image: "{{ .Values.global.hub }}/{{ .Values.smsVerifyApi.image.repository }}:{{ .Values.smsVerifyApi.image.tag }}{{ template "beagle.imageArch" . }}" - {{- end }} - imagePullPolicy: "{{ .Values.global.imagePullPolicy }}" - ports: - - containerPort: 8080 - protocol: TCP - envFrom: - - configMapRef: - name: sms-verify-api - volumeMounts: - - name: localtime - mountPath: /etc/localtime - restartPolicy: Always diff --git a/templates/sms/ingressroute.yaml b/templates/sms/ingressroute.yaml deleted file mode 100644 index 52bc058..0000000 --- a/templates/sms/ingressroute.yaml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: bcc.bd-apaas.com/v1alpha1 -kind: IngressRoute -metadata: - name: sms-verify-api - namespace: {{ .Release.Namespace }} -spec: - entryPoints: - - websecure - routes: - - kind: Rule - match: Host(`{{ .Values.global.host }}`) && PathPrefix(`/sms/api`) - services: - - kind: Service - name: sms-verify-api - port: 80 - tls: - certResolver: default diff --git a/templates/sms/service.yaml b/templates/sms/service.yaml deleted file mode 100644 index bd32e13..0000000 --- a/templates/sms/service.yaml +++ /dev/null @@ -1,19 +0,0 @@ -kind: Service -apiVersion: v1 -metadata: - name: sms-verify-api - namespace: {{ .Release.Namespace }} - labels: -{{ include "sms-verify-api.labels" . | indent 4 }} - app: sms-verify-api - versoin: {{ .Values.smsVerifyApi.image.tag }} -spec: - ports: - - name: sms-verify-api - protocol: TCP - port: 80 - targetPort: 8080 - selector: - app: sms-verify-api - type: ClusterIP - sessionAffinity: None diff --git a/templates/usma-api/ingressroute.yaml b/templates/usma-api/ingressroute.yaml index cd1d158..1eb274b 100644 --- a/templates/usma-api/ingressroute.yaml +++ b/templates/usma-api/ingressroute.yaml @@ -2,16 +2,14 @@ apiVersion: bcc.bd-apaas.com/v1alpha1 kind: IngressRoute metadata: name: usma-api - namespace: {{ .Release.Namespace }} + namespace: {{ .Release.Namespace }} spec: entryPoints: - - websecure + - web routes: - - kind: Rule - match: Host(`{{ .Values.global.host }}`) && PathPrefix(`/usma/api`) + - kind: Rule + match: Host(`bg-usma.zwyycs.local`) && PathPrefix(`/usma/api`) services: - kind: Service name: usma-api port: 80 - tls: - certResolver: default diff --git a/templates/usma-api/service.yaml b/templates/usma-api/service.yaml index 7a1ecb3..310086f 100644 --- a/templates/usma-api/service.yaml +++ b/templates/usma-api/service.yaml @@ -12,5 +12,7 @@ spec: - name: usma-api port: 80 targetPort: 8080 + nodePort: 30091 selector: - app: usma-api \ No newline at end of file + app: usma-api + type: NodePort \ No newline at end of file diff --git a/templates/usma-login/api/ingressroute.yaml b/templates/usma-login/api/ingressroute.yaml index 40e1b0b..0536687 100644 --- a/templates/usma-login/api/ingressroute.yaml +++ b/templates/usma-login/api/ingressroute.yaml @@ -2,16 +2,15 @@ apiVersion: bcc.bd-apaas.com/v1alpha1 kind: IngressRoute metadata: name: usma-login-api - namespace: {{ .Release.Namespace }} + namespace: {{ .Release.Namespace }} spec: entryPoints: - - websecure + - web routes: - - kind: Rule - match: Host(`{{ .Values.global.host }}`) && PathPrefix(`/iam/api`) + - kind: Rule + match: Host(`bg-usma.zwyycs.local`) && PathPrefix(`/iam/api`) services: - kind: Service name: usma-login-api port: 80 - tls: - certResolver: default + diff --git a/templates/usma-login/api/service.yaml b/templates/usma-login/api/service.yaml index dddc89c..2744129 100644 --- a/templates/usma-login/api/service.yaml +++ b/templates/usma-login/api/service.yaml @@ -13,7 +13,9 @@ spec: protocol: TCP port: 80 targetPort: 80 + nodePort: 30093 selector: app: usma-login-api - type: ClusterIP + type: NodePort sessionAffinity: None + diff --git a/templates/usma-login/ui/ingressroute.yaml b/templates/usma-login/ui/ingressroute.yaml index 6052688..d4260a9 100644 --- a/templates/usma-login/ui/ingressroute.yaml +++ b/templates/usma-login/ui/ingressroute.yaml @@ -2,16 +2,15 @@ apiVersion: bcc.bd-apaas.com/v1alpha1 kind: IngressRoute metadata: name: usma-login - namespace: {{ .Release.Namespace }} + namespace: {{ .Release.Namespace }} spec: entryPoints: - - websecure + - web routes: - - kind: Rule - match: Host(`{{ .Values.global.host }}`) && PathPrefix(`/usma/login`) + - kind: Rule + match: Host(`bg-usma.zwyycs.local`) && PathPrefix(`/usma/login`) services: - kind: Service name: usma-login port: 80 - tls: - certResolver: default + diff --git a/templates/usma-login/ui/service.yaml b/templates/usma-login/ui/service.yaml index 0a89e74..cc624bb 100644 --- a/templates/usma-login/ui/service.yaml +++ b/templates/usma-login/ui/service.yaml @@ -13,7 +13,8 @@ spec: protocol: TCP port: 80 targetPort: 80 + nodePort: 30092 selector: app: usma-login - type: ClusterIP + type: NodePort sessionAffinity: None diff --git a/templates/usma-ui.yaml b/templates/usma-ui.yaml index 059084e..bfa5de8 100644 --- a/templates/usma-ui.yaml +++ b/templates/usma-ui.yaml @@ -7,6 +7,6 @@ data: configmap: |- window.defaultConfig = { tokenName: "usmaToken", - gitLogoutUrl: "https://gitlab.ysdpaas.local/usma/rest/v5/git/sign_out", - usmaLoginUrl: "https://{{ .Values.global.host }}/usma/login/#/login" + gitLogoutUrl: "http://183.201.253.162:10003/usma/rest/v5/git/sign_out", + usmaLoginUrl: "http://{{ .Values.global.host }}/usma/login/#/login" }; diff --git a/templates/usma-ui/ingressroute.yaml b/templates/usma-ui/ingressroute.yaml index 9c29aa5..4c9bf04 100644 --- a/templates/usma-ui/ingressroute.yaml +++ b/templates/usma-ui/ingressroute.yaml @@ -2,16 +2,15 @@ apiVersion: bcc.bd-apaas.com/v1alpha1 kind: IngressRoute metadata: name: usma-ui - namespace: {{ .Release.Namespace }} + namespace: {{ .Release.Namespace }} spec: entryPoints: - - websecure + - web routes: - - kind: Rule - match: Host(`{{ .Values.global.host }}`) && PathPrefix(`/usma/ui`) + - kind: Rule + match: Host(`bg-usma.zwyycs.local`) && PathPrefix(`/usma/ui`) services: - kind: Service name: usma-ui port: 8080 - tls: - certResolver: default + diff --git a/templates/usma-ui/service.yaml b/templates/usma-ui/service.yaml index 9874b39..b6c082f 100644 --- a/templates/usma-ui/service.yaml +++ b/templates/usma-ui/service.yaml @@ -13,5 +13,8 @@ spec: protocol: TCP port: 8080 targetPort: 8080 + nodePort: 30090 selector: app: usma-ui + type: NodePort + diff --git a/values.yaml b/values.yaml index acf643f..4647729 100644 --- a/values.yaml +++ b/values.yaml @@ -6,84 +6,79 @@ global: # 镜像拉取策略 imagePullPolicy: "IfNotPresent" # 镜像架构(amd64,arm64,ppc64le,mips64le),只控制servicechoreography业务系统的镜像架构，依赖组件不受此参数控制 - imageArch: arm64 + imageArch: amd64 usma: conf: DB_SCHEMA: "public" - DB_URL: "host=postgresql port=5432 user=postgres password=passwd123 dbname=postgres sslmode=disable search_path=public" + DB_URL: "host=postgresql port=5432 user=postgres password=k6psy7kafT%U dbname=postgres sslmode=disable search_path=public" REDIS_URL: "redis://redis:6379" - REDIS_PASSWORD: "passwd123" + REDIS_PASSWORD: "k6psy7kafT%U" LOCATION_KEY: "QKFBZ-PGGWJ-VZQFF-FHPA7-QWT5H-YHF4T" LOCATION_URL: "https://apis.map.qq.com/ws/location/v1/ip" SMS_SERVICE: "http://sms-verify-api:80/sms/api" fileUpload: image: - repository: hub.wodcloud.com/devops/fileupload + repository: registry.beagle.default:6444/devops/fileupload tag: v2.0 - storageClassName: "hostpath" - -smsVerifyApi: - image: - repository: registry.cn-qingdao.aliyuncs.com/wod/sms-verify-api - tag: v2.4.0 + storageClassName: "nfs-storage" usmaApi: image: - repository: hub.wodcloud.com/apaas-sxxcy/usma-api + repository: registry.beagle.default:6444/apaas-sxxcy/usma-api tag: v1.0.2 - storageClassName: "hostpath" + storageClassName: "nfs-storage" usmaLoginApi: image: - repository: hub.wodcloud.com/apaas-sxxcy/usma-login-api + repository: registry.beagle.default:6444/apaas-sxxcy/usma-login-api tag: v1.0.0 - storageClassName: "hostpath" + storageClassName: "nfs-storage" usmaLogin: image: - repository: hub.wodcloud.com/apaas-sxxcy/usma-login-ui + repository: registry.beagle.default:6444/apaas-sxxcy/usma-login-ui tag: v1.0.0 usmaUi: image: - repository: hub.wodcloud.com/apaas-sxxcy/usma-ui + repository: registry.beagle.default:6444/apaas-sxxcy/usma-ui tag: v1.0.1 # 初始化数据库job usmaDbInit: image: - repository: hub.wodcloud.com/wod/usma-db-init + repository: registry.beagle.default:6444/wod/usma-db-init tag: v1.0.0 # redis中间件默认svc是 redis redis: enabled: true image: - repository: redis - tag: 6.2.6 + repository: registry.beagle.default:6444/wod/redis + tag: 6.0.9 #redis的config conf: port: 'port 6379' db: 'databases 16' maxmem: 'maxmemory 256mb' apl: 'appendonly yes' - passwd: 'requirepass passwd123' + passwd: 'requirepass k6psy7kafT%U' #持久化存储类 - storageClassName: "hostpath" + storageClassName: "nfs-storage" # postgresql中间件默认svc是 postgresql postgresql: enabled: true image: - repository: postgres - tag: 13.5 + repository: registry.beagle.default:6444/wod/postgis + tag: 11-2.5 initImage: - repository: busybox + repository: registry.beagle.default:6444/devops/busybox tag: 1.33 #数据库密码 - POSTGRES_PASSWORD: "passwd123" + POSTGRES_PASSWORD: "k6psy7kafT%U" #持久化存储类 - storageClassName: "hostpath" + storageClassName: "nfs-storage" -- 2.26.0