Skip to content

Commit 106781e

Browse files
authored
Merge pull request #264290 from KarlErickson/karler-quick-fixes
miscellaneous fixes
2 parents a373ec2 + 3012d20 commit 106781e

11 files changed

+107
-94
lines changed

articles/spring-apps/application-observability.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ To use Application Insights to investigate the performance issues, use the follo
152152
> [Set up a staging environment](../spring-apps/how-to-staging-environment.md)
153153
154154
> [!div class="nextstepaction"]
155-
> [Map an existing custom domain to Azure Spring Apps](./tutorial-custom-domain.md)
155+
> [Map an existing custom domain to Azure Spring Apps](./how-to-custom-domain.md)
156156
157157
> [!div class="nextstepaction"]
158158
> [Use TLS/SSL certificates](./how-to-use-tls-certificate.md)

articles/spring-apps/how-to-cicd.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ The following steps show you how to enable a blue-green deployment from the **Re
189189
1. Add a new pipeline, and select **Empty job** to create a job.
190190
1. Under **Stages** select the line **1 job, 0 task**
191191

192-
:::image type="content" source="media/spring-cloud-how-to-cicd/create-new-job.jpg" alt-text="Screenshot of where to select to add a task to a job.":::
192+
:::image type="content" source="media/spring-cloud-how-to-cicd/create-new-job.jpg" alt-text="Screenshot of where to select to add a task to a job." lightbox="media/spring-cloud-how-to-cicd/create-new-job.jpg":::
193193

194194
1. Select the **+** to add a task to the job.
195195
1. Search for the **Azure Spring Apps** template, then select **Add** to add the task to the job.
@@ -205,11 +205,11 @@ The following steps show you how to enable a blue-green deployment from the **Re
205205
1. Navigate to the **Azure Spring Apps Deploy** task in **Stage 1**, then select the ellipsis next to **Package or folder**.
206206
1. Select *spring-boot-complete-0.0.1-SNAPSHOT.jar* in the dialog, then select **OK**.
207207

208-
:::image type="content" source="media/spring-cloud-how-to-cicd/change-artifact-path.jpg" alt-text="Screenshot of the 'Select a file or folder' dialog box.":::
208+
:::image type="content" source="media/spring-cloud-how-to-cicd/change-artifact-path.jpg" alt-text="Screenshot of the 'Select a file or folder' dialog box." lightbox="media/spring-cloud-how-to-cicd/change-artifact-path.jpg":::
209209

210210
1. Select the **+** to add another **Azure Spring Apps** task to the job.
211-
2. Change the action to **Set Production Deployment**.
212-
3. Select **Save**, then **Create release** to automatically start the deployment.
211+
1. Change the action to **Set Production Deployment**.
212+
1. Select **Save**, then **Create release** to automatically start the deployment.
213213

214214
To verify your app's current release status, select **View release**. After this task is finished, visit the Azure portal to verify your app status.
215215

articles/spring-apps/how-to-configure-enterprise-spring-cloud-gateway.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -390,9 +390,9 @@ The following list shows the options available for Autoscale demand management:
390390

391391
On the Azure portal, choose how you want to scale. The following screenshot shows the **Custom autoscale** option and mode settings:
392392

393-
:::image type="content" source="media/spring-cloud-autoscale/custom-autoscale.png" alt-text="Screenshot of the Azure portal that shows the Autoscale setting page with the Custom autoscale option highlighted.":::
393+
:::image type="content" source="media/spring-cloud-autoscale/custom-autoscale.png" alt-text="Screenshot of the Azure portal that shows the Autoscale setting page with the Custom autoscale option highlighted." lightbox="media/spring-cloud-autoscale/custom-autoscale.png":::
394394

395-
#### [Azure CLI](#tab/Azure-CLI)
395+
#### [Azure CLI](#tab/Azure-CLI)
396396

397397
Use the following command to create an autoscale setting:
398398

articles/spring-apps/how-to-enable-ingress-to-app-tls.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,23 +23,23 @@ This article describes secure communications in Azure Spring Apps. The article a
2323

2424
The following picture shows the overall secure communication support in Azure Spring Apps.
2525

26-
:::image type="content" source="media/enable-end-to-end-tls/secured-tls.png" alt-text="Screenshot of secured T L S flow in Azure Spring Apps.":::
26+
:::image type="content" source="media/enable-end-to-end-tls/secured-tls.png" alt-text="Screenshot of secured TLS flow in Azure Spring Apps." border="false":::
2727

