From 449b8761bdc613af76c76400567fd5b7fabd41be Mon Sep 17 00:00:00 2001 From: YuLuo <1481556636@qq.com> Date: Mon, 16 Jan 2023 13:58:15 +0800 Subject: [PATCH] Updated yml format in 2021.x branch (#3099) Updated yml format in 2021.x branch --- .../config/datasource-config.yaml | 4 ++-- .../integrated-example/helm-chart/Chart.yaml | 2 +- .../templates/integrated-frontend.yaml | 2 +- .../templates/integrated-gateway.yaml | 2 +- .../templates/integrated-nacos-mysql.yaml | 8 +++---- .../templates/integrated-nacos-stand.yaml | 22 +++++++++---------- .../templates/integrated-order.yaml | 2 +- .../templates/integrated-praise-consumer.yaml | 2 +- .../templates/integrated-praise-provider.yaml | 2 +- .../templates/integrated-seata.yaml | 2 +- .../templates/integrated-storage.yaml | 2 +- .../src/main/resources/application.yml | 4 ++-- .../src/main/resources/application.yml | 12 +++++----- .../src/main/resources/application.yml | 10 ++++----- .../src/main/resources/application.yml | 12 +++++----- .../src/main/resources/application.yml | 12 +++++----- .../src/main/resources/application.yml | 12 +++++----- .../src/main/resources/application.yml | 4 ++-- 18 files changed, 58 insertions(+), 58 deletions(-) diff --git a/spring-cloud-alibaba-examples/integrated-example/config/datasource-config.yaml b/spring-cloud-alibaba-examples/integrated-example/config/datasource-config.yaml index a5e4b6c4b..e3cc76339 100644 --- a/spring-cloud-alibaba-examples/integrated-example/config/datasource-config.yaml +++ b/spring-cloud-alibaba-examples/integrated-example/config/datasource-config.yaml @@ -1,8 +1,8 @@ spring: datasource: driver-class-name: com.mysql.jdbc.Driver - username: root - password: 123456 + username: 'root' + password: '123456' main: allow-bean-definition-overriding: true mybatis: diff --git a/spring-cloud-alibaba-examples/integrated-example/helm-chart/Chart.yaml b/spring-cloud-alibaba-examples/integrated-example/helm-chart/Chart.yaml index 29591f114..f29851558 100644 --- a/spring-cloud-alibaba-examples/integrated-example/helm-chart/Chart.yaml +++ b/spring-cloud-alibaba-examples/integrated-example/helm-chart/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -appVersion: "1.0" +appVersion: '1.0' description: Spring Cloud Alibaba Best Practice Example name: integrated-example version: 1.0.0 \ No newline at end of file diff --git a/spring-cloud-alibaba-examples/integrated-example/helm-chart/templates/integrated-frontend.yaml b/spring-cloud-alibaba-examples/integrated-example/helm-chart/templates/integrated-frontend.yaml index 82f8f5d2f..efcf8a9ce 100644 --- a/spring-cloud-alibaba-examples/integrated-example/helm-chart/templates/integrated-frontend.yaml +++ b/spring-cloud-alibaba-examples/integrated-example/helm-chart/templates/integrated-frontend.yaml @@ -31,7 +31,7 @@ spec: spec: containers: - name: integrated-frontend - image: "{{ .Values.image.repository }}integrated-frontend" + image: '{{ .Values.image.repository }}integrated-frontend' imagePullPolicy: Always ports: - name: http-port diff --git a/spring-cloud-alibaba-examples/integrated-example/helm-chart/templates/integrated-gateway.yaml b/spring-cloud-alibaba-examples/integrated-example/helm-chart/templates/integrated-gateway.yaml index cc054f30d..01b278d4b 100644 --- a/spring-cloud-alibaba-examples/integrated-example/helm-chart/templates/integrated-gateway.yaml +++ b/spring-cloud-alibaba-examples/integrated-example/helm-chart/templates/integrated-gateway.yaml @@ -31,7 +31,7 @@ spec: spec: containers: - name: integrated-gateway - image: "{{ .Values.image.repository }}integrated-gateway" + image: '{{ .Values.image.repository }}integrated-gateway' imagePullPolicy: Always ports: - name: http-port diff --git a/spring-cloud-alibaba-examples/integrated-example/helm-chart/templates/integrated-nacos-mysql.yaml b/spring-cloud-alibaba-examples/integrated-example/helm-chart/templates/integrated-nacos-mysql.yaml index c15950d5f..dfa410d9c 100644 --- a/spring-cloud-alibaba-examples/integrated-example/helm-chart/templates/integrated-nacos-mysql.yaml +++ b/spring-cloud-alibaba-examples/integrated-example/helm-chart/templates/integrated-nacos-mysql.yaml @@ -21,13 +21,13 @@ spec: - containerPort: 3306 env: - name: MYSQL_ROOT_PASSWORD - value: "root" + value: 'root' - name: MYSQL_DATABASE - value: "nacos_config" + value: 'nacos_config' - name: MYSQL_USER - value: "nacos" + value: 'nacos' - name: MYSQL_PASSWORD - value: "nacos" + value: 'nacos' --- apiVersion: v1 kind: Service diff --git a/spring-cloud-alibaba-examples/integrated-example/helm-chart/templates/integrated-nacos-stand.yaml b/spring-cloud-alibaba-examples/integrated-example/helm-chart/templates/integrated-nacos-stand.yaml index 24e32ef74..3c93cd46d 100644 --- a/spring-cloud-alibaba-examples/integrated-example/helm-chart/templates/integrated-nacos-stand.yaml +++ b/spring-cloud-alibaba-examples/integrated-example/helm-chart/templates/integrated-nacos-stand.yaml @@ -44,11 +44,11 @@ kind: ConfigMap metadata: name: nacos-cm data: - mysql.host: "nacos-mysql" - mysql.db.name: "nacos_config" - mysql.port: "3307" - mysql.user: "nacos" - mysql.password: "nacos" + mysql.host: 'nacos-mysql' + mysql.db.name: 'nacos_config + mysql.port: '3307' + mysql.user: 'nacos' + mysql.password: 'nacos' --- apiVersion: apps/v1 kind: Deployment @@ -61,18 +61,18 @@ spec: labels: app: nacos-standalone annotations: - pod.alpha.kubernetes.io/initialized: "true" + pod.alpha.kubernetes.io/initialized: 'true' spec: affinity: podAntiAffinity: requiredDuringSchedulingIgnoredDuringExecution: - labelSelector: matchExpressions: - - key: "app" + - key: 'app' operator: In values: - nacos-standalone - topologyKey: "kubernetes.io/hostname" + topologyKey: 'kubernetes.io/hostname' containers: - name: local-nacos imagePullPolicy: Always @@ -115,11 +115,11 @@ spec: name: nacos-cm key: mysql.password - name: MODE - value: "standalone" + value: 'standalone' - name: NACOS_SERVER_PORT - value: "8848" + value: '8848' - name: PREFER_HOST_MODE - value: "hostname" + value: 'hostname' selector: matchLabels: app: nacos-standalone diff --git a/spring-cloud-alibaba-examples/integrated-example/helm-chart/templates/integrated-order.yaml b/spring-cloud-alibaba-examples/integrated-example/helm-chart/templates/integrated-order.yaml index 3e8604255..dcc40bf8f 100644 --- a/spring-cloud-alibaba-examples/integrated-example/helm-chart/templates/integrated-order.yaml +++ b/spring-cloud-alibaba-examples/integrated-example/helm-chart/templates/integrated-order.yaml @@ -15,7 +15,7 @@ spec: spec: containers: - name: integrated-order - image: "{{ .Values.image.repository }}integrated-order" + image: '{{ .Values.image.repository }}integrated-order' imagePullPolicy: Always ports: - name: http-port diff --git a/spring-cloud-alibaba-examples/integrated-example/helm-chart/templates/integrated-praise-consumer.yaml b/spring-cloud-alibaba-examples/integrated-example/helm-chart/templates/integrated-praise-consumer.yaml index eb136d349..d31b84230 100644 --- a/spring-cloud-alibaba-examples/integrated-example/helm-chart/templates/integrated-praise-consumer.yaml +++ b/spring-cloud-alibaba-examples/integrated-example/helm-chart/templates/integrated-praise-consumer.yaml @@ -15,7 +15,7 @@ spec: spec: containers: - name: integrated-praise-consumer - image: "{{ .Values.image.repository }}integrated-praise-consumer" + image: '{{ .Values.image.repository }}integrated-praise-consumer' imagePullPolicy: Always ports: - name: http-port diff --git a/spring-cloud-alibaba-examples/integrated-example/helm-chart/templates/integrated-praise-provider.yaml b/spring-cloud-alibaba-examples/integrated-example/helm-chart/templates/integrated-praise-provider.yaml index ca10cb652..277d7669d 100644 --- a/spring-cloud-alibaba-examples/integrated-example/helm-chart/templates/integrated-praise-provider.yaml +++ b/spring-cloud-alibaba-examples/integrated-example/helm-chart/templates/integrated-praise-provider.yaml @@ -15,7 +15,7 @@ spec: spec: containers: - name: integrated-praise-provider - image: "{{ .Values.image.repository }}integrated-praise-provider" + image: '{{ .Values.image.repository }}integrated-praise-provider' imagePullPolicy: Always ports: - name: http-port diff --git a/spring-cloud-alibaba-examples/integrated-example/helm-chart/templates/integrated-seata.yaml b/spring-cloud-alibaba-examples/integrated-example/helm-chart/templates/integrated-seata.yaml index 1fc84c03c..167163832 100644 --- a/spring-cloud-alibaba-examples/integrated-example/helm-chart/templates/integrated-seata.yaml +++ b/spring-cloud-alibaba-examples/integrated-example/helm-chart/templates/integrated-seata.yaml @@ -34,7 +34,7 @@ spec: imagePullPolicy: IfNotPresent env: - name: SEATA_PORT - value: "8091" + value: '8091' - name: STORE_MODE value: file ports: diff --git a/spring-cloud-alibaba-examples/integrated-example/helm-chart/templates/integrated-storage.yaml b/spring-cloud-alibaba-examples/integrated-example/helm-chart/templates/integrated-storage.yaml index efce2c0ac..a70430445 100644 --- a/spring-cloud-alibaba-examples/integrated-example/helm-chart/templates/integrated-storage.yaml +++ b/spring-cloud-alibaba-examples/integrated-example/helm-chart/templates/integrated-storage.yaml @@ -15,7 +15,7 @@ spec: spec: containers: - name: integrated-storage - image: "{{ .Values.image.repository }}integrated-storage" + image: '{{ .Values.image.repository }}integrated-storage' imagePullPolicy: Always ports: - name: http-port diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-server-example/src/main/resources/application.yml b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-server-example/src/main/resources/application.yml index 8fc3f8bf9..23444d78c 100644 --- a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-server-example/src/main/resources/application.yml +++ b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-server-example/src/main/resources/application.yml @@ -6,8 +6,8 @@ spring: name: configserver cloud: nacos: - username: nacos - password: nacos + username: 'nacos' + password: 'nacos' discovery: server-addr: 127.0.0.1:8848 config: diff --git a/spring-cloud-alibaba-examples/seata-example/account-service/src/main/resources/application.yml b/spring-cloud-alibaba-examples/seata-example/account-service/src/main/resources/application.yml index 195b96b2f..605121197 100644 --- a/spring-cloud-alibaba-examples/seata-example/account-service/src/main/resources/application.yml +++ b/spring-cloud-alibaba-examples/seata-example/account-service/src/main/resources/application.yml @@ -4,8 +4,8 @@ base: hostname: 127.0.0.1 #your mysql server ip address dbname: seata #your database name for test port: 3306 #your mysql server listening port - username: root #your mysql server username - password: root #your mysql server password + username: 'root' #your mysql server username + password: 'root' #your mysql server password server: port: 18084 @@ -42,12 +42,12 @@ seata: nacos: serverAddr: 127.0.0.1:8848 dataId: "seata.properties" - username: "nacos" - password: "nacos" + username: 'nacos' + password: 'nacos' registry: type: nacos nacos: application: seata-server server-addr: 127.0.0.1:8848 - username: "nacos" - password: "nacos" + username: 'nacos' + password: 'nacos' diff --git a/spring-cloud-alibaba-examples/seata-example/business-service/src/main/resources/application.yml b/spring-cloud-alibaba-examples/seata-example/business-service/src/main/resources/application.yml index 78d363f08..76fdba5f3 100644 --- a/spring-cloud-alibaba-examples/seata-example/business-service/src/main/resources/application.yml +++ b/spring-cloud-alibaba-examples/seata-example/business-service/src/main/resources/application.yml @@ -21,16 +21,16 @@ seata: type: nacos nacos: serverAddr: 127.0.0.1:8848 - dataId: "seata.properties" - username: "nacos" - password: "nacos" + dataId: 'seata.properties' + username: 'nacos' + password: 'nacos' registry: type: nacos nacos: application: seata-server server-addr: 127.0.0.1:8848 - username: "nacos" - password: "nacos" + username: 'nacos' + password: 'nacos' feign: client: diff --git a/spring-cloud-alibaba-examples/seata-example/order-service/src/main/resources/application.yml b/spring-cloud-alibaba-examples/seata-example/order-service/src/main/resources/application.yml index bf948818d..49683f33a 100644 --- a/spring-cloud-alibaba-examples/seata-example/order-service/src/main/resources/application.yml +++ b/spring-cloud-alibaba-examples/seata-example/order-service/src/main/resources/application.yml @@ -4,8 +4,8 @@ base: hostname: 127.0.0.1 #your mysql server ip address dbname: seata #your database name for test port: 3306 #your mysql server listening port - username: root #your mysql server username - password: root #your mysql server password + username: 'root' #your mysql server username + password: 'root' #your mysql server password server: port: 18083 @@ -39,12 +39,12 @@ seata: nacos: serverAddr: 127.0.0.1:8848 dataId: "seata.properties" - username: "nacos" - password: "nacos" + username: 'nacos' + password: 'nacos' registry: type: nacos nacos: application: seata-server server-addr: 127.0.0.1:8848 - username: "nacos" - password: "nacos" + username: 'nacos' + password: 'nacos' diff --git a/spring-cloud-alibaba-examples/seata-example/seata-server/src/main/resources/application.yml b/spring-cloud-alibaba-examples/seata-example/seata-server/src/main/resources/application.yml index 0cf028df8..a731fd3ea 100644 --- a/spring-cloud-alibaba-examples/seata-example/seata-server/src/main/resources/application.yml +++ b/spring-cloud-alibaba-examples/seata-example/seata-server/src/main/resources/application.yml @@ -4,8 +4,8 @@ base: hostname: 127.0.0.1 #your mysql server ip address dbname: seata #your database name for test port: 3306 #your mysql server listening port - username: root #your mysql server username - password: root #your mysql server password + username: 'root' #your mysql server username + password: 'root' #your mysql server password server: port: 7091 @@ -27,8 +27,8 @@ logging: console: user: - username: seata - password: seata + username: 'seata' + password: 'seata' seata: config: @@ -50,8 +50,8 @@ seata: application: seata-server server-addr: 127.0.0.1:8848 cluster: default - username: nacos - password: nacos + username: 'nacos' + password: 'nacos' store: # support: file 、 db 、 redis mode: db diff --git a/spring-cloud-alibaba-examples/seata-example/storage-service/src/main/resources/application.yml b/spring-cloud-alibaba-examples/seata-example/storage-service/src/main/resources/application.yml index 8df1abca6..3d4d94e64 100644 --- a/spring-cloud-alibaba-examples/seata-example/storage-service/src/main/resources/application.yml +++ b/spring-cloud-alibaba-examples/seata-example/storage-service/src/main/resources/application.yml @@ -4,8 +4,8 @@ base: hostname: 127.0.0.1 #your mysql server ip address dbname: seata #your database name for test port: 3306 #your mysql server listening port - username: root #your mysql server username - password: root #your mysql server password + username: 'root' #your mysql server username + password: 'root' #your mysql server password server: port: 18082 @@ -40,13 +40,13 @@ seata: nacos: serverAddr: 127.0.0.1:8848 dataId: "seata.properties" - username: "nacos" - password: "nacos" + username: 'nacos' + password: 'nacos' registry: type: nacos nacos: application: seata-server server-addr: 127.0.0.1:8848 - username: "nacos" - password: "nacos" + username: 'nacos' + password: 'nacos' diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-sidecar-examples/spring-cloud-alibaba-sidecar-nacos-example/src/main/resources/application.yml b/spring-cloud-alibaba-examples/spring-cloud-alibaba-sidecar-examples/spring-cloud-alibaba-sidecar-nacos-example/src/main/resources/application.yml index 22642a71c..467a4efaa 100644 --- a/spring-cloud-alibaba-examples/spring-cloud-alibaba-sidecar-examples/spring-cloud-alibaba-sidecar-nacos-example/src/main/resources/application.yml +++ b/spring-cloud-alibaba-examples/spring-cloud-alibaba-sidecar-examples/spring-cloud-alibaba-sidecar-nacos-example/src/main/resources/application.yml @@ -3,8 +3,8 @@ server: spring: cloud: nacos: - username: nacos - password: nacos + username: 'nacos' + password: 'nacos' discovery: server-addr: 127.0.0.1:8848 group: test