From 204f7980008c781582dd85b562b2ef5698963d4d Mon Sep 17 00:00:00 2001 From: yunguannjg <18757593931@163.com> Date: Tue, 28 May 2024 11:48:34 +0800 Subject: [PATCH 1/4] fix: update ts-gateway config --- .../src/main/resources/application.yml | 396 +++++++++--------- 1 file changed, 201 insertions(+), 195 deletions(-) diff --git a/chaos/train-ticket/ts-gateway-service/src/main/resources/application.yml b/chaos/train-ticket/ts-gateway-service/src/main/resources/application.yml index 298686b..d008a7e 100644 --- a/chaos/train-ticket/ts-gateway-service/src/main/resources/application.yml +++ b/chaos/train-ticket/ts-gateway-service/src/main/resources/application.yml @@ -1,205 +1,211 @@ # HTTP Server server: - port: 18888 # HTTP (Tomcat) port + port: 18888 # HTTP (Tomcat) port spring: main: web-application-type: reactive application: name: ts-gateway-service + cloud: gateway: routes: - - id: admin-basic-info - uri: lb://${ADMIN_BASIC_INFO_SERVICE_HOST:ts-admin-basic-info-service} - predicates: - - Path=/api/v1/adminbasicservice/** - - - id: admin-order - uri: lb://${ADMIN_ORDER_SERVICE_HOST:ts-admin-order-service} - predicates: - - Path=/api/v1/adminorderservice/** - - - id: admin-route - uri: lb://${ADMIN_ROUTE_SERVICE_HOST:ts-admin-route-service} - predicates: - - Path=/api/v1/adminrouteservice/** - - - id: admin-travel - uri: lb://${ADMIN_TRAVEL_SERVICE_HOST:ts-admin-travel-service} - predicates: - - Path=/api/v1/admintravelservice/** - - - id: admin-user - uri: lb://${ADMIN_USER_SERVICE_HOST:ts-admin-user-service} - predicates: - - Path=/api/v1/adminuserservice/users/** - - - id: assurance - uri: lb://${ASSURANCE_SERVICE_HOST:ts-assurance-service} - predicates: - - Path=/api/v1/assuranceservice/** - - - id: auth - uri: lb://${AUTH_SERVICE_HOST:ts-auth-service} - predicates: - - Path=/api/v1/auth/** - - - id: auth-user - uri: lb://${AUTH_SERVICE_HOST:ts-auth-service} - predicates: - - Path=/api/v1/users/** - - - id: avatar - uri: lb://${AVATAR_SERVICE_HOST:ts-avatar-service} - predicates: - - Path=/api/v1/avatar/** - - - id: basic - uri: lb://${BASIC_SERVICE_HOST:ts-basic-service} - predicates: - - Path=/api/v1/basicservice/** - - - id: cancel - uri: lb://${CANCEL_SERVICE_HOST:ts-cancel-service} - predicates: - - Path=/api/v1/cancelservice/** - - - id: config - uri: lb://${CONFIG_SERVICE_HOST:ts-config-service} - predicates: - - Path=/api/v1/configservice/** - - - id: consign-price - uri: lb://${CONSIGN_PRICE_SERVICE_HOST:ts-consign-price-service} - predicates: - - Path=/api/v1/consignpriceservice/** - - - id: consign - uri: lb://${CONSIGN_SERVICE_HOST:ts-consign-service} - predicates: - - Path=/api/v1/consignservice/** - - - id: contacts - uri: lb://${CONTACTS_SERVICE_HOST:ts-contacts-service} - predicates: - - Path=/api/v1/contactservice/** - - - id: execute - uri: lb://${EXECUTE_SERVICE_HOST:ts-execute-service} - predicates: - - Path=/api/v1/executeservice/** - - - id: food - uri: lb://${FOOD_SERVICE_HOST:ts-food-service} - predicates: - - Path=/api/v1/foodservice/** - - - id: inside-payment - uri: lb://${INSIDE_PAYMENT_SERVICE_HOST:ts-inside-payment-service} - predicates: - - Path=/api/v1/inside_pay_service/** - - - id: notification - uri: lb://${NOTIFICATION_SERVICE_HOST:ts-notification-service} - predicates: - - Path=/api/v1/notifyservice/** - - - id: order-other - uri: lb://${ORDER_OTHER_SERVICE_HOST:ts-order-other-service} - predicates: - - Path=/api/v1/orderOtherService/** - - - id: order - uri: lb://${ORDER_SERVICE_HOST:ts-order-service} - predicates: - - Path=/api/v1/orderservice/** - - - id: payment - uri: lb://${PAYMENT_SERVICE_HOST:ts-payment-service} - predicates: - - Path=/api/v1/paymentservice/** - - - id: preserve-other - uri: lb://${PRESERVE_OTHER_SERVICE_HOST:ts-preserve-other-service} - predicates: - - Path=/api/v1/preserveotherservice/** - - - id: preserve - uri: lb://${PRESERVE_SERVICE_HOST:ts-preserve-service} - predicates: - - Path=/api/v1/preserveservice/** - - - id: price - uri: lb://${PRICE_SERVICE_HOST:ts-price-service} - predicates: - - Path=/api/v1/priceservice/** - - - id: rebook - uri: lb://${REBOOK_SERVICE_HOST:ts-rebook-service} - predicates: - - Path=/api/v1/rebookservice/** - - - id: route-plan - uri: lb://${ROUTE_PLAN_SERVICE_HOST:ts-route-plan-service} - predicates: - - Path=/api/v1/routeplanservice/** - - - id: route - uri: lb://${ROUTE_SERVICE_HOST:ts-route-service} - predicates: - - Path=/api/v1/routeservice/** - - - id: seat - uri: lb://${SEAT_SERVICE_HOST:ts-seat-service} - predicates: - - Path=/api/v1/seatservice/** - - - id: security - uri: lb://${SECURITY_SERVICE_HOST:ts-security-service} - predicates: - - Path=/api/v1/securityservice/** - - - id: station-food - uri: lb://${STATION_FOOD_SERVICE_HOST:ts-station-food-service} - predicates: - - Path=/api/v1/stationfoodservice/** - - - id: station - uri: lb://${STATION_SERVICE_HOST:ts-station-service} - predicates: - - Path=/api/v1/stationservice/** - - - id: train-food - uri: lb://${TRAIN_FOOD_SERVICE_HOST:ts-train-food-service} - predicates: - - Path=/api/v1/trainfoodservice/** - - - id: train - uri: lb://${TRAIN_SERVICE_HOST:ts-train-service} - predicates: - - Path=/api/v1/trainservice/** - - - id: travel2 - uri: lb://${TRAVEL2_SERVICE_HOST:ts-travel2-service} - predicates: - - Path=/api/v1/travel2service/** - - - id: travel-plan - uri: lb://${TRAVEL_PLAN_SERVICE_HOST:ts-travel-plan-service} - predicates: - - Path=/api/v1/travelplanservice/** - - - id: travel - uri: lb://${TRAVEL_SERVICE_HOST:ts-travel-service} - predicates: - - Path=/api/v1/travelservice/** - - - id: user - uri: lb://${USER_SERVICE_HOST:ts-user-service} - predicates: - - Path=/api/v1/userservice/users/** - - - id: verification-code - uri: lb://${VERIFICATION_CODE_SERVICE_HOST:ts-verification-code-service} - predicates: - - Path=/api/v1/verifycode/** + - id: test + uri: http://www.baidu.com + predicates: + - Path=/s** + + - id: admin-basic-info + uri: http://${ADMIN_BASIC_INFO_SERVICE_HOST:ts-admin-basic-info-service:18767} + predicates: + - Path=/api/v1/adminbasicservice/** + + - id: admin-order + uri: http://${ADMIN_ORDER_SERVICE_HOST:ts-admin-order-service:16112} + predicates: + - Path=/api/v1/adminorderservice/** + + - id: admin-route + uri: http://${ADMIN_ROUTE_SERVICE_HOST:ts-admin-route-service} + predicates: + - Path=/api/v1/adminrouteservice/** + + - id: admin-travel + uri: http://${ADMIN_TRAVEL_SERVICE_HOST:ts-admin-travel-service:16114} + predicates: + - Path=/api/v1/admintravelservice/** + + - id: admin-user + uri: http://${ADMIN_USER_SERVICE_HOST:ts-admin-user-service:16115} + predicates: + - Path=/api/v1/adminuserservice/users/** + + - id: assurance + uri: http://${ASSURANCE_SERVICE_HOST:ts-assurance-service:18888} + predicates: + - Path=/api/v1/assuranceservice/** + + - id: auth + uri: http://${AUTH_SERVICE_HOST:ts-auth-service:12349} + predicates: + - Path=/api/v1/auth/** + + - id: auth-user + uri: http://${AUTH_SERVICE_HOST:ts-auth-service:12349} + predicates: + - Path=/api/v1/users/** + + - id: avatar + uri: http://${AVATAR_SERVICE_HOST:ts-avatar-service:17001} + predicates: + - Path=/api/v1/avatar/** + + - id: basic + uri: http://${BASIC_SERVICE_HOST:ts-basic-service:15680} + predicates: + - Path=/api/v1/basicservice/** + + - id: cancel + uri: http://${CANCEL_SERVICE_HOST:ts-cancel-service:18885} + predicates: + - Path=/api/v1/cancelservice/** + + - id: config + uri: http://${CONFIG_SERVICE_HOST:ts-config-service:15679} + predicates: + - Path=/api/v1/configservice/** + + - id: consign-price + uri: http://${CONSIGN_PRICE_SERVICE_HOST:ts-consign-price-service:16110} + predicates: + - Path=/api/v1/consignpriceservice/** + + - id: consign + uri: http://${CONSIGN_SERVICE_HOST:ts-consign-service:16111} + predicates: + - Path=/api/v1/consignservice/** + + - id: contacts + uri: http://${CONTACTS_SERVICE_HOST:ts-contacts-service:12347} + predicates: + - Path=/api/v1/contactservice/** + + - id: execute + uri: http://${EXECUTE_SERVICE_HOST:ts-execute-service:12386} + predicates: + - Path=/api/v1/executeservice/** + + - id: food + uri: http://${FOOD_SERVICE_HOST:ts-food-service:18856} + predicates: + - Path=/api/v1/foodservice/** + + - id: inside-payment + uri: http://${INSIDE_PAYMENT_SERVICE_HOST:ts-inside-payment-service:18673} + predicates: + - Path=/api/v1/inside_pay_service/** + + - id: notification + uri: http://${NOTIFICATION_SERVICE_HOST:ts-notification-service:17853} + predicates: + - Path=/api/v1/notifyservice/** + + - id: order-other + uri: http://${ORDER_OTHER_SERVICE_HOST:ts-order-other-service:12032} + predicates: + - Path=/api/v1/orderOtherService/** + + - id: order + uri: http://${ORDER_SERVICE_HOST:ts-order-service:12031} + predicates: + - Path=/api/v1/orderservice/** + + - id: payment + uri: http://${PAYMENT_SERVICE_HOST:ts-payment-service:19001} + predicates: + - Path=/api/v1/paymentservice/** + + - id: preserve-other + uri: http://${PRESERVE_OTHER_SERVICE_HOST:ts-preserve-other-service:14569} + predicates: + - Path=/api/v1/preserveotherservice/** + + - id: preserve + uri: http://${PRESERVE_SERVICE_HOST:ts-preserve-service:14568} + predicates: + - Path=/api/v1/preserveservice/** + + - id: price + uri: http://${PRICE_SERVICE_HOST:ts-price-service:16579} + predicates: + - Path=/api/v1/priceservice/** + + - id: rebook + uri: http://${REBOOK_SERVICE_HOST:ts-rebook-service:18886} + predicates: + - Path=/api/v1/rebookservice/** + + - id: route-plan + uri: http://${ROUTE_PLAN_SERVICE_HOST:ts-route-plan-service:14578} + predicates: + - Path=/api/v1/routeplanservice/** + + - id: route + uri: http://${ROUTE_SERVICE_HOST:ts-route-service:11178} + predicates: + - Path=/api/v1/routeservice/** + + - id: seat + uri: http://${SEAT_SERVICE_HOST:ts-seat-service:18898} + predicates: + - Path=/api/v1/seatservice/** + + - id: security + uri: http://${SECURITY_SERVICE_HOST:ts-security-service:11188} + predicates: + - Path=/api/v1/securityservice/** + + - id: station-food + uri: http://${STATION_FOOD_SERVICE_HOST:ts-station-food-service:18855} + predicates: + - Path=/api/v1/stationfoodservice/** + + - id: station + uri: http://${STATION_SERVICE_HOST:ts-station-service:12345} + predicates: + - Path=/api/v1/stationservice/** + + - id: train-food + uri: http://${TRAIN_FOOD_SERVICE_HOST:ts-train-food-service:19999} + predicates: + - Path=/api/v1/trainfoodservice/** + + - id: train + uri: http://${TRAIN_SERVICE_HOST:ts-train-service:14567} + predicates: + - Path=/api/v1/trainservice/** + + - id: travel2 + uri: http://${TRAVEL2_SERVICE_HOST:ts-travel2-service:16346} + predicates: + - Path=/api/v1/travel2service/** + + - id: travel-plan + uri: http://${TRAVEL_PLAN_SERVICE_HOST:ts-travel-plan-service:14322} + predicates: + - Path=/api/v1/travelplanservice/** + + - id: travel + uri: http://${TRAVEL_SERVICE_HOST:ts-travel-service:12346} + predicates: + - Path=/api/v1/travelservice/** + + - id: user + uri: http://${USER_SERVICE_HOST:ts-user-service:12346} + predicates: + - Path=/api/v1/userservice/users/** + + - id: verification-code + uri: http://${VERIFICATION_CODE_SERVICE_HOST:ts-verification-code-service:15678} + predicates: + - Path=/api/v1/verifycode/** -- Gitee From 09510ee5ead15183e50c4adef8e4de5fdb145e12 Mon Sep 17 00:00:00 2001 From: yunguannjg <18757593931@163.com> Date: Tue, 28 May 2024 12:10:17 +0800 Subject: [PATCH 2/4] fix: update ts-gateway configs --- .../ts-gateway-service/src/main/resources/application.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/chaos/train-ticket/ts-gateway-service/src/main/resources/application.yml b/chaos/train-ticket/ts-gateway-service/src/main/resources/application.yml index d008a7e..76f8bdf 100644 --- a/chaos/train-ticket/ts-gateway-service/src/main/resources/application.yml +++ b/chaos/train-ticket/ts-gateway-service/src/main/resources/application.yml @@ -10,11 +10,6 @@ spring: cloud: gateway: routes: - - id: test - uri: http://www.baidu.com - predicates: - - Path=/s** - - id: admin-basic-info uri: http://${ADMIN_BASIC_INFO_SERVICE_HOST:ts-admin-basic-info-service:18767} predicates: -- Gitee From b5a919dd432a37a31c0a90d364ec9e069699adc0 Mon Sep 17 00:00:00 2001 From: yunguannjg <18757593931@163.com> Date: Fri, 31 May 2024 14:52:36 +0800 Subject: [PATCH 3/4] fix: update template --- chaos/manifests/chaos-jmeter-deploy.yaml | 351 ++++++++++++++++++ .../deploy/chart/charts/mysql/values.yaml | 1 + .../charts/skywalking/templates/service.yaml | 19 + .../ts-admin-basic-info-service-deploy.yaml | 5 + .../ts-admin-order-service-deploy.yaml | 5 + .../ts-admin-route-service-deploy.yaml | 84 +++++ .../templates/ts-admin-route-service-svc.yaml | 13 + .../ts-admin-travel-service-deploy.yaml | 5 + .../ts-admin-user-service-deploy.yaml | 5 + .../ts-assurance-service-deploy.yaml | 5 + .../templates/ts-auth-service-deploy.yaml | 9 +- .../chart/templates/ts-auth-service-svc.yaml | 4 +- .../templates/ts-avatar-service-deploy.yaml | 5 + .../templates/ts-basic-service-deploy.yaml | 5 + .../templates/ts-cancel-service-deploy.yaml | 5 + .../templates/ts-config-service-deploy.yaml | 5 + .../ts-consign-price-service-deploy.yaml | 5 + .../templates/ts-consign-service-deploy.yaml | 5 + .../templates/ts-contacts-service-deploy.yaml | 5 + .../templates/ts-delivery-service-deploy.yaml | 9 +- .../templates/ts-delivery-service-svc.yaml | 4 +- .../templates/ts-execute-service-deploy.yaml | 5 + .../ts-food-delivery-service-deploy.yaml | 5 + .../templates/ts-food-service-deploy.yaml | 5 + .../templates/ts-gateway-service-deploy.yaml | 5 + .../ts-inside-payment-service-deploy.yaml | 5 + .../templates/ts-news-service-deploy.yaml | 5 + .../ts-notification-service-deploy.yaml | 5 + .../ts-order-other-service-deploy.yaml | 5 + .../templates/ts-order-service-deploy.yaml | 5 + .../templates/ts-payment-service-deploy.yaml | 5 + .../ts-preserve-other-service-deploy.yaml | 5 + .../templates/ts-preserve-service-deploy.yaml | 5 + .../templates/ts-price-service-deploy.yaml | 5 + .../templates/ts-rebook-service-deploy.yaml | 5 + .../ts-route-plan-service-deploy.yaml | 5 + .../templates/ts-route-service-deploy.yaml | 5 + .../templates/ts-seat-service-deploy.yaml | 5 + .../templates/ts-security-service-deploy.yaml | 5 + .../ts-station-food-service-deploy.yaml | 5 + .../templates/ts-station-service-deploy.yaml | 5 + .../ts-ticket-office-service-deploy.yaml | 5 + .../ts-train-food-service-deploy.yaml | 5 + .../templates/ts-train-service-deploy.yaml | 5 + .../ts-travel-plan-service-deploy.yaml | 5 + .../templates/ts-travel-service-deploy.yaml | 5 + .../templates/ts-travel2-service-deploy.yaml | 5 + .../templates/ts-user-service-deploy.yaml | 9 +- .../chart/templates/ts-user-service-svc.yaml | 4 +- .../ts-verification-code-service-deploy.yaml | 5 + .../templates/ts-voucher-service-deploy.yaml | 5 + .../ts-wait-order-service-deploy.yaml | 9 +- .../templates/ts-wait-order-service-svc.yaml | 4 +- .../chart/templates/tsdb-mysql-secret.yaml | 2 +- .../edu/fudan/common/config/ServiceURL.java | 14 +- 55 files changed, 710 insertions(+), 26 deletions(-) create mode 100644 chaos/manifests/chaos-jmeter-deploy.yaml create mode 100644 chaos/train-ticket/deploy/chart/charts/skywalking/templates/service.yaml create mode 100644 chaos/train-ticket/deploy/chart/templates/ts-admin-route-service-deploy.yaml create mode 100644 chaos/train-ticket/deploy/chart/templates/ts-admin-route-service-svc.yaml diff --git a/chaos/manifests/chaos-jmeter-deploy.yaml b/chaos/manifests/chaos-jmeter-deploy.yaml new file mode 100644 index 0000000..d742200 --- /dev/null +++ b/chaos/manifests/chaos-jmeter-deploy.yaml @@ -0,0 +1,351 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: chaos-jmeter + namespace: chaos-injection + labels: + app: chaos-backend-jmeter +spec: + replicas: 1 + selector: + matchLabels: + app: jmeter + template: + metadata: + labels: + app: jmeter + spec: + volumes: + - name: jmx-script + configMap: + name: jmeter-jmx + defaultMode: 420 + containers: + - name: jmeter + image: registry.cn-beijing.aliyuncs.com/train_ticket/jmeter:v1.0 + args: + - '-n' + - '-t' + - /script/train-ticket.jmx + env: + - name: TZ + value: Asia/Shanghai + resources: + limits: + memory: 1Gi + cpu: 1 + requests: + memory: 30Mi + cpu: 200m + volumeMounts: + - name: jmx-script + readOnly: true + mountPath: /script + terminationMessagePath: /dev/termination-log + terminationMessagePolicy: File + imagePullPolicy: IfNotPresent + +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: jmeter-jmx + namespace: chaos-injection +data: + train-ticket.jmx: | + + + + + false + false + false + + + + + + + false + + saveConfig + + + true + true + true + + true + true + true + true + false + true + true + false + false + false + true + false + false + false + true + 0 + true + true + true + true + true + true + + + + + + + false + + saveConfig + + + true + true + true + + true + true + true + true + false + true + true + false + false + false + true + false + false + false + true + 0 + true + true + true + true + true + true + + + + + + + continue + + -1 + false + + 10 + 1 + false + false + + + false + + + + 2 + + throughput + 240 + 0.0 + + + + + true + + + + false + {"startPlace":"Shang Hai","endPlace":"Su Zhou","departureTime":"${__time(yyyy-MM-dd,)} 00:00:00"} + = + + + + ts-gateway-service.train-ticket + 18888 + http + /api/v1/travelservice/trips/left + POST + true + false + true + false + false + false + false + 6 + false + 0 + 1000 + 30000 + + + + + + Accept + application/json, text/javascript, */*; q=0.01 + + + Accept-Encoding + gzip, deflate + + + Accept-Language + zh-CN,zh;q=0.9,en-US;q=0.8,en;q=0.7,ko;q=0.6 + + + Cache-Control + no-cache + + + Connection + keep-alive + + + Content-Length + 85 + + + Content-Type + application/json + + + Cookie + YsbCaptcha=17941E778C24472AB14DDAA40BD354AC; JSESSIONID=8BD9189A72C3D90010D4A46CE513513E + + + Pragma + no-cache + + + User-Agent + Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/116.0.0.0 Safari/537.36 + + + X-Requested-With + XMLHttpRequest + + + + + + + + continue + + -1 + false + + 1 + 1 + false + false + + 3 + false + + + + 2 + + throughput + 60 + 0.0 + + + + + true + + + + false + {"startPlace": "Nan Jing","endPlace": "Shang Hai","departureTime": "${__time(yyyy-MM-dd,)} 00:00:00"} + = + + + + ts-gateway-service.train-ticket + 18888 + http + /api/v1/travelplanservice/travelPlan/cheapest + POST + true + false + true + false + false + false + false + 6 + false + 0 + 1000 + 30000 + + + + + + Accept + application/json, text/javascript, */*; q=0.01 + + + Accept-Encoding + gzip, deflate + + + Accept-Language + zh-CN,zh;q=0.9,en-US;q=0.8,en;q=0.7,ko;q=0.6 + + + Cache-Control + no-cache + + + Connection + keep-alive + + + Content-Length + 86 + + + Content-Type + application/json + + + Pragma + no-cache + + + User-Agent + Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/116.0.0.0 Safari/537.36 + + + X-Requested-With + XMLHttpRequest + + + + + + + + + + diff --git a/chaos/train-ticket/deploy/chart/charts/mysql/values.yaml b/chaos/train-ticket/deploy/chart/charts/mysql/values.yaml index 5301a5f..1cd5bfb 100644 --- a/chaos/train-ticket/deploy/chart/charts/mysql/values.yaml +++ b/chaos/train-ticket/deploy/chart/charts/mysql/values.yaml @@ -219,6 +219,7 @@ slave: log-error=/opt/bitnami/mysql/logs/mysqld.log character-set-server=UTF8 collation-server=utf8_general_ci + max_connections = 65535 [client] port=3306 diff --git a/chaos/train-ticket/deploy/chart/charts/skywalking/templates/service.yaml b/chaos/train-ticket/deploy/chart/charts/skywalking/templates/service.yaml new file mode 100644 index 0000000..9cb052d --- /dev/null +++ b/chaos/train-ticket/deploy/chart/charts/skywalking/templates/service.yaml @@ -0,0 +1,19 @@ +apiVersion: v1 +kind: Service +metadata: + name: skywalking + labels: + app: skywalking +spec: + ports: + - name: http + protocol: TCP + port: 12800 + targetPort: 12800 + - name: grpc + protocol: TCP + port: 11800 + targetPort: 11800 + selector: + app: skywalking + type: ClusterIP \ No newline at end of file diff --git a/chaos/train-ticket/deploy/chart/templates/ts-admin-basic-info-service-deploy.yaml b/chaos/train-ticket/deploy/chart/templates/ts-admin-basic-info-service-deploy.yaml index e7ee2a6..b9a1b89 100644 --- a/chaos/train-ticket/deploy/chart/templates/ts-admin-basic-info-service-deploy.yaml +++ b/chaos/train-ticket/deploy/chart/templates/ts-admin-basic-info-service-deploy.yaml @@ -15,6 +15,8 @@ spec: volumes: - name: skywalking-agent emptyDir: {} + - name: logs + emptyDir: {} initContainers: - name: add-sw-agent image: apache/skywalking-java-agent:8.8.0-alpine @@ -33,6 +35,7 @@ spec: containers: - name: ts-admin-basic-info-service image: "{{ .Values.image.repository }}/ts-admin-basic-info-service:{{ .Values.image.imageTag }}" + imagePullPolicy: Always ports: - containerPort: 18767 protocol: TCP @@ -68,6 +71,8 @@ spec: volumeMounts: - name: skywalking-agent mountPath: /skywalking + - name: logs + mountPath: /logs readinessProbe: tcpSocket: port: 18767 diff --git a/chaos/train-ticket/deploy/chart/templates/ts-admin-order-service-deploy.yaml b/chaos/train-ticket/deploy/chart/templates/ts-admin-order-service-deploy.yaml index 333bba7..d873138 100644 --- a/chaos/train-ticket/deploy/chart/templates/ts-admin-order-service-deploy.yaml +++ b/chaos/train-ticket/deploy/chart/templates/ts-admin-order-service-deploy.yaml @@ -15,6 +15,8 @@ spec: volumes: - name: skywalking-agent emptyDir: {} + - name: logs + emptyDir: {} initContainers: - name: add-sw-agent image: apache/skywalking-java-agent:8.8.0-alpine @@ -33,6 +35,7 @@ spec: containers: - name: ts-admin-order-service image: "{{ .Values.image.repository }}/ts-admin-order-service:{{ .Values.image.imageTag }}" + imagePullPolicy: Always ports: - containerPort: 16112 protocol: TCP @@ -68,6 +71,8 @@ spec: volumeMounts: - name: skywalking-agent mountPath: /skywalking + - name: logs + mountPath: /logs readinessProbe: tcpSocket: port: 16112 diff --git a/chaos/train-ticket/deploy/chart/templates/ts-admin-route-service-deploy.yaml b/chaos/train-ticket/deploy/chart/templates/ts-admin-route-service-deploy.yaml new file mode 100644 index 0000000..626de66 --- /dev/null +++ b/chaos/train-ticket/deploy/chart/templates/ts-admin-route-service-deploy.yaml @@ -0,0 +1,84 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: ts-admin-route-service +spec: + replicas: 1 + selector: + matchLabels: + app: ts-admin-route-service + template: + metadata: + labels: + app: ts-admin-route-service + spec: + volumes: + - name: skywalking-agent + emptyDir: {} + - name: logs + emptyDir: {} + initContainers: + - name: add-sw-agent + image: apache/skywalking-java-agent:8.8.0-alpine + command: + - /bin/sh + args: + - '-c' + - cp -R /skywalking/agent /agent/ + resources: {} + volumeMounts: + - name: skywalking-agent + mountPath: /agent + terminationMessagePath: /dev/termination-log + terminationMessagePolicy: File + imagePullPolicy: IfNotPresent + containers: + - name: ts-admin-route-service + image: "{{ .Values.image.repository }}/ts-admin-route-service:{{ .Values.image.imageTag }}" + imagePullPolicy: Always + ports: + - containerPort: 16113 + protocol: TCP + envFrom: + - secretRef: + name: tsdb-mysql + env: + - name: NODE_IP + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: status.hostIP + - name: SW_AGENT_COLLECTOR_BACKEND_SERVICES + value: skywalking:11800 + - name: SW_GRPC_LOG_SERVER_HOST + value: skywalking + - name: SW_GRPC_LOG_SERVER_PORT + value: '11800' + - name: SW_AGENT_NAME + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.labels['app'] + - name: JAVA_TOOL_OPTIONS + value: "-javaagent:/skywalking/agent/skywalking-agent.jar" + resources: + limits: + cpu: 500m + memory: 2000Mi + requests: + cpu: 100m + memory: 300Mi + volumeMounts: + - name: skywalking-agent + mountPath: /skywalking + - name: logs + mountPath: /logs + readinessProbe: + tcpSocket: + port: 16113 + initialDelaySeconds: 60 + timeoutSeconds: 5 + periodSeconds: 10 + successThreshold: 1 + failureThreshold: 3 + imagePullPolicy: IfNotPresent diff --git a/chaos/train-ticket/deploy/chart/templates/ts-admin-route-service-svc.yaml b/chaos/train-ticket/deploy/chart/templates/ts-admin-route-service-svc.yaml new file mode 100644 index 0000000..21767c7 --- /dev/null +++ b/chaos/train-ticket/deploy/chart/templates/ts-admin-route-service-svc.yaml @@ -0,0 +1,13 @@ +apiVersion: v1 +kind: Service +metadata: + name: ts-admin-route-service +spec: + ports: + - name: http + protocol: TCP + port: 16113 + targetPort: 16113 + selector: + app: ts-admin-route-service + type: ClusterIP diff --git a/chaos/train-ticket/deploy/chart/templates/ts-admin-travel-service-deploy.yaml b/chaos/train-ticket/deploy/chart/templates/ts-admin-travel-service-deploy.yaml index 293ec54..315b106 100644 --- a/chaos/train-ticket/deploy/chart/templates/ts-admin-travel-service-deploy.yaml +++ b/chaos/train-ticket/deploy/chart/templates/ts-admin-travel-service-deploy.yaml @@ -15,6 +15,8 @@ spec: volumes: - name: skywalking-agent emptyDir: {} + - name: logs + emptyDir: {} initContainers: - name: add-sw-agent image: apache/skywalking-java-agent:8.8.0-alpine @@ -33,6 +35,7 @@ spec: containers: - name: ts-admin-travel-service image: "{{ .Values.image.repository }}/ts-admin-travel-service:{{ .Values.image.imageTag }}" + imagePullPolicy: Always ports: - containerPort: 16114 protocol: TCP @@ -68,6 +71,8 @@ spec: volumeMounts: - name: skywalking-agent mountPath: /skywalking + - name: logs + mountPath: /logs readinessProbe: tcpSocket: port: 16114 diff --git a/chaos/train-ticket/deploy/chart/templates/ts-admin-user-service-deploy.yaml b/chaos/train-ticket/deploy/chart/templates/ts-admin-user-service-deploy.yaml index b9ddbf5..e348002 100644 --- a/chaos/train-ticket/deploy/chart/templates/ts-admin-user-service-deploy.yaml +++ b/chaos/train-ticket/deploy/chart/templates/ts-admin-user-service-deploy.yaml @@ -15,6 +15,8 @@ spec: volumes: - name: skywalking-agent emptyDir: {} + - name: logs + emptyDir: {} initContainers: - name: add-sw-agent image: apache/skywalking-java-agent:8.8.0-alpine @@ -33,6 +35,7 @@ spec: containers: - name: ts-admin-user-service image: "{{ .Values.image.repository }}/ts-admin-user-service:{{ .Values.image.imageTag }}" + imagePullPolicy: Always ports: - containerPort: 16115 protocol: TCP @@ -68,6 +71,8 @@ spec: volumeMounts: - name: skywalking-agent mountPath: /skywalking + - name: logs + mountPath: /logs readinessProbe: tcpSocket: port: 16115 diff --git a/chaos/train-ticket/deploy/chart/templates/ts-assurance-service-deploy.yaml b/chaos/train-ticket/deploy/chart/templates/ts-assurance-service-deploy.yaml index 738beeb..e94f561 100644 --- a/chaos/train-ticket/deploy/chart/templates/ts-assurance-service-deploy.yaml +++ b/chaos/train-ticket/deploy/chart/templates/ts-assurance-service-deploy.yaml @@ -15,6 +15,8 @@ spec: volumes: - name: skywalking-agent emptyDir: {} + - name: logs + emptyDir: {} initContainers: - name: add-sw-agent image: apache/skywalking-java-agent:8.8.0-alpine @@ -33,6 +35,7 @@ spec: containers: - name: ts-assurance-service image: "{{ .Values.image.repository }}/ts-assurance-service:{{ .Values.image.imageTag }}" + imagePullPolicy: Always ports: - containerPort: 18888 protocol: TCP @@ -68,6 +71,8 @@ spec: volumeMounts: - name: skywalking-agent mountPath: /skywalking + - name: logs + mountPath: /logs readinessProbe: tcpSocket: port: 18888 diff --git a/chaos/train-ticket/deploy/chart/templates/ts-auth-service-deploy.yaml b/chaos/train-ticket/deploy/chart/templates/ts-auth-service-deploy.yaml index b51cfbf..a4307c2 100644 --- a/chaos/train-ticket/deploy/chart/templates/ts-auth-service-deploy.yaml +++ b/chaos/train-ticket/deploy/chart/templates/ts-auth-service-deploy.yaml @@ -15,6 +15,8 @@ spec: volumes: - name: skywalking-agent emptyDir: {} + - name: logs + emptyDir: {} initContainers: - name: add-sw-agent image: apache/skywalking-java-agent:8.8.0-alpine @@ -33,8 +35,9 @@ spec: containers: - name: ts-auth-service image: "{{ .Values.image.repository }}/ts-auth-service:{{ .Values.image.imageTag }}" + imagePullPolicy: Always ports: - - containerPort: 12349 + - containerPort: 12340 protocol: TCP envFrom: - secretRef: @@ -68,9 +71,11 @@ spec: volumeMounts: - name: skywalking-agent mountPath: /skywalking + - name: logs + mountPath: /logs readinessProbe: tcpSocket: - port: 12349 + port: 12340 initialDelaySeconds: 60 timeoutSeconds: 5 periodSeconds: 10 diff --git a/chaos/train-ticket/deploy/chart/templates/ts-auth-service-svc.yaml b/chaos/train-ticket/deploy/chart/templates/ts-auth-service-svc.yaml index 9b97fd5..e36ef56 100644 --- a/chaos/train-ticket/deploy/chart/templates/ts-auth-service-svc.yaml +++ b/chaos/train-ticket/deploy/chart/templates/ts-auth-service-svc.yaml @@ -6,8 +6,8 @@ spec: ports: - name: http protocol: TCP - port: 12349 - targetPort: 12349 + port: 12340 + targetPort: 12340 selector: app: ts-auth-service type: ClusterIP diff --git a/chaos/train-ticket/deploy/chart/templates/ts-avatar-service-deploy.yaml b/chaos/train-ticket/deploy/chart/templates/ts-avatar-service-deploy.yaml index 824a3b5..3f901bb 100644 --- a/chaos/train-ticket/deploy/chart/templates/ts-avatar-service-deploy.yaml +++ b/chaos/train-ticket/deploy/chart/templates/ts-avatar-service-deploy.yaml @@ -15,6 +15,8 @@ spec: volumes: - name: skywalking-agent emptyDir: {} + - name: logs + emptyDir: {} initContainers: - name: add-sw-agent image: apache/skywalking-java-agent:8.8.0-alpine @@ -33,6 +35,7 @@ spec: containers: - name: ts-avatar-service image: "{{ .Values.image.repository }}/ts-avatar-service:{{ .Values.image.imageTag }}" + imagePullPolicy: Always ports: - containerPort: 17001 protocol: TCP @@ -68,6 +71,8 @@ spec: volumeMounts: - name: skywalking-agent mountPath: /skywalking + - name: logs + mountPath: /logs readinessProbe: tcpSocket: port: 17001 diff --git a/chaos/train-ticket/deploy/chart/templates/ts-basic-service-deploy.yaml b/chaos/train-ticket/deploy/chart/templates/ts-basic-service-deploy.yaml index cfc534b..93db14f 100644 --- a/chaos/train-ticket/deploy/chart/templates/ts-basic-service-deploy.yaml +++ b/chaos/train-ticket/deploy/chart/templates/ts-basic-service-deploy.yaml @@ -15,6 +15,8 @@ spec: volumes: - name: skywalking-agent emptyDir: {} + - name: logs + emptyDir: {} initContainers: - name: add-sw-agent image: apache/skywalking-java-agent:8.8.0-alpine @@ -33,6 +35,7 @@ spec: containers: - name: ts-basic-service image: "{{ .Values.image.repository }}/ts-basic-service:{{ .Values.image.imageTag }}" + imagePullPolicy: Always ports: - containerPort: 15680 protocol: TCP @@ -68,6 +71,8 @@ spec: volumeMounts: - name: skywalking-agent mountPath: /skywalking + - name: logs + mountPath: /logs readinessProbe: tcpSocket: port: 15680 diff --git a/chaos/train-ticket/deploy/chart/templates/ts-cancel-service-deploy.yaml b/chaos/train-ticket/deploy/chart/templates/ts-cancel-service-deploy.yaml index 15a099b..89ebe1b 100644 --- a/chaos/train-ticket/deploy/chart/templates/ts-cancel-service-deploy.yaml +++ b/chaos/train-ticket/deploy/chart/templates/ts-cancel-service-deploy.yaml @@ -15,6 +15,8 @@ spec: volumes: - name: skywalking-agent emptyDir: {} + - name: logs + emptyDir: {} initContainers: - name: add-sw-agent image: apache/skywalking-java-agent:8.8.0-alpine @@ -33,6 +35,7 @@ spec: containers: - name: ts-cancel-service image: "{{ .Values.image.repository }}/ts-cancel-service:{{ .Values.image.imageTag }}" + imagePullPolicy: Always ports: - containerPort: 18885 protocol: TCP @@ -68,6 +71,8 @@ spec: volumeMounts: - name: skywalking-agent mountPath: /skywalking + - name: logs + mountPath: /logs readinessProbe: tcpSocket: port: 18885 diff --git a/chaos/train-ticket/deploy/chart/templates/ts-config-service-deploy.yaml b/chaos/train-ticket/deploy/chart/templates/ts-config-service-deploy.yaml index 9d9175b..43e7a5d 100644 --- a/chaos/train-ticket/deploy/chart/templates/ts-config-service-deploy.yaml +++ b/chaos/train-ticket/deploy/chart/templates/ts-config-service-deploy.yaml @@ -15,6 +15,8 @@ spec: volumes: - name: skywalking-agent emptyDir: {} + - name: logs + emptyDir: {} initContainers: - name: add-sw-agent image: apache/skywalking-java-agent:8.8.0-alpine @@ -33,6 +35,7 @@ spec: containers: - name: ts-config-service image: "{{ .Values.image.repository }}/ts-config-service:{{ .Values.image.imageTag }}" + imagePullPolicy: Always ports: - containerPort: 15679 protocol: TCP @@ -68,6 +71,8 @@ spec: volumeMounts: - name: skywalking-agent mountPath: /skywalking + - name: logs + mountPath: /logs readinessProbe: tcpSocket: port: 15679 diff --git a/chaos/train-ticket/deploy/chart/templates/ts-consign-price-service-deploy.yaml b/chaos/train-ticket/deploy/chart/templates/ts-consign-price-service-deploy.yaml index 2655cc5..c5f8cae 100644 --- a/chaos/train-ticket/deploy/chart/templates/ts-consign-price-service-deploy.yaml +++ b/chaos/train-ticket/deploy/chart/templates/ts-consign-price-service-deploy.yaml @@ -15,6 +15,8 @@ spec: volumes: - name: skywalking-agent emptyDir: {} + - name: logs + emptyDir: {} initContainers: - name: add-sw-agent image: apache/skywalking-java-agent:8.8.0-alpine @@ -33,6 +35,7 @@ spec: containers: - name: ts-consign-price-service image: "{{ .Values.image.repository }}/ts-consign-price-service:{{ .Values.image.imageTag }}" + imagePullPolicy: Always ports: - containerPort: 16110 protocol: TCP @@ -68,6 +71,8 @@ spec: volumeMounts: - name: skywalking-agent mountPath: /skywalking + - name: logs + mountPath: /logs readinessProbe: tcpSocket: port: 16110 diff --git a/chaos/train-ticket/deploy/chart/templates/ts-consign-service-deploy.yaml b/chaos/train-ticket/deploy/chart/templates/ts-consign-service-deploy.yaml index f2ec56d..95a5d6c 100644 --- a/chaos/train-ticket/deploy/chart/templates/ts-consign-service-deploy.yaml +++ b/chaos/train-ticket/deploy/chart/templates/ts-consign-service-deploy.yaml @@ -15,6 +15,8 @@ spec: volumes: - name: skywalking-agent emptyDir: {} + - name: logs + emptyDir: {} initContainers: - name: add-sw-agent image: apache/skywalking-java-agent:8.8.0-alpine @@ -33,6 +35,7 @@ spec: containers: - name: ts-consign-service image: "{{ .Values.image.repository }}/ts-consign-service:{{ .Values.image.imageTag }}" + imagePullPolicy: Always ports: - containerPort: 16111 protocol: TCP @@ -68,6 +71,8 @@ spec: volumeMounts: - name: skywalking-agent mountPath: /skywalking + - name: logs + mountPath: /logs readinessProbe: tcpSocket: port: 16111 diff --git a/chaos/train-ticket/deploy/chart/templates/ts-contacts-service-deploy.yaml b/chaos/train-ticket/deploy/chart/templates/ts-contacts-service-deploy.yaml index d9c0c3b..023a107 100644 --- a/chaos/train-ticket/deploy/chart/templates/ts-contacts-service-deploy.yaml +++ b/chaos/train-ticket/deploy/chart/templates/ts-contacts-service-deploy.yaml @@ -15,6 +15,8 @@ spec: volumes: - name: skywalking-agent emptyDir: {} + - name: logs + emptyDir: {} initContainers: - name: add-sw-agent image: apache/skywalking-java-agent:8.8.0-alpine @@ -33,6 +35,7 @@ spec: containers: - name: ts-contacts-service image: "{{ .Values.image.repository }}/ts-contacts-service:{{ .Values.image.imageTag }}" + imagePullPolicy: Always ports: - containerPort: 12347 protocol: TCP @@ -68,6 +71,8 @@ spec: volumeMounts: - name: skywalking-agent mountPath: /skywalking + - name: logs + mountPath: /logs readinessProbe: tcpSocket: port: 12347 diff --git a/chaos/train-ticket/deploy/chart/templates/ts-delivery-service-deploy.yaml b/chaos/train-ticket/deploy/chart/templates/ts-delivery-service-deploy.yaml index bf514c1..1e28a60 100644 --- a/chaos/train-ticket/deploy/chart/templates/ts-delivery-service-deploy.yaml +++ b/chaos/train-ticket/deploy/chart/templates/ts-delivery-service-deploy.yaml @@ -15,6 +15,8 @@ spec: volumes: - name: skywalking-agent emptyDir: {} + - name: logs + emptyDir: {} initContainers: - name: add-sw-agent image: apache/skywalking-java-agent:8.8.0-alpine @@ -33,8 +35,9 @@ spec: containers: - name: ts-delivery-service image: "{{ .Values.image.repository }}/ts-delivery-service:{{ .Values.image.imageTag }}" + imagePullPolicy: Always ports: - - containerPort: 18856 + - containerPort: 18808 protocol: TCP envFrom: - secretRef: @@ -68,9 +71,11 @@ spec: volumeMounts: - name: skywalking-agent mountPath: /skywalking + - name: logs + mountPath: /logs readinessProbe: tcpSocket: - port: 18856 + port: 18808 initialDelaySeconds: 60 timeoutSeconds: 5 periodSeconds: 10 diff --git a/chaos/train-ticket/deploy/chart/templates/ts-delivery-service-svc.yaml b/chaos/train-ticket/deploy/chart/templates/ts-delivery-service-svc.yaml index 2cea827..19ec831 100644 --- a/chaos/train-ticket/deploy/chart/templates/ts-delivery-service-svc.yaml +++ b/chaos/train-ticket/deploy/chart/templates/ts-delivery-service-svc.yaml @@ -6,8 +6,8 @@ spec: ports: - name: http protocol: TCP - port: 18856 - targetPort: 18856 + port: 18808 + targetPort: 18808 selector: app: ts-delivery-service type: ClusterIP diff --git a/chaos/train-ticket/deploy/chart/templates/ts-execute-service-deploy.yaml b/chaos/train-ticket/deploy/chart/templates/ts-execute-service-deploy.yaml index c8b8371..21eec68 100644 --- a/chaos/train-ticket/deploy/chart/templates/ts-execute-service-deploy.yaml +++ b/chaos/train-ticket/deploy/chart/templates/ts-execute-service-deploy.yaml @@ -15,6 +15,8 @@ spec: volumes: - name: skywalking-agent emptyDir: {} + - name: logs + emptyDir: {} initContainers: - name: add-sw-agent image: apache/skywalking-java-agent:8.8.0-alpine @@ -33,6 +35,7 @@ spec: containers: - name: ts-execute-service image: "{{ .Values.image.repository }}/ts-execute-service:{{ .Values.image.imageTag }}" + imagePullPolicy: Always ports: - containerPort: 12386 protocol: TCP @@ -68,6 +71,8 @@ spec: volumeMounts: - name: skywalking-agent mountPath: /skywalking + - name: logs + mountPath: /logs readinessProbe: tcpSocket: port: 12386 diff --git a/chaos/train-ticket/deploy/chart/templates/ts-food-delivery-service-deploy.yaml b/chaos/train-ticket/deploy/chart/templates/ts-food-delivery-service-deploy.yaml index 44cd3fb..ee178f0 100644 --- a/chaos/train-ticket/deploy/chart/templates/ts-food-delivery-service-deploy.yaml +++ b/chaos/train-ticket/deploy/chart/templates/ts-food-delivery-service-deploy.yaml @@ -15,6 +15,8 @@ spec: volumes: - name: skywalking-agent emptyDir: {} + - name: logs + emptyDir: {} initContainers: - name: add-sw-agent image: apache/skywalking-java-agent:8.8.0-alpine @@ -33,6 +35,7 @@ spec: containers: - name: ts-food-delivery-service image: "{{ .Values.image.repository }}/ts-food-delivery-service:{{ .Values.image.imageTag }}" + imagePullPolicy: Always ports: - containerPort: 18957 protocol: TCP @@ -68,6 +71,8 @@ spec: volumeMounts: - name: skywalking-agent mountPath: /skywalking + - name: logs + mountPath: /logs readinessProbe: tcpSocket: port: 18957 diff --git a/chaos/train-ticket/deploy/chart/templates/ts-food-service-deploy.yaml b/chaos/train-ticket/deploy/chart/templates/ts-food-service-deploy.yaml index 2e6976f..da74ae5 100644 --- a/chaos/train-ticket/deploy/chart/templates/ts-food-service-deploy.yaml +++ b/chaos/train-ticket/deploy/chart/templates/ts-food-service-deploy.yaml @@ -15,6 +15,8 @@ spec: volumes: - name: skywalking-agent emptyDir: {} + - name: logs + emptyDir: {} initContainers: - name: add-sw-agent image: apache/skywalking-java-agent:8.8.0-alpine @@ -33,6 +35,7 @@ spec: containers: - name: ts-food-service image: "{{ .Values.image.repository }}/ts-food-service:{{ .Values.image.imageTag }}" + imagePullPolicy: Always ports: - containerPort: 18856 protocol: TCP @@ -68,6 +71,8 @@ spec: volumeMounts: - name: skywalking-agent mountPath: /skywalking + - name: logs + mountPath: /logs readinessProbe: tcpSocket: port: 18856 diff --git a/chaos/train-ticket/deploy/chart/templates/ts-gateway-service-deploy.yaml b/chaos/train-ticket/deploy/chart/templates/ts-gateway-service-deploy.yaml index 7f3b92b..22b9fd7 100644 --- a/chaos/train-ticket/deploy/chart/templates/ts-gateway-service-deploy.yaml +++ b/chaos/train-ticket/deploy/chart/templates/ts-gateway-service-deploy.yaml @@ -15,6 +15,8 @@ spec: volumes: - name: skywalking-agent emptyDir: {} + - name: logs + emptyDir: {} initContainers: - name: add-sw-agent image: apache/skywalking-java-agent:8.8.0-alpine @@ -33,6 +35,7 @@ spec: containers: - name: ts-gateway-service image: "{{ .Values.image.repository }}/ts-gateway-service:{{ .Values.image.imageTag }}" + imagePullPolicy: Always ports: - containerPort: 18888 protocol: TCP @@ -68,6 +71,8 @@ spec: volumeMounts: - name: skywalking-agent mountPath: /skywalking + - name: logs + mountPath: /logs readinessProbe: tcpSocket: port: 18888 diff --git a/chaos/train-ticket/deploy/chart/templates/ts-inside-payment-service-deploy.yaml b/chaos/train-ticket/deploy/chart/templates/ts-inside-payment-service-deploy.yaml index 251a272..96a975a 100644 --- a/chaos/train-ticket/deploy/chart/templates/ts-inside-payment-service-deploy.yaml +++ b/chaos/train-ticket/deploy/chart/templates/ts-inside-payment-service-deploy.yaml @@ -15,6 +15,8 @@ spec: volumes: - name: skywalking-agent emptyDir: {} + - name: logs + emptyDir: {} initContainers: - name: add-sw-agent image: apache/skywalking-java-agent:8.8.0-alpine @@ -33,6 +35,7 @@ spec: containers: - name: ts-inside-payment-service image: "{{ .Values.image.repository }}/ts-inside-payment-service:{{ .Values.image.imageTag }}" + imagePullPolicy: Always ports: - containerPort: 18673 protocol: TCP @@ -68,6 +71,8 @@ spec: volumeMounts: - name: skywalking-agent mountPath: /skywalking + - name: logs + mountPath: /logs readinessProbe: tcpSocket: port: 18673 diff --git a/chaos/train-ticket/deploy/chart/templates/ts-news-service-deploy.yaml b/chaos/train-ticket/deploy/chart/templates/ts-news-service-deploy.yaml index e3d96bc..0b98700 100644 --- a/chaos/train-ticket/deploy/chart/templates/ts-news-service-deploy.yaml +++ b/chaos/train-ticket/deploy/chart/templates/ts-news-service-deploy.yaml @@ -15,6 +15,8 @@ spec: volumes: - name: skywalking-agent emptyDir: {} + - name: logs + emptyDir: {} initContainers: - name: add-sw-agent image: apache/skywalking-java-agent:8.8.0-alpine @@ -33,6 +35,7 @@ spec: containers: - name: ts-news-service image: "{{ .Values.image.repository }}/ts-news-service:{{ .Values.image.imageTag }}" + imagePullPolicy: Always ports: - containerPort: 12862 protocol: TCP @@ -68,6 +71,8 @@ spec: volumeMounts: - name: skywalking-agent mountPath: /skywalking + - name: logs + mountPath: /logs readinessProbe: tcpSocket: port: 12862 diff --git a/chaos/train-ticket/deploy/chart/templates/ts-notification-service-deploy.yaml b/chaos/train-ticket/deploy/chart/templates/ts-notification-service-deploy.yaml index 8b2a6f3..6cf69e2 100644 --- a/chaos/train-ticket/deploy/chart/templates/ts-notification-service-deploy.yaml +++ b/chaos/train-ticket/deploy/chart/templates/ts-notification-service-deploy.yaml @@ -15,6 +15,8 @@ spec: volumes: - name: skywalking-agent emptyDir: {} + - name: logs + emptyDir: {} initContainers: - name: add-sw-agent image: apache/skywalking-java-agent:8.8.0-alpine @@ -33,6 +35,7 @@ spec: containers: - name: ts-notification-service image: "{{ .Values.image.repository }}/ts-notification-service:{{ .Values.image.imageTag }}" + imagePullPolicy: Always ports: - containerPort: 17853 protocol: TCP @@ -68,6 +71,8 @@ spec: volumeMounts: - name: skywalking-agent mountPath: /skywalking + - name: logs + mountPath: /logs readinessProbe: tcpSocket: port: 17853 diff --git a/chaos/train-ticket/deploy/chart/templates/ts-order-other-service-deploy.yaml b/chaos/train-ticket/deploy/chart/templates/ts-order-other-service-deploy.yaml index 298485b..ad585d2 100644 --- a/chaos/train-ticket/deploy/chart/templates/ts-order-other-service-deploy.yaml +++ b/chaos/train-ticket/deploy/chart/templates/ts-order-other-service-deploy.yaml @@ -15,6 +15,8 @@ spec: volumes: - name: skywalking-agent emptyDir: {} + - name: logs + emptyDir: {} initContainers: - name: add-sw-agent image: apache/skywalking-java-agent:8.8.0-alpine @@ -33,6 +35,7 @@ spec: containers: - name: ts-order-other-service image: "{{ .Values.image.repository }}/ts-order-other-service:{{ .Values.image.imageTag }}" + imagePullPolicy: Always ports: - containerPort: 12032 protocol: TCP @@ -68,6 +71,8 @@ spec: volumeMounts: - name: skywalking-agent mountPath: /skywalking + - name: logs + mountPath: /logs readinessProbe: tcpSocket: port: 12032 diff --git a/chaos/train-ticket/deploy/chart/templates/ts-order-service-deploy.yaml b/chaos/train-ticket/deploy/chart/templates/ts-order-service-deploy.yaml index f2c32eb..685b175 100644 --- a/chaos/train-ticket/deploy/chart/templates/ts-order-service-deploy.yaml +++ b/chaos/train-ticket/deploy/chart/templates/ts-order-service-deploy.yaml @@ -15,6 +15,8 @@ spec: volumes: - name: skywalking-agent emptyDir: {} + - name: logs + emptyDir: {} initContainers: - name: add-sw-agent image: apache/skywalking-java-agent:8.8.0-alpine @@ -33,6 +35,7 @@ spec: containers: - name: ts-order-service image: "{{ .Values.image.repository }}/ts-order-service:{{ .Values.image.imageTag }}" + imagePullPolicy: Always ports: - containerPort: 12031 protocol: TCP @@ -68,6 +71,8 @@ spec: volumeMounts: - name: skywalking-agent mountPath: /skywalking + - name: logs + mountPath: /logs readinessProbe: tcpSocket: port: 12031 diff --git a/chaos/train-ticket/deploy/chart/templates/ts-payment-service-deploy.yaml b/chaos/train-ticket/deploy/chart/templates/ts-payment-service-deploy.yaml index eccc072..4d3f41a 100644 --- a/chaos/train-ticket/deploy/chart/templates/ts-payment-service-deploy.yaml +++ b/chaos/train-ticket/deploy/chart/templates/ts-payment-service-deploy.yaml @@ -15,6 +15,8 @@ spec: volumes: - name: skywalking-agent emptyDir: {} + - name: logs + emptyDir: {} initContainers: - name: add-sw-agent image: apache/skywalking-java-agent:8.8.0-alpine @@ -33,6 +35,7 @@ spec: containers: - name: ts-payment-service image: "{{ .Values.image.repository }}/ts-payment-service:{{ .Values.image.imageTag }}" + imagePullPolicy: Always ports: - containerPort: 19001 protocol: TCP @@ -68,6 +71,8 @@ spec: volumeMounts: - name: skywalking-agent mountPath: /skywalking + - name: logs + mountPath: /logs readinessProbe: tcpSocket: port: 19001 diff --git a/chaos/train-ticket/deploy/chart/templates/ts-preserve-other-service-deploy.yaml b/chaos/train-ticket/deploy/chart/templates/ts-preserve-other-service-deploy.yaml index 96f2cd2..530ae9c 100644 --- a/chaos/train-ticket/deploy/chart/templates/ts-preserve-other-service-deploy.yaml +++ b/chaos/train-ticket/deploy/chart/templates/ts-preserve-other-service-deploy.yaml @@ -15,6 +15,8 @@ spec: volumes: - name: skywalking-agent emptyDir: {} + - name: logs + emptyDir: {} initContainers: - name: add-sw-agent image: apache/skywalking-java-agent:8.8.0-alpine @@ -33,6 +35,7 @@ spec: containers: - name: ts-preserve-other-service image: "{{ .Values.image.repository }}/ts-preserve-other-service:{{ .Values.image.imageTag }}" + imagePullPolicy: Always ports: - containerPort: 14569 protocol: TCP @@ -68,6 +71,8 @@ spec: volumeMounts: - name: skywalking-agent mountPath: /skywalking + - name: logs + mountPath: /logs readinessProbe: tcpSocket: port: 14569 diff --git a/chaos/train-ticket/deploy/chart/templates/ts-preserve-service-deploy.yaml b/chaos/train-ticket/deploy/chart/templates/ts-preserve-service-deploy.yaml index 49161d3..76428f3 100644 --- a/chaos/train-ticket/deploy/chart/templates/ts-preserve-service-deploy.yaml +++ b/chaos/train-ticket/deploy/chart/templates/ts-preserve-service-deploy.yaml @@ -15,6 +15,8 @@ spec: volumes: - name: skywalking-agent emptyDir: {} + - name: logs + emptyDir: {} initContainers: - name: add-sw-agent image: apache/skywalking-java-agent:8.8.0-alpine @@ -33,6 +35,7 @@ spec: containers: - name: ts-preserve-service image: "{{ .Values.image.repository }}/ts-preserve-service:{{ .Values.image.imageTag }}" + imagePullPolicy: Always ports: - containerPort: 14568 protocol: TCP @@ -68,6 +71,8 @@ spec: volumeMounts: - name: skywalking-agent mountPath: /skywalking + - name: logs + mountPath: /logs readinessProbe: tcpSocket: port: 14568 diff --git a/chaos/train-ticket/deploy/chart/templates/ts-price-service-deploy.yaml b/chaos/train-ticket/deploy/chart/templates/ts-price-service-deploy.yaml index e7e8cf7..ea8f09a 100644 --- a/chaos/train-ticket/deploy/chart/templates/ts-price-service-deploy.yaml +++ b/chaos/train-ticket/deploy/chart/templates/ts-price-service-deploy.yaml @@ -15,6 +15,8 @@ spec: volumes: - name: skywalking-agent emptyDir: {} + - name: logs + emptyDir: {} initContainers: - name: add-sw-agent image: apache/skywalking-java-agent:8.8.0-alpine @@ -33,6 +35,7 @@ spec: containers: - name: ts-price-service image: "{{ .Values.image.repository }}/ts-price-service:{{ .Values.image.imageTag }}" + imagePullPolicy: Always ports: - containerPort: 16579 protocol: TCP @@ -68,6 +71,8 @@ spec: volumeMounts: - name: skywalking-agent mountPath: /skywalking + - name: logs + mountPath: /logs readinessProbe: tcpSocket: port: 16579 diff --git a/chaos/train-ticket/deploy/chart/templates/ts-rebook-service-deploy.yaml b/chaos/train-ticket/deploy/chart/templates/ts-rebook-service-deploy.yaml index d5bc3b7..bffa4d0 100644 --- a/chaos/train-ticket/deploy/chart/templates/ts-rebook-service-deploy.yaml +++ b/chaos/train-ticket/deploy/chart/templates/ts-rebook-service-deploy.yaml @@ -15,6 +15,8 @@ spec: volumes: - name: skywalking-agent emptyDir: {} + - name: logs + emptyDir: {} initContainers: - name: add-sw-agent image: apache/skywalking-java-agent:8.8.0-alpine @@ -33,6 +35,7 @@ spec: containers: - name: ts-rebook-service image: "{{ .Values.image.repository }}/ts-rebook-service:{{ .Values.image.imageTag }}" + imagePullPolicy: Always ports: - containerPort: 18886 protocol: TCP @@ -68,6 +71,8 @@ spec: volumeMounts: - name: skywalking-agent mountPath: /skywalking + - name: logs + mountPath: /logs readinessProbe: tcpSocket: port: 18886 diff --git a/chaos/train-ticket/deploy/chart/templates/ts-route-plan-service-deploy.yaml b/chaos/train-ticket/deploy/chart/templates/ts-route-plan-service-deploy.yaml index 327acf1..9d780ec 100644 --- a/chaos/train-ticket/deploy/chart/templates/ts-route-plan-service-deploy.yaml +++ b/chaos/train-ticket/deploy/chart/templates/ts-route-plan-service-deploy.yaml @@ -15,6 +15,8 @@ spec: volumes: - name: skywalking-agent emptyDir: {} + - name: logs + emptyDir: {} initContainers: - name: add-sw-agent image: apache/skywalking-java-agent:8.8.0-alpine @@ -33,6 +35,7 @@ spec: containers: - name: ts-route-plan-service image: "{{ .Values.image.repository }}/ts-route-plan-service:{{ .Values.image.imageTag }}" + imagePullPolicy: Always ports: - containerPort: 14578 protocol: TCP @@ -68,6 +71,8 @@ spec: volumeMounts: - name: skywalking-agent mountPath: /skywalking + - name: logs + mountPath: /logs readinessProbe: tcpSocket: port: 14578 diff --git a/chaos/train-ticket/deploy/chart/templates/ts-route-service-deploy.yaml b/chaos/train-ticket/deploy/chart/templates/ts-route-service-deploy.yaml index d3735ad..e5df1bf 100644 --- a/chaos/train-ticket/deploy/chart/templates/ts-route-service-deploy.yaml +++ b/chaos/train-ticket/deploy/chart/templates/ts-route-service-deploy.yaml @@ -15,6 +15,8 @@ spec: volumes: - name: skywalking-agent emptyDir: {} + - name: logs + emptyDir: {} initContainers: - name: add-sw-agent image: apache/skywalking-java-agent:8.8.0-alpine @@ -33,6 +35,7 @@ spec: containers: - name: ts-route-service image: "{{ .Values.image.repository }}/ts-route-service:{{ .Values.image.imageTag }}" + imagePullPolicy: Always ports: - containerPort: 11178 protocol: TCP @@ -68,6 +71,8 @@ spec: volumeMounts: - name: skywalking-agent mountPath: /skywalking + - name: logs + mountPath: /logs readinessProbe: tcpSocket: port: 11178 diff --git a/chaos/train-ticket/deploy/chart/templates/ts-seat-service-deploy.yaml b/chaos/train-ticket/deploy/chart/templates/ts-seat-service-deploy.yaml index 75c01ab..8334ad6 100644 --- a/chaos/train-ticket/deploy/chart/templates/ts-seat-service-deploy.yaml +++ b/chaos/train-ticket/deploy/chart/templates/ts-seat-service-deploy.yaml @@ -15,6 +15,8 @@ spec: volumes: - name: skywalking-agent emptyDir: {} + - name: logs + emptyDir: {} initContainers: - name: add-sw-agent image: apache/skywalking-java-agent:8.8.0-alpine @@ -33,6 +35,7 @@ spec: containers: - name: ts-seat-service image: "{{ .Values.image.repository }}/ts-seat-service:{{ .Values.image.imageTag }}" + imagePullPolicy: Always ports: - containerPort: 18898 protocol: TCP @@ -68,6 +71,8 @@ spec: volumeMounts: - name: skywalking-agent mountPath: /skywalking + - name: logs + mountPath: /logs readinessProbe: tcpSocket: port: 18898 diff --git a/chaos/train-ticket/deploy/chart/templates/ts-security-service-deploy.yaml b/chaos/train-ticket/deploy/chart/templates/ts-security-service-deploy.yaml index 157857c..60077a0 100644 --- a/chaos/train-ticket/deploy/chart/templates/ts-security-service-deploy.yaml +++ b/chaos/train-ticket/deploy/chart/templates/ts-security-service-deploy.yaml @@ -15,6 +15,8 @@ spec: volumes: - name: skywalking-agent emptyDir: {} + - name: logs + emptyDir: {} initContainers: - name: add-sw-agent image: apache/skywalking-java-agent:8.8.0-alpine @@ -33,6 +35,7 @@ spec: containers: - name: ts-security-service image: "{{ .Values.image.repository }}/ts-security-service:{{ .Values.image.imageTag }}" + imagePullPolicy: Always ports: - containerPort: 11188 protocol: TCP @@ -68,6 +71,8 @@ spec: volumeMounts: - name: skywalking-agent mountPath: /skywalking + - name: logs + mountPath: /logs readinessProbe: tcpSocket: port: 11188 diff --git a/chaos/train-ticket/deploy/chart/templates/ts-station-food-service-deploy.yaml b/chaos/train-ticket/deploy/chart/templates/ts-station-food-service-deploy.yaml index 3f6c7f2..ded447c 100644 --- a/chaos/train-ticket/deploy/chart/templates/ts-station-food-service-deploy.yaml +++ b/chaos/train-ticket/deploy/chart/templates/ts-station-food-service-deploy.yaml @@ -15,6 +15,8 @@ spec: volumes: - name: skywalking-agent emptyDir: {} + - name: logs + emptyDir: {} initContainers: - name: add-sw-agent image: apache/skywalking-java-agent:8.8.0-alpine @@ -33,6 +35,7 @@ spec: containers: - name: ts-station-food-service image: "{{ .Values.image.repository }}/ts-station-food-service:{{ .Values.image.imageTag }}" + imagePullPolicy: Always ports: - containerPort: 18855 protocol: TCP @@ -68,6 +71,8 @@ spec: volumeMounts: - name: skywalking-agent mountPath: /skywalking + - name: logs + mountPath: /logs readinessProbe: tcpSocket: port: 18855 diff --git a/chaos/train-ticket/deploy/chart/templates/ts-station-service-deploy.yaml b/chaos/train-ticket/deploy/chart/templates/ts-station-service-deploy.yaml index 0ae4610..66667b2 100644 --- a/chaos/train-ticket/deploy/chart/templates/ts-station-service-deploy.yaml +++ b/chaos/train-ticket/deploy/chart/templates/ts-station-service-deploy.yaml @@ -15,6 +15,8 @@ spec: volumes: - name: skywalking-agent emptyDir: {} + - name: logs + emptyDir: {} initContainers: - name: add-sw-agent image: apache/skywalking-java-agent:8.8.0-alpine @@ -33,6 +35,7 @@ spec: containers: - name: ts-station-service image: "{{ .Values.image.repository }}/ts-station-service:{{ .Values.image.imageTag }}" + imagePullPolicy: Always ports: - containerPort: 12345 protocol: TCP @@ -68,6 +71,8 @@ spec: volumeMounts: - name: skywalking-agent mountPath: /skywalking + - name: logs + mountPath: /logs readinessProbe: tcpSocket: port: 12345 diff --git a/chaos/train-ticket/deploy/chart/templates/ts-ticket-office-service-deploy.yaml b/chaos/train-ticket/deploy/chart/templates/ts-ticket-office-service-deploy.yaml index 85581a9..8666759 100644 --- a/chaos/train-ticket/deploy/chart/templates/ts-ticket-office-service-deploy.yaml +++ b/chaos/train-ticket/deploy/chart/templates/ts-ticket-office-service-deploy.yaml @@ -15,6 +15,8 @@ spec: volumes: - name: skywalking-agent emptyDir: {} + - name: logs + emptyDir: {} initContainers: - name: add-sw-agent image: apache/skywalking-java-agent:8.8.0-alpine @@ -33,6 +35,7 @@ spec: containers: - name: ts-ticket-office-service image: "{{ .Values.image.repository }}/ts-ticket-office-service:{{ .Values.image.imageTag }}" + imagePullPolicy: Always ports: - containerPort: 16108 protocol: TCP @@ -68,6 +71,8 @@ spec: volumeMounts: - name: skywalking-agent mountPath: /skywalking + - name: logs + mountPath: /logs readinessProbe: tcpSocket: port: 16108 diff --git a/chaos/train-ticket/deploy/chart/templates/ts-train-food-service-deploy.yaml b/chaos/train-ticket/deploy/chart/templates/ts-train-food-service-deploy.yaml index 6e71d49..9becf39 100644 --- a/chaos/train-ticket/deploy/chart/templates/ts-train-food-service-deploy.yaml +++ b/chaos/train-ticket/deploy/chart/templates/ts-train-food-service-deploy.yaml @@ -15,6 +15,8 @@ spec: volumes: - name: skywalking-agent emptyDir: {} + - name: logs + emptyDir: {} initContainers: - name: add-sw-agent image: apache/skywalking-java-agent:8.8.0-alpine @@ -33,6 +35,7 @@ spec: containers: - name: ts-train-food-service image: "{{ .Values.image.repository }}/ts-train-food-service:{{ .Values.image.imageTag }}" + imagePullPolicy: Always ports: - containerPort: 19999 protocol: TCP @@ -68,6 +71,8 @@ spec: volumeMounts: - name: skywalking-agent mountPath: /skywalking + - name: logs + mountPath: /logs readinessProbe: tcpSocket: port: 19999 diff --git a/chaos/train-ticket/deploy/chart/templates/ts-train-service-deploy.yaml b/chaos/train-ticket/deploy/chart/templates/ts-train-service-deploy.yaml index 5243bbd..ee6b3ed 100644 --- a/chaos/train-ticket/deploy/chart/templates/ts-train-service-deploy.yaml +++ b/chaos/train-ticket/deploy/chart/templates/ts-train-service-deploy.yaml @@ -15,6 +15,8 @@ spec: volumes: - name: skywalking-agent emptyDir: {} + - name: logs + emptyDir: {} initContainers: - name: add-sw-agent image: apache/skywalking-java-agent:8.8.0-alpine @@ -33,6 +35,7 @@ spec: containers: - name: ts-train-service image: "{{ .Values.image.repository }}/ts-train-service:{{ .Values.image.imageTag }}" + imagePullPolicy: Always ports: - containerPort: 14567 protocol: TCP @@ -68,6 +71,8 @@ spec: volumeMounts: - name: skywalking-agent mountPath: /skywalking + - name: logs + mountPath: /logs readinessProbe: tcpSocket: port: 14567 diff --git a/chaos/train-ticket/deploy/chart/templates/ts-travel-plan-service-deploy.yaml b/chaos/train-ticket/deploy/chart/templates/ts-travel-plan-service-deploy.yaml index 11266fa..b44fb9b 100644 --- a/chaos/train-ticket/deploy/chart/templates/ts-travel-plan-service-deploy.yaml +++ b/chaos/train-ticket/deploy/chart/templates/ts-travel-plan-service-deploy.yaml @@ -15,6 +15,8 @@ spec: volumes: - name: skywalking-agent emptyDir: {} + - name: logs + emptyDir: {} initContainers: - name: add-sw-agent image: apache/skywalking-java-agent:8.8.0-alpine @@ -33,6 +35,7 @@ spec: containers: - name: ts-travel-plan-service image: "{{ .Values.image.repository }}/ts-travel-plan-service:{{ .Values.image.imageTag }}" + imagePullPolicy: Always ports: - containerPort: 14322 protocol: TCP @@ -68,6 +71,8 @@ spec: volumeMounts: - name: skywalking-agent mountPath: /skywalking + - name: logs + mountPath: /logs readinessProbe: tcpSocket: port: 14322 diff --git a/chaos/train-ticket/deploy/chart/templates/ts-travel-service-deploy.yaml b/chaos/train-ticket/deploy/chart/templates/ts-travel-service-deploy.yaml index 92afed8..84daca6 100644 --- a/chaos/train-ticket/deploy/chart/templates/ts-travel-service-deploy.yaml +++ b/chaos/train-ticket/deploy/chart/templates/ts-travel-service-deploy.yaml @@ -15,6 +15,8 @@ spec: volumes: - name: skywalking-agent emptyDir: {} + - name: logs + emptyDir: {} initContainers: - name: add-sw-agent image: apache/skywalking-java-agent:8.8.0-alpine @@ -33,6 +35,7 @@ spec: containers: - name: ts-travel-service image: "{{ .Values.image.repository }}/ts-travel-service:{{ .Values.image.imageTag }}" + imagePullPolicy: Always ports: - containerPort: 12346 protocol: TCP @@ -68,6 +71,8 @@ spec: volumeMounts: - name: skywalking-agent mountPath: /skywalking + - name: logs + mountPath: /logs readinessProbe: tcpSocket: port: 12346 diff --git a/chaos/train-ticket/deploy/chart/templates/ts-travel2-service-deploy.yaml b/chaos/train-ticket/deploy/chart/templates/ts-travel2-service-deploy.yaml index c244eb8..b18f4c1 100644 --- a/chaos/train-ticket/deploy/chart/templates/ts-travel2-service-deploy.yaml +++ b/chaos/train-ticket/deploy/chart/templates/ts-travel2-service-deploy.yaml @@ -15,6 +15,8 @@ spec: volumes: - name: skywalking-agent emptyDir: {} + - name: logs + emptyDir: {} initContainers: - name: add-sw-agent image: apache/skywalking-java-agent:8.8.0-alpine @@ -33,6 +35,7 @@ spec: containers: - name: ts-travel2-service image: "{{ .Values.image.repository }}/ts-travel2-service:{{ .Values.image.imageTag }}" + imagePullPolicy: Always ports: - containerPort: 16346 protocol: TCP @@ -68,6 +71,8 @@ spec: volumeMounts: - name: skywalking-agent mountPath: /skywalking + - name: logs + mountPath: /logs readinessProbe: tcpSocket: port: 16346 diff --git a/chaos/train-ticket/deploy/chart/templates/ts-user-service-deploy.yaml b/chaos/train-ticket/deploy/chart/templates/ts-user-service-deploy.yaml index 90b2061..733866a 100644 --- a/chaos/train-ticket/deploy/chart/templates/ts-user-service-deploy.yaml +++ b/chaos/train-ticket/deploy/chart/templates/ts-user-service-deploy.yaml @@ -15,6 +15,8 @@ spec: volumes: - name: skywalking-agent emptyDir: {} + - name: logs + emptyDir: {} initContainers: - name: add-sw-agent image: apache/skywalking-java-agent:8.8.0-alpine @@ -33,8 +35,9 @@ spec: containers: - name: ts-user-service image: "{{ .Values.image.repository }}/ts-user-service:{{ .Values.image.imageTag }}" + imagePullPolicy: Always ports: - - containerPort: 12346 + - containerPort: 12342 protocol: TCP envFrom: - secretRef: @@ -68,9 +71,11 @@ spec: volumeMounts: - name: skywalking-agent mountPath: /skywalking + - name: logs + mountPath: /logs readinessProbe: tcpSocket: - port: 12346 + port: 12342 initialDelaySeconds: 60 timeoutSeconds: 5 periodSeconds: 10 diff --git a/chaos/train-ticket/deploy/chart/templates/ts-user-service-svc.yaml b/chaos/train-ticket/deploy/chart/templates/ts-user-service-svc.yaml index 72106dd..d6cf3ba 100644 --- a/chaos/train-ticket/deploy/chart/templates/ts-user-service-svc.yaml +++ b/chaos/train-ticket/deploy/chart/templates/ts-user-service-svc.yaml @@ -6,8 +6,8 @@ spec: ports: - name: http protocol: TCP - port: 12346 - targetPort: 12346 + port: 12342 + targetPort: 12342 selector: app: ts-user-service type: ClusterIP diff --git a/chaos/train-ticket/deploy/chart/templates/ts-verification-code-service-deploy.yaml b/chaos/train-ticket/deploy/chart/templates/ts-verification-code-service-deploy.yaml index 8aeae84..bf6d081 100644 --- a/chaos/train-ticket/deploy/chart/templates/ts-verification-code-service-deploy.yaml +++ b/chaos/train-ticket/deploy/chart/templates/ts-verification-code-service-deploy.yaml @@ -15,6 +15,8 @@ spec: volumes: - name: skywalking-agent emptyDir: {} + - name: logs + emptyDir: {} initContainers: - name: add-sw-agent image: apache/skywalking-java-agent:8.8.0-alpine @@ -33,6 +35,7 @@ spec: containers: - name: ts-verification-code-service image: "{{ .Values.image.repository }}/ts-verification-code-service:{{ .Values.image.imageTag }}" + imagePullPolicy: Always ports: - containerPort: 15678 protocol: TCP @@ -68,6 +71,8 @@ spec: volumeMounts: - name: skywalking-agent mountPath: /skywalking + - name: logs + mountPath: /logs readinessProbe: tcpSocket: port: 15678 diff --git a/chaos/train-ticket/deploy/chart/templates/ts-voucher-service-deploy.yaml b/chaos/train-ticket/deploy/chart/templates/ts-voucher-service-deploy.yaml index 3db36c9..bf5e15e 100644 --- a/chaos/train-ticket/deploy/chart/templates/ts-voucher-service-deploy.yaml +++ b/chaos/train-ticket/deploy/chart/templates/ts-voucher-service-deploy.yaml @@ -15,6 +15,8 @@ spec: volumes: - name: skywalking-agent emptyDir: {} + - name: logs + emptyDir: {} initContainers: - name: add-sw-agent image: apache/skywalking-java-agent:8.8.0-alpine @@ -33,6 +35,7 @@ spec: containers: - name: ts-voucher-service image: "{{ .Values.image.repository }}/ts-voucher-service:{{ .Values.image.imageTag }}" + imagePullPolicy: Always ports: - containerPort: 16101 protocol: TCP @@ -68,6 +71,8 @@ spec: volumeMounts: - name: skywalking-agent mountPath: /skywalking + - name: logs + mountPath: /logs readinessProbe: tcpSocket: port: 16101 diff --git a/chaos/train-ticket/deploy/chart/templates/ts-wait-order-service-deploy.yaml b/chaos/train-ticket/deploy/chart/templates/ts-wait-order-service-deploy.yaml index 30a590c..44a6825 100644 --- a/chaos/train-ticket/deploy/chart/templates/ts-wait-order-service-deploy.yaml +++ b/chaos/train-ticket/deploy/chart/templates/ts-wait-order-service-deploy.yaml @@ -15,6 +15,8 @@ spec: volumes: - name: skywalking-agent emptyDir: {} + - name: logs + emptyDir: {} initContainers: - name: add-sw-agent image: apache/skywalking-java-agent:8.8.0-alpine @@ -33,8 +35,9 @@ spec: containers: - name: ts-wait-order-service image: "{{ .Values.image.repository }}/ts-wait-order-service:{{ .Values.image.imageTag }}" + imagePullPolicy: Always ports: - - containerPort: 15678 + - containerPort: 17525 protocol: TCP envFrom: - secretRef: @@ -68,9 +71,11 @@ spec: volumeMounts: - name: skywalking-agent mountPath: /skywalking + - name: logs + mountPath: /logs readinessProbe: tcpSocket: - port: 15678 + port: 17525 initialDelaySeconds: 60 timeoutSeconds: 5 periodSeconds: 10 diff --git a/chaos/train-ticket/deploy/chart/templates/ts-wait-order-service-svc.yaml b/chaos/train-ticket/deploy/chart/templates/ts-wait-order-service-svc.yaml index aabbc84..633c5fb 100644 --- a/chaos/train-ticket/deploy/chart/templates/ts-wait-order-service-svc.yaml +++ b/chaos/train-ticket/deploy/chart/templates/ts-wait-order-service-svc.yaml @@ -6,8 +6,8 @@ spec: ports: - name: http protocol: TCP - port: 15678 - targetPort: 15678 + port: 17525 + targetPort: 17525 selector: app: ts-wait-order-service type: ClusterIP diff --git a/chaos/train-ticket/deploy/chart/templates/tsdb-mysql-secret.yaml b/chaos/train-ticket/deploy/chart/templates/tsdb-mysql-secret.yaml index 0701f88..e52cee4 100644 --- a/chaos/train-ticket/deploy/chart/templates/tsdb-mysql-secret.yaml +++ b/chaos/train-ticket/deploy/chart/templates/tsdb-mysql-secret.yaml @@ -4,7 +4,7 @@ metadata: name: tsdb-mysql data: TSDB_MYSQL_DATABASE: dHM= - TSDB_MYSQL_HOST: dHJhaW4tdGlja2V0LW15c3FsCg== + TSDB_MYSQL_HOST: dHJhaW4tdGlja2V0LW15c3Fs TSDB_MYSQL_PASSWORD: VHNfMTIzNDU2 TSDB_MYSQL_PORT: MzMwNg== TSDB_MYSQL_USER: dHM= diff --git a/chaos/train-ticket/ts-common/src/main/java/edu/fudan/common/config/ServiceURL.java b/chaos/train-ticket/ts-common/src/main/java/edu/fudan/common/config/ServiceURL.java index 1514675..c58ec56 100644 --- a/chaos/train-ticket/ts-common/src/main/java/edu/fudan/common/config/ServiceURL.java +++ b/chaos/train-ticket/ts-common/src/main/java/edu/fudan/common/config/ServiceURL.java @@ -17,13 +17,10 @@ public class ServiceURL { put("ts-route-service", "11178"); put("ts-price-service", "16579"); put("ts-preserve-service", "14568"); - put("ts-news-service", "12862"); - put("ts-avatar-service", "17001"); put("ts-security-service", "11188"); put("ts-consign-service", "16111"); put("ts-train-service", "14567"); put("ts-order-service", "12031"); - put("ts-ticket-office-service", "16108"); put("ts-verification-code-service", "15678"); put("ts-food-service", "18856"); put("ts-station-food-service", "18855"); @@ -32,18 +29,17 @@ public class ServiceURL { put("ts-admin-basic-info-service", "18767"); put("ts-food-delivery-service", "18957"); put("ts-consign-price-service", "16110"); - put("ts-wait-order-service", "15678"); + put("ts-wait-order-service", "17525"); put("ts-basic-service", "15680"); put("ts-preserve-other-service", "14569"); put("ts-station-service", "12345"); - put("ts-auth-service", "12349"); - put("ts-user-service", "12346"); + put("ts-auth-service", "12340"); + put("ts-user-service", "12342"); put("ts-route-plan-service", "14578"); put("ts-gateway-service", "18888"); put("ts-payment-service", "19001"); put("ts-inside-payment-service", "18673"); - put("ts-voucher-service", "16101"); - put("ts-delivery-service", "18856"); + put("ts-delivery-service", "18808"); put("ts-seat-service", "18898"); put("ts-execute-service", "12386"); put("ts-travel-plan-service", "14322"); @@ -56,7 +52,7 @@ public class ServiceURL { }; public static String GetServiceURL(String serviceName) { - return "http://"+serviceName + "/" + servicePort.getOrDefault(serviceName, "8080"); + return "http://"+serviceName + ":" + servicePort.getOrDefault(serviceName, "8080"); } } -- Gitee From e08b2e9f6d60e68c7bb1c586785a15d1c58539aa Mon Sep 17 00:00:00 2001 From: yunguannjg <18757593931@163.com> Date: Fri, 31 May 2024 14:59:22 +0800 Subject: [PATCH 4/4] fix: update template --- .../src/main/resources/application.yml | 77 ++++++++++--------- 1 file changed, 39 insertions(+), 38 deletions(-) diff --git a/chaos/train-ticket/ts-gateway-service/src/main/resources/application.yml b/chaos/train-ticket/ts-gateway-service/src/main/resources/application.yml index 76f8bdf..8090b66 100644 --- a/chaos/train-ticket/ts-gateway-service/src/main/resources/application.yml +++ b/chaos/train-ticket/ts-gateway-service/src/main/resources/application.yml @@ -11,12 +11,12 @@ spring: gateway: routes: - id: admin-basic-info - uri: http://${ADMIN_BASIC_INFO_SERVICE_HOST:ts-admin-basic-info-service:18767} + uri: http://${ADMIN_BASIC_INFO_SERVICE_HOST:ts-admin-basic-info-service}:18767 predicates: - Path=/api/v1/adminbasicservice/** - id: admin-order - uri: http://${ADMIN_ORDER_SERVICE_HOST:ts-admin-order-service:16112} + uri: http://${ADMIN_ORDER_SERVICE_HOST:ts-admin-order-service}:16112 predicates: - Path=/api/v1/adminorderservice/** @@ -26,181 +26,182 @@ spring: - Path=/api/v1/adminrouteservice/** - id: admin-travel - uri: http://${ADMIN_TRAVEL_SERVICE_HOST:ts-admin-travel-service:16114} + uri: http://${ADMIN_TRAVEL_SERVICE_HOST:ts-admin-travel-service}:16114 predicates: - Path=/api/v1/admintravelservice/** - id: admin-user - uri: http://${ADMIN_USER_SERVICE_HOST:ts-admin-user-service:16115} + uri: http://${ADMIN_USER_SERVICE_HOST:ts-admin-user-service}:16115 predicates: - Path=/api/v1/adminuserservice/users/** - id: assurance - uri: http://${ASSURANCE_SERVICE_HOST:ts-assurance-service:18888} + uri: http://${ASSURANCE_SERVICE_HOST:ts-assurance-service}:18888 predicates: - Path=/api/v1/assuranceservice/** - id: auth - uri: http://${AUTH_SERVICE_HOST:ts-auth-service:12349} + uri: http://${AUTH_SERVICE_HOST:ts-auth-service}:12349 predicates: - Path=/api/v1/auth/** - id: auth-user - uri: http://${AUTH_SERVICE_HOST:ts-auth-service:12349} + uri: http://${AUTH_SERVICE_HOST:ts-auth-service}:12349 predicates: - Path=/api/v1/users/** - id: avatar - uri: http://${AVATAR_SERVICE_HOST:ts-avatar-service:17001} + uri: http://${AVATAR_SERVICE_HOST:ts-avatar-service}:17001 predicates: - Path=/api/v1/avatar/** - id: basic - uri: http://${BASIC_SERVICE_HOST:ts-basic-service:15680} + uri: http://${BASIC_SERVICE_HOST:ts-basic-service}:15680 predicates: - Path=/api/v1/basicservice/** - id: cancel - uri: http://${CANCEL_SERVICE_HOST:ts-cancel-service:18885} + uri: http://${CANCEL_SERVICE_HOST:ts-cancel-service}:18885 predicates: - Path=/api/v1/cancelservice/** - id: config - uri: http://${CONFIG_SERVICE_HOST:ts-config-service:15679} + uri: http://${CONFIG_SERVICE_HOST:ts-config-service}:15679 predicates: - Path=/api/v1/configservice/** - id: consign-price - uri: http://${CONSIGN_PRICE_SERVICE_HOST:ts-consign-price-service:16110} + uri: http://${CONSIGN_PRICE_SERVICE_HOST:ts-consign-price-service}:16110 predicates: - Path=/api/v1/consignpriceservice/** - id: consign - uri: http://${CONSIGN_SERVICE_HOST:ts-consign-service:16111} + uri: http://${CONSIGN_SERVICE_HOST:ts-consign-service}:16111 predicates: - Path=/api/v1/consignservice/** - id: contacts - uri: http://${CONTACTS_SERVICE_HOST:ts-contacts-service:12347} + uri: http://${CONTACTS_SERVICE_HOST:ts-contacts-service}:12347 predicates: - Path=/api/v1/contactservice/** - id: execute - uri: http://${EXECUTE_SERVICE_HOST:ts-execute-service:12386} + uri: http://${EXECUTE_SERVICE_HOST:ts-execute-service}:12386 predicates: - Path=/api/v1/executeservice/** - id: food - uri: http://${FOOD_SERVICE_HOST:ts-food-service:18856} + uri: http://${FOOD_SERVICE_HOST:ts-food-service}:18856 predicates: - Path=/api/v1/foodservice/** - id: inside-payment - uri: http://${INSIDE_PAYMENT_SERVICE_HOST:ts-inside-payment-service:18673} + uri: http://${INSIDE_PAYMENT_SERVICE_HOST:ts-inside-payment-service}:18673 predicates: - Path=/api/v1/inside_pay_service/** - id: notification - uri: http://${NOTIFICATION_SERVICE_HOST:ts-notification-service:17853} + uri: http://${NOTIFICATION_SERVICE_HOST:ts-notification-service}:17853 predicates: - Path=/api/v1/notifyservice/** - id: order-other - uri: http://${ORDER_OTHER_SERVICE_HOST:ts-order-other-service:12032} + uri: http://${ORDER_OTHER_SERVICE_HOST:ts-order-other-service}:12032 predicates: - Path=/api/v1/orderOtherService/** - id: order - uri: http://${ORDER_SERVICE_HOST:ts-order-service:12031} + uri: http://${ORDER_SERVICE_HOST:ts-order-service}:12031 predicates: - Path=/api/v1/orderservice/** - id: payment - uri: http://${PAYMENT_SERVICE_HOST:ts-payment-service:19001} + uri: http://${PAYMENT_SERVICE_HOST:ts-payment-service}:19001 predicates: - Path=/api/v1/paymentservice/** - id: preserve-other - uri: http://${PRESERVE_OTHER_SERVICE_HOST:ts-preserve-other-service:14569} + uri: http://${PRESERVE_OTHER_SERVICE_HOST:ts-preserve-other-service}:14569 predicates: - Path=/api/v1/preserveotherservice/** - id: preserve - uri: http://${PRESERVE_SERVICE_HOST:ts-preserve-service:14568} + uri: http://${PRESERVE_SERVICE_HOST:ts-preserve-service}:14568 predicates: - Path=/api/v1/preserveservice/** - id: price - uri: http://${PRICE_SERVICE_HOST:ts-price-service:16579} + uri: http://${PRICE_SERVICE_HOST:ts-price-service}:16579 predicates: - Path=/api/v1/priceservice/** - id: rebook - uri: http://${REBOOK_SERVICE_HOST:ts-rebook-service:18886} + uri: http://${REBOOK_SERVICE_HOST:ts-rebook-service}:18886 predicates: - Path=/api/v1/rebookservice/** - id: route-plan - uri: http://${ROUTE_PLAN_SERVICE_HOST:ts-route-plan-service:14578} + uri: http://${ROUTE_PLAN_SERVICE_HOST:ts-route-plan-service}:14578 predicates: - Path=/api/v1/routeplanservice/** - id: route - uri: http://${ROUTE_SERVICE_HOST:ts-route-service:11178} + uri: http://${ROUTE_SERVICE_HOST:ts-route-service}:11178 predicates: - Path=/api/v1/routeservice/** - id: seat - uri: http://${SEAT_SERVICE_HOST:ts-seat-service:18898} + uri: http://${SEAT_SERVICE_HOST:ts-seat-service}:18898 predicates: - Path=/api/v1/seatservice/** - id: security - uri: http://${SECURITY_SERVICE_HOST:ts-security-service:11188} + uri: http://${SECURITY_SERVICE_HOST:ts-security-service}:11188 predicates: - Path=/api/v1/securityservice/** - id: station-food - uri: http://${STATION_FOOD_SERVICE_HOST:ts-station-food-service:18855} + uri: http://${STATION_FOOD_SERVICE_HOST:ts-station-food-service}:18855 predicates: - Path=/api/v1/stationfoodservice/** - id: station - uri: http://${STATION_SERVICE_HOST:ts-station-service:12345} + uri: http://${STATION_SERVICE_HOST:ts-station-service}:12345 predicates: - Path=/api/v1/stationservice/** - id: train-food - uri: http://${TRAIN_FOOD_SERVICE_HOST:ts-train-food-service:19999} + uri: http://${TRAIN_FOOD_SERVICE_HOST:ts-train-food-service}:19999 predicates: - Path=/api/v1/trainfoodservice/** - id: train - uri: http://${TRAIN_SERVICE_HOST:ts-train-service:14567} + uri: http://${TRAIN_SERVICE_HOST:ts-train-service}:14567 predicates: - Path=/api/v1/trainservice/** - id: travel2 - uri: http://${TRAVEL2_SERVICE_HOST:ts-travel2-service:16346} + uri: http://${TRAVEL2_SERVICE_HOST:ts-travel2-service}:16346 predicates: - Path=/api/v1/travel2service/** - id: travel-plan - uri: http://${TRAVEL_PLAN_SERVICE_HOST:ts-travel-plan-service:14322} + uri: http://${TRAVEL_PLAN_SERVICE_HOST:ts-travel-plan-service}:14322 predicates: - Path=/api/v1/travelplanservice/** - id: travel - uri: http://${TRAVEL_SERVICE_HOST:ts-travel-service:12346} + uri: http://${TRAVEL_SERVICE_HOST:ts-travel-service}:12346 predicates: - Path=/api/v1/travelservice/** - id: user - uri: http://${USER_SERVICE_HOST:ts-user-service:12346} + uri: http://${USER_SERVICE_HOST:ts-user-service}:12346 predicates: - Path=/api/v1/userservice/users/** - id: verification-code - uri: http://${VERIFICATION_CODE_SERVICE_HOST:ts-verification-code-service:15678} + uri: http://${VERIFICATION_CODE_SERVICE_HOST:ts-verification-code-service}:15678 predicates: - Path=/api/v1/verifycode/** +z s \ No newline at end of file -- Gitee