2828
## Secure communication model within Azure Spring Apps
2929

3030
This section explains the secure communication model shown in the overview diagram above.
3131

3232
1. The client request from the client to the application in Azure Spring Apps comes into the ingress controller. The request can be either HTTP or HTTPS. The TLS certificate returned by the ingress controller is issued by the Microsoft Azure TLS issuing CA.
33-
33+
3434
If the app has been mapped to an existing custom domain and is configured as HTTPS only, the request to the ingress controller can only be HTTPS. The TLS certificate returned by the ingress controller is the SSL binding certificate for that custom domain. The server side SSL/TLS verification for the custom domain is done in the ingress controller.
3535

36-
2. The secure communication between the ingress controller and the applications in Azure Spring Apps are controlled by the ingress-to-app TLS. You can also control the communication through the portal or CLI, which will be explained later in this article. If ingress-to-app TLS is disabled, the communication between the ingress controller and the apps in Azure Spring Apps is HTTP. If ingress-to-app TLS is enabled, the communication will be HTTPS and has no relation to the communication between the clients and the ingress controller. The ingress controller won't verify the certificate returned from the apps because the ingress-to-app TLS encrypts the communication.
36+
1. The secure communication between the ingress controller and the applications in Azure Spring Apps are controlled by the ingress-to-app TLS. You can also control the communication through the portal or CLI, which will be explained later in this article. If ingress-to-app TLS is disabled, the communication between the ingress controller and the apps in Azure Spring Apps is HTTP. If ingress-to-app TLS is enabled, the communication will be HTTPS and has no relation to the communication between the clients and the ingress controller. The ingress controller won't verify the certificate returned from the apps because the ingress-to-app TLS encrypts the communication.
3737

38-
3. Communication between the apps and the Azure Spring Apps services is always HTTPS and handled by Azure Spring Apps. Such services include config server, service registry, and Eureka server.
38+
1. Communication between the apps and the Azure Spring Apps services is always HTTPS and handled by Azure Spring Apps. Such services include config server, service registry, and Eureka server.
3939

40-
4. You manage the communication between the applications. You can also take advantage of Azure Spring Apps features to load certificates into the application's trust store. For more information, see [Use TLS/SSL certificates in an application](./how-to-use-tls-certificate.md).
40+
1. You manage the communication between the applications. You can also take advantage of Azure Spring Apps features to load certificates into the application's trust store. For more information, see [Use TLS/SSL certificates in an application](./how-to-use-tls-certificate.md).
4141

42-
5. You manage the communication between applications and external services. To reduce your development effort, Azure Spring Apps helps you manage your public certificates and loads them into your application's trust store. For more information, see [Use TLS/SSL certificates in an application](./how-to-use-tls-certificate.md).
42+
1. You manage the communication between applications and external services. To reduce your development effort, Azure Spring Apps helps you manage your public certificates and loads them into your application's trust store. For more information, see [Use TLS/SSL certificates in an application](./how-to-use-tls-certificate.md).
4343

4444
## Enable ingress-to-app TLS for an application
4545

