Skip to content

Commit 7b97be5

Browse files
authored
Sync release-hotfixes with main
Sync release-hotfixes with main
2 parents 3af28ff + 745d30b commit 7b97be5

File tree

50 files changed

+125
-760
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+125
-760
lines changed

.openpublishing.redirection.aks.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1355,6 +1355,11 @@
13551355
"redirect_url": "/azure/aks/hybrid/manage-node-pools",
13561356
"redirect_document_id": false
13571357
},
1358+
{
1359+
"source_path": "AKS-Hybrid/manage-control-plane-nodes.md",
1360+
"redirect_url": "/azure/aks/hybrid/manage-node-pools",
1361+
"redirect_document_id": false
1362+
},
13581363
{
13591364
"source_path": "AKS-Hybrid/deploy-metallb.md",
13601365
"redirect_url": "/azure/aks/hybrid/deploy-load-balancer",
@@ -1365,6 +1370,16 @@
13651370
"redirect_url": "/azure/aks/hybrid/aks-get-kubelet-logs",
13661371
"redirect_document_id": false
13671372
},
1373+
{
1374+
"source_path": "AKS-Hybrid/reference/aks-edge-ps/set-aksedgebillingpodstate.md",
1375+
"redirect_url": "/azure/aks/hybrid/reference/aks-edge-ps/",
1376+
"redirect_document_id": false
1377+
},
1378+
{
1379+
"source_path": "AKS-Hybrid/reference/aks-edge-ps/set-aksedgenodeconnectivitymode.md",
1380+
"redirect_url": "/azure/aks/hybrid/reference/aks-edge-ps/",
1381+
"redirect_document_id": false
1382+
},
13681383
{
13691384
"source_path": "AKS-Hybrid/aks-hci-evaluation-guide.md",
13701385
"redirect_url": "/azure/aks/hybrid/overview",

AKS-Hybrid/deploy-container-registry.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -157,14 +157,14 @@ Once you create the image pull secret, you can use it to create Kubernetes pods
157157
apiVersion: v1
158158
kind: Pod
159159
metadata:
160-
name: poemfinder-app
161-
namespace: mydemoapps
160+
name: poemfinder-app
161+
namespace: mydemoapps
162162
spec:
163-
containers:
164-
- name: poemfinder-app
165-
image: <REGISTRY_NAME>.azurecr.io/poemfinder-app:v1.0
166-
imagePullPolicy: IfNotPresent
167-
- imagePullSecrets:
163+
containers:
164+
- name: poemfinder-app
165+
image: <REGISTRY_NAME>.azurecr.io/poemfinder-app:v1.0
166+
imagePullPolicy: IfNotPresent
167+
imagePullSecrets:
168168
- name: acr-secret
169169
```
170170

AKS-Hybrid/manage-control-plane-nodes.md

Lines changed: 0 additions & 51 deletions
This file was deleted.
Binary file not shown.
Binary file not shown.
-321 KB
Binary file not shown.
-43.8 KB
Binary file not shown.
Binary file not shown.
Binary file not shown.
-13.1 KB
Binary file not shown.

0 commit comments

Comments
 (0)