Skip to content

Commit 2daf5b8

Browse files
updates
1 parent d9c03db commit 2daf5b8

File tree

3 files changed

+30
-25
lines changed

3 files changed

+30
-25
lines changed

articles/container-apps/TOC.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -306,15 +306,15 @@
306306
- name: Build environment variables
307307
href: java-build-environment-variables.md
308308
displayName: java
309-
- name: Spring Cloud Config Server component usage
309+
- name: Use Spring Cloud Config Server
310310
href: java-spring-cloud-config-server-usage.md
311311
displayName: java
312312
- name: Tutorials
313313
items:
314314
- name: Deploy a WAR file
315315
href: java-deploy-war-file.md
316316
displayName: java
317-
- name: Connect to a managed Spring Cloud Config Server
317+
- name: Connect to Spring Cloud Config Server
318318
href: java-spring-cloud-config-server.md
319319
displayName: java
320320
- name: Billing & quotas

articles/container-apps/java-spring-cloud-config-server-usage.md

Lines changed: 26 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -54,67 +54,67 @@ The following table lists the different configuration values available.
5454

5555
### Git backend configurations
5656

57-
`spring.cloud.config.server.git`
57+
The following configuration settings are available on the `spring.cloud.config.server.git` configuration property.
5858

5959
| Name | Property path | Description |
6060
|---|---|---|
6161
| URI | `repos.{repoName}.uri` | URI of remote repository. |
6262
| Username | `repos.{repoName}.username` | Username for authentication with remote repository. |
6363
| Password | `repos.{repoName}.password` | Password for authentication with remote repository. |
6464
| Search paths | `repos.{repoName}.search-paths` | Search paths to use within local working copy. By default searches only the root. |
65-
| Force pull | `repos.{repoName}.force-pull` | Flag to indicate that the repository should force pull. If true discard any local changes and take from remote repository. |
66-
| Default label | `repos.{repoName}.default-label` | The default label used for Git is `main`. If you don't set `default-label` and a branch named `main` doesn't exist, the config server will by default also try to check out a branch named `master`. If you would like to disable the fallback branch behavior you can set `tryMasterBranch` to `false`. |
67-
| Try master branch | `repos.{repoName}.try-master-branch` | The config server by default tries to check out a branch named `master`. | `true` |
65+
| Force pull | `repos.{repoName}.force-pull` | Flag to indicate that the repository should force pull. If this value is set to `true`, then discard any local changes and take from remote repository. |
66+
| Default label | `repos.{repoName}.default-label` | The default label used for Git is `main`. If you don't set `default-label` and a branch named `main` doesn't exist, then the config server tries to check out a branch named `master`. To disable the fallback branch behavior, you can set `tryMasterBranch` to `false`. |
67+
| Try `master` branch | `repos.{repoName}.try-master-branch` | When set to `true`, the config server by default tries to check out a branch named `master`. |
6868
| Skip SSL validation | `repos.{repoName}.skip-ssl-validation` | The configuration server’s validation of the Git server’s SSL certificate can be disabled by setting the `git.skipSslValidation` property to `true`. |
6969
| Clone-on-start | `repos.{repoName}.clone-on-start` | Flag to indicate that the repository should be cloned on startup (not on demand). Generally leads to slower startup but faster first query. |
7070
| Timeout | `repos.{repoName}.timeout` | Timeout (in seconds) for obtaining HTTP or SSH connection (if applicable). Default 5 seconds. |
7171
| Refresh rate | `repos.{repoName}.refresh-rate` | How often the config server fetches updated configuration data from your Git backend. |
7272
| Private key | `repos.{repoName}.private-key` | Valid SSH private key. Must be set if `ignore-local-ssh-settings` is `true` and Git URI is SSH format. |
7373
| Host key | `repos.{repoName}.host-key` | Valid SSH host key. Must be set if `host-key-algorithm` is also set. |
74-
| Host key algorithm` | `repos.{repoName}.host-key-algorithm` | One of `ssh-dss`, `ssh-rsa`, `ssh-ed25519`, `ecdsa-sha2-nistp256`, `ecdsa-sha2-nistp384`, or `ecdsa-sha2-nistp521`. Must be set if `host-key` is also set. |
74+
| Host key algorithm | `repos.{repoName}.host-key-algorithm` | One of `ssh-dss`, `ssh-rsa`, `ssh-ed25519`, `ecdsa-sha2-nistp256`, `ecdsa-sha2-nistp384`, or `ecdsa-sha2-nistp521`. Must be set if `host-key` is also set. |
7575
| Strict host key checking | `repos.{repoName}.strict-host-key-checking` | `true` or `false`. If `false`, ignore errors with host key. |
7676
| Repo location | `repos.{repoName}` | URI of remote repository. |
7777
| Repo name patterns | `repos.{repoName}.pattern` | The pattern format is a comma-separated list of {application}/{profile} names with wildcards. If {application}/{profile} doesn't match any of the patterns, it uses the default URI defined under. |
7878

7979
### Common configurations
8080

81-
- logging related configurations
81+
### Logging configurations
8282

83-
- [**logging.level.***](https://docs.spring.io/spring-boot/docs/2.1.13.RELEASE/reference/html/boot-features-logging.html#boot-features-custom-log-levels)
83+
- [**logging.level.**\*](https://docs.spring.io/spring-boot/docs/2.1.13.RELEASE/reference/html/boot-features-logging.html#boot-features-custom-log-levels)
8484

85-
- [**logging.group.***](https://docs.spring.io/spring-boot/docs/2.1.13.RELEASE/reference/html/boot-features-logging.html#boot-features-custom-log-groups)
85+
- [**logging.group.**\*](https://docs.spring.io/spring-boot/docs/2.1.13.RELEASE/reference/html/boot-features-logging.html#boot-features-custom-log-groups)
8686

87-
- Any other configurations under logging.* namespace should be forbidden, for example, writing log files by using `logging.file` should be forbidden.
87+
Any other configurations under the `logging.*` namespace should be forbidden. For example, disallow writing log files by using `logging.file`.
8888

8989
- **spring.cloud.config.server.overrides**
9090

9191
- Extra map for a property source to be sent to all clients unconditionally.
9292

9393
- **spring.cloud.config.override-none**
9494

95-
- You can change the priority of all overrides in the client to be more like default values, letting applications supply their own values in environment variables or System properties, by setting the spring.cloud.config.override-none=true flag (the default is false) in the remote repository.
95+
You can change the priority of all overrides in the client to be more like default values. The setting allows applications to supply their own values in environment variables or System properties. Values are set with the `spring.cloud.config.override-none=true` flag (the default is `false`) in the remote repository.
9696

9797
- **spring.cloud.config.allow-override**
9898

99-
- If you enable config first bootstrap, you can allow client applications to override configuration from the config server by placing two properties within the applications configuration coming from the config server.
99+
If you enable config first bootstrap, you allow client applications to override configuration from the config server by placing two properties within the application's configuration coming from the config server.
100100

101101
- **spring.cloud.config.server.health.**
102102

103-
- You can configure the Health Indicator to check more applications along with custom profiles and custom labels
103+
You can configure the Health Indicator to check more applications along with custom profiles and custom labels
104104

105105
- **spring.cloud.config.server.accept-empty**
106106

107-
- You can set spring.cloud.config.server.accept-empty to false so that Server would return an HTTP 404 status, if the application isn't found. By default, this flag is set to true.
107+
You can set `spring.cloud.config.server.accept-empty` to `false` so that the server returns an HTTP `404` status if the application isn't found. By default, this flag is set to `true`.
108108

109-
- **Encryption and Decryption (symmetric)**
109+
### Encryption and decryption (symmetric)
110110

111-
- **encrypt.key**
111+
- **encrypt.key**
112112

113-
- It's convenient to use a symmetric key since it's a single property value to configure.
113+
Using a symmetric key is often most convenient, as it's a single property value to configure.
114114

115-
- **spring.cloud.config.server.encrypt.enabled**
115+
- **spring.cloud.config.server.encrypt.enabled**
116116

117-
- You can set this value to `false`, to disable server-side decryption.
117+
You can set this value to `false`, to disable server-side decryption.
118118

119119
## Spring Cloud Config Server refresh
120120

@@ -148,9 +148,9 @@ Instead, you can automatically refresh values from Config Server by letting the
148148
}
149149
```
150150