@@ -78,7 +78,7 @@ To enable ingress-to-app TLS in the [Azure portal](https://portal.azure.com/), f
7878
3. Select **Ingress-to-app TLS**.
7979
4. Switch **Ingress-to-app TLS** to *Yes*.
8080

81-
![Screenshot showing where to enable Ingress-to-app TLS in portal.](./media/enable-end-to-end-tls/enable-i2a-tls.png)
81+
:::image type="content" source="media/enable-end-to-end-tls/enable-i2a-tls.png" alt-text="Screenshot of the Azure portal that shows the Ingress-to-app TLS page and control." lightbox="media/enable-end-to-end-tls/enable-i2a-tls.png":::
8282

8383
### Verify ingress-to-app TLS status
8484

@@ -90,4 +90,4 @@ az spring app show -n app_name -s service_name -g resource_group_name
9090

9191
## Next steps
9292

93-
* [Access Config Server and Service Registry](how-to-access-data-plane-azure-ad-rbac.md)
93+
[Access Config Server and Service Registry](how-to-access-data-plane-azure-ad-rbac.md)

articles/spring-apps/how-to-integrate-azure-load-balancers.md

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,9 @@ Add endpoints in traffic manager:
5050
1. Input fully qualified domain name (FQDN) of each Azure Spring Apps public endpoint.
5151
1. Select **OK**.
5252

53-
![Traffic Manager 1](media/spring-cloud-load-balancers/traffic-manager-1.png)
54-
![Traffic Manager 2](media/spring-cloud-load-balancers/traffic-manager-2.png)
53+
:::image type="content" source="media/spring-cloud-load-balancers/traffic-manager-1.png" alt-text="Screenshot of the Azure portal that shows the Add endpoint page with an eastus FQDN with Priority 1." lightbox="media/spring-cloud-load-balancers/traffic-manager-1.png":::
54+
55+
:::image type="content" source="media/spring-cloud-load-balancers/traffic-manager-2.png" alt-text="Screenshot of the Azure portal that shows the Add endpoint page with a westus FQDN with Priority 2." lightbox="media/spring-cloud-load-balancers/traffic-manager-2.png":::
5556

5657
### Configure Custom Domain
5758

@@ -68,22 +69,22 @@ To integrate with Azure Spring Apps service, complete the following configuratio
6869
1. Specify **Target type** as *IP address* or *FQDN*.
6970
1. Enter your Azure Spring Apps public endpoints.
7071

71-
![App Gateway 1](media/spring-cloud-load-balancers/app-gateway-1.png)
72+
:::image type="content" source="media/spring-cloud-load-balancers/app-gateway-1.png" alt-text="Screenshot of the Azure portal that shows the Add backend pool page with the Backend targets values highlighted." lightbox="media/spring-cloud-load-balancers/app-gateway-1.png":::
7273

7374
### Add Custom Probe
7475

7576
1. Select **Health Probes** then **Add** to open custom **Probe** dialog.
76-
1. The key point is to select *No* for **Pick host name from backend HTTP settings** option and explicitly specify the host name. For more information, see [Application Gateway configuration for host name preservation](/azure/architecture/best-practices/host-name-preservation#application-gateway).
77+
1. The key point is to select **No** for **Pick host name from backend HTTP settings** option and explicitly specify the host name. For more information, see [Application Gateway configuration for host name preservation](/azure/architecture/best-practices/host-name-preservation#application-gateway).
7778

78-
![App Gateway 2](media/spring-cloud-load-balancers/app-gateway-2.png)
79+
:::image type="content" source="media/spring-cloud-load-balancers/app-gateway-2.png" alt-text="Screenshot of the Azure portal that shows the probe page." lightbox="media/spring-cloud-load-balancers/app-gateway-2.png":::
7980

8081
### Configure Backend Setting
8182

8283
1. Select **Backend settings** then **Add** to add a backend setting.
83-
1. **Override with new host name:** select *No*.
84-
1. **Use custom probe**: select *Yes* and pick the custom probe created above.
84+
1. **Override with new host name:** select **No**.
85+
1. **Use custom probe**: select **Yes** and pick the custom probe created above.
8586

86-
![App Gateway 3](media/spring-cloud-load-balancers/app-gateway-3.png)
87+
:::image type="content" source="media/spring-cloud-load-balancers/app-gateway-3.png" alt-text="Screenshot of the Azure portal that shows the Add Backend setting page." lightbox="media/spring-cloud-load-balancers/app-gateway-3.png":::
8788

8889
## Integrate Azure Spring Apps with Azure Front Door
8990

@@ -92,13 +93,13 @@ To integrate with Azure Spring Apps service and configure an origin group, use t
9293
1. **Add origin group**.
9394
1. Specify the backend endpoints by adding origins for the different Azure Spring Apps instances.
9495

95-
![Front Door 1](media/spring-cloud-load-balancers/front-door-1.png)
96+
:::image type="content" source="media/spring-cloud-load-balancers/front-door-1.png" alt-text="Screenshot of the Azure portal that shows the Add an origin group page with the Add an origin button highlighted." lightbox="media/spring-cloud-load-balancers/front-door-1.png":::
9697

9798
1. Specify **origin type** as *Azure Spring Apps*.
9899
1. Select your Azure Spring Apps instance for the **host name**.
99100
1. Keep the **origin host header** empty, so that the incoming host header will be used towards the backend. For more information, see [Azure Front Door configuration for host name preservation](/azure/architecture/best-practices/host-name-preservation#azure-front-door).
100101

101-
![Front Door 2](media/spring-cloud-load-balancers/front-door-2.png)
102+
:::image type="content" source="media/spring-cloud-load-balancers/front-door-2.png" alt-text="Screenshot of the Azure portal that shows the Add an origin page." lightbox="media/spring-cloud-load-balancers/front-door-2.png":::
102103

103104
## Next steps
104105

0 commit comments

Comments
 (0)