Skip to content

Commit ad76d5e

Browse files
committed
Edits per feedback
1 parent 6cb5423 commit ad76d5e

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

articles/aks/jenkins-continuous-deployment.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ms.date: 09/27/2018
1212
# Tutorial: Deploy from GitHub to Azure Kubernetes Service (AKS) with Jenkins continuous integration and deployment
1313

1414
This tutorial deploys a sample app from GitHub to an
15-
[Azure Kubernetes Service (AKS)](azure/aks/intro-kubernetes)
15+
[Azure Kubernetes Service (AKS)](/azure/aks/intro-kubernetes)
1616
cluster by setting up continuous integration (CI) and
1717
continuous deployment (CD) in Jenkins. That way, when you
1818
update your app by pushing commits to GitHub, Jenkins
1.22 KB
Loading
1.15 KB
Loading

articles/jenkins/tutorial-jenkins-deploy-web-app-azure-app-service.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -168,9 +168,9 @@ Here's the output generated by the **`create-for-rbac`** command:
168168

169169
```json
170170
{
171-
"appId": "yourClient-ID", // A GUID such as AAAAAAAA-AAAA-AAAA-AAAA-AAAAAAAAAAAA
172-
"displayName": "yourServicePrincipalName", // A user-friendly name for your service principal
173-
"name": "http://yourServicePrincipalName",
171+
"appId": "yourAzureServicePrincipal-ID", // A GUID such as AAAAAAAA-AAAA-AAAA-AAAA-AAAAAAAAAAAA
172+
"displayName": "yourAzureServicePrincipalName", // A user-friendly name for your Azure service principal
173+
"name": "http://yourAzureServicePrincipalName",
174174
"password": "yourSecurePassword",
175175
"tenant": "yourAzureActiveDirectoryTenant-ID" // A GUID such as BBBBBBBB-BBBB-BBBB-BBBB-BBBBBBBBBBBB
176176
}
@@ -200,11 +200,11 @@ and elsewhere to these credential properties:
200200
| Property | Value | Description |
201201
|----------|-------|-------------|
202202
| **Kind** | Azure Service Principal | The type of credential you're using |
203-
| **Subscription ID** | <*yourAzureSubscription-ID*> | The GUID for your Azure subscription <p>**Tip**: If you don't know your Azure subscription ID, run this Azure CLI command from either the command line or in Cloud Shell, and then use the `id` GUID value: <p>`az account list` |
204-
| **Client ID** | <*yourClient-ID*> | The `appId` GUID previously generated for your Azure service principal |
203+
| **Subscription ID** | <*yourAzureSubscription-ID*> | The GUID value for your Azure subscription <p>**Tip**: If you don't know your Azure subscription ID, run this Azure CLI command from either the command line or in Cloud Shell, and then use the `id` GUID value: <p>`az account list` |
204+
| **Client ID** | <*yourAzureServicePrincipal-ID*> | The `appId` GUID value for previously generated for your Azure service principal |
205205
| **Client Secret** | <*yourSecurePassword*> | The `password` value or "secret" you provided for your Azure service principal |
206-
| **Tenant ID** | <*yourAzureActiveDirectoryTenant-ID*> | The `tenant` GUID for your Azure Active Directory tenant |
207-
| **ID** | <*yourServicePrincipalName*> | The `displayName` value for your Azure service principal |
206+
| **Tenant ID** | <*yourAzureActiveDirectoryTenant-ID*> | The `tenant` GUID value for your Azure Active Directory tenant |
207+
| **ID** | <*yourAzureServicePrincipalName*> | The `displayName` value for your Azure service principal |
208208
||||
209209

210210
For example:
@@ -240,7 +240,7 @@ can deploy to Azure without using your own credentials.
240240
For example, use the service principal ID you created earlier.
241241

242242
```text
243-
AZURE_CRED_ID=yourClient-ID
243+
AZURE_CRED_ID=yourAzureServicePrincipal-ID
244244
RES_GROUP=yourWebAppAzureResourceGroupName
245245
WEB_APP=yourWebAppName
246246
```

0 commit comments

Comments
 (0)