151-
1. Enable `autorefresh` and set the appropriate refresh interval in the *application.yml* file. In the following example, the client polls for configuration changes every 60 seconds, which is the minimum value you can set for a refresh interval.
151+
1. Enable `autorefresh` and set the appropriate refresh interval in the *application.yml* file. In the following example, the client polls for a configuration change every 60 seconds, which is the minimum value you can set for a refresh interval.
152152

153-
By default, `autorefresh` is set to false and the refresh-interval is set to 60 seconds.
153+
By default, `autorefresh` is set to `false`, and `refresh-interval` is set to 60 seconds.
154154

155155
``` yaml
156156
spring:
@@ -231,4 +231,9 @@ You can use client side decryption of properties by following the steps:
231231
```
232232
encrypt:
233233
key: somerandomkey
234-
```
234+
```
235+
236+
## Next steps
237+
238+
> [!div class="nextstepaction"]
239+
> [Set up a Spring Cloud Config Server](java-spring-cloud-config-server.md)

articles/container-apps/java-spring-cloud-config-server.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ When running in Spring Cloud Config Server in Azure Container Apps, be aware of
4040
| Item | Explanation |
4141
|---|---|
4242
| **Scope** | The Spring Cloud Config Server runs in the same environment as the connected container app. |
43-
| **Scaling** | To maintain a single source of truth, the Spring Cloud Config Server doesn't scale. The scaling properties, `minReplicas` and `maxReplicas` are both set to `1`. |
43+
| **Scaling** | To maintain a single source of truth, the Spring Cloud Config Server doesn't scale. The scaling properties `minReplicas` and `maxReplicas` are both set to `1`. |
4444
| **Resources** | The container resource allocation for Spring Cloud Config Server is fixed, the number of the CPU cores is 0.5, and the memory size is 1Gi. |
4545
| **Pricing** | The Spring Cloud Config Server billing falls under consumption-based pricing. Resources consumed by managed Java components are billed at the active/idle rates. You may delete components that are no longer in use to stop billing. |
4646
| **Binding** | The container app connects to a Spring Cloud Config Server via a binding. The binding injects configurations into container app environment variables. Once a binding is established, the container app can read configuration values from environment variables. |
@@ -196,4 +196,4 @@ az group delete \
196196
## Next steps
197197

198198
> [!div class="nextstepaction"]
199-
> [Customize Spring Cloud Config Server settings](java-spring-cloud-config-server-usage.md)
199+
> [Customize Spring Cloud Config Server settings](java-spring-cloud-config-server-usage.md)

0 commit comments

Comments
 (0)