Skip to content

Commit 24d04f6

Browse files
v-sissondanv-sissondan
authored
Merge branch 'main' into ip-migration
2 parents 3abf913 + d588293 commit 24d04f6

File tree

1,057 files changed

+4956
-9173
lines changed

Some content is hidden

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

1,057 files changed

+4956
-9173
lines changed

‎.acrolinx-config.edn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
{:allowed-branchname-matches ["main" "release-.*"]
2-
:allowed-filename-matches ["azure-stack" "AKS-Hybrid" "azure-managed-lustre"]}
2+
:allowed-filename-matches ["azure-stack" "AKS-Hybrid" "azure-managed-lustre" "azure-local"]}

‎.openpublishing.publish.config.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"docsets_to_publish": [
33
{
44
"docset_name": "AKS-Hybrid",
5-
"build_source_folder": "AKS-Hybrid",
5+
"build_source_folder": "AKS-Arc",
66
"build_output_subfolder": "AKS-Hybrid",
77
"locale": "en-us",
88
"monikers": [],
@@ -136,6 +136,7 @@
136136
".openpublishing.redirection.pep.json",
137137
".openpublishing.redirection.aks.json",
138138
".openpublishing.redirection.aks-edge.json",
139-
".openpublishing.redirection.azure-local.json"
139+
".openpublishing.redirection.azure-local.json",
140+
".openpublishing.redirection.hub-hotfixes.json"
140141
]
141142
}

‎.openpublishing.redirection.aks-edge.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"redirections": [
33
{
4-
"source_path": "AKS-Hybrid/reference/aks-edge-ps/set-aksedgearcconnection.md",
4+
"source_path": "AKS-Arc/reference/aks-edge-ps/set-aksedgearcconnection.md",
55
"redirect_url": "/azure/aks/hybrid/reference/aks-edge-ps/connect-aksedgearc",
66
"redirect_document_id": false
77
}

‎.openpublishing.redirection.aks.json

Lines changed: 42 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1236,7 +1236,7 @@
12361236
"redirect_document_id": false
12371237
},
12381238
{
1239-
"source_path": "AKS-Hybrid/aks-lite-overview.md",
1239+
"source_path": "AKS-Arc/aks-lite-overview.md",
12401240
"redirect_url": "/azure/aks/hybrid/aks-edge-overview",
12411241
"redirect_document_id": false
12421242
},
@@ -1246,184 +1246,189 @@
12461246
"redirect_document_id": false
12471247
},
12481248
{
1249-
"source_path": "AKS-hybrid/certificates-update-after-sixty-days.md",
1249+
"source_path": "AKS-Arc/certificates-update-after-sixty-days.md",
12501250
"redirect_url": "/azure/aks/hybrid/repair-certificates",
12511251
"redirect_document_id": false
12521252
},
12531253
{
1254-
"source_path": "AKS-Hybrid/aks-edge-concept.md",
1254+
"source_path": "AKS-Arc/aks-edge-concept.md",
12551255
"redirect_url": "/azure/aks/hybrid/aks-edge-concept-clusters-nodes",
12561256
"redirect_document_id": false
12571257
},
12581258
{
1259-
"source_path": "AKS-Hybrid/aks-edge-deployment-options.md",
1259+
"source_path": "AKS-Arc/aks-edge-deployment-options.md",
12601260
"redirect_url": "/azure/aks/hybrid/aks-edge-concept-clusters-nodes",
12611261
"redirect_document_id": false
12621262
},
12631263
{
1264-
"source_path": "AKS-Hybrid/repair-certificates.md",
1264+
"source_path": "AKS-Arc/repair-certificates.md",
12651265
"redirect_url": "/azure/aks/hybrid/certificates-overview",
12661266
"redirect_document_id": false
12671267
},
12681268
{
1269-
"source_path": "AKS-Hybrid/secure-communication.md",
1269+
"source_path": "AKS-Arc/secure-communication.md",
12701270
"redirect_url": "/azure/aks/hybrid/certificates-overview",
12711271
"redirect_document_id": false
12721272
},
12731273
{
1274-
"source_path": "AKS-Hybrid/aks-hci-evaluation-guide-1.md",
1274+
"source_path": "AKS-Arc/aks-hci-evaluation-guide-1.md",
12751275
"redirect_url": "/azure/aks/hybrid/aks-hci-evaluation-guide",
12761276
"redirect_document_id": false
12771277
},
12781278
{
1279-
"source_path": "AKS-Hybrid/aks-hci-evaluation-guide-2a.md",
1279+
"source_path": "AKS-Arc/aks-hci-evaluation-guide-2a.md",
12801280
"redirect_url": "/azure/aks/hybrid/aks-hci-evaluation-guide",
12811281
"redirect_document_id": false
12821282
},
12831283
{
1284-
"source_path": "AKS-Hybrid/aks-hci-evaluation-guide-2b.md",
1284+
"source_path": "AKS-Arc/aks-hci-evaluation-guide-2b.md",
12851285
"redirect_url": "/azure/aks/hybrid/aks-hci-evaluation-guide",
12861286
"redirect_document_id": false
12871287
},
12881288
{
1289-
"source_path": "AKS-Hybrid/aks-hci-evaluation-guide-3.md",
1289+
"source_path": "AKS-Arc/aks-hci-evaluation-guide-3.md",
12901290
"redirect_url": "/azure/aks/hybrid/aks-hci-evaluation-guide",
12911291
"redirect_document_id": false
12921292
},
12931293
{
1294-
"source_path": "AKS-Hybrid/aks-hybrid-preview-overview.md",
1294+
"source_path": "AKS-Arc/aks-hybrid-preview-overview.md",
12951295
"redirect_url": "/azure/aks/hybrid/aks-hybrid-preview-uninstall",
12961296
"redirect_document_id": false
12971297
},
12981298
{
1299-
"source_path": "AKS-Hybrid/aks-hybrid-preview-requirements.md",
1299+
"source_path": "AKS-Arc/aks-hybrid-preview-requirements.md",
13001300
"redirect_url": "/azure/aks/hybrid/aks-hybrid-preview-uninstall",
13011301
"redirect_document_id": false
13021302
},
13031303
{
1304-
"source_path": "AKS-Hybrid/aks-hybrid-preview-azure-vm.md",
1304+
"source_path": "AKS-Arc/aks-hybrid-preview-azure-vm.md",
13051305
"redirect_url": "/azure/aks/hybrid/aks-create-clusters-cli",
13061306
"redirect_document_id": false
13071307
},
13081308
{
1309-
"source_path": "AKS-Hybrid/deploy-aks-service-hci.md",
1309+
"source_path": "AKS-Arc/deploy-aks-service-hci.md",
13101310
"redirect_url": "/azure/aks/hybrid/aks-hybrid-preview-uninstall",
13111311
"redirect_document_id": false
13121312
},
13131313
{
1314-
"source_path": "AKS-Hybrid/deploy-arc-resource-bridge-windows-server.md",
1314+
"source_path": "AKS-Arc/deploy-arc-resource-bridge-windows-server.md",
13151315
"redirect_url": "/azure/aks/hybrid/aks-hybrid-preview-uninstall",
13161316
"redirect_document_id": false
13171317
},
13181318
{
1319-
"source_path": "AKS-Hybrid/create-aks-hybrid-preview-networks.md",
1319+
"source_path": "AKS-Arc/create-aks-hybrid-preview-networks.md",
13201320
"redirect_url": "/azure/aks/hybrid/aks-hybrid-preview-uninstall",
13211321
"redirect_document_id": false
13221322
},
13231323
{
1324-
"source_path": "AKS-Hybrid/create-aks-hybrid-preview-cli.md",
1324+
"source_path": "AKS-Arc/create-aks-hybrid-preview-cli.md",
13251325
"redirect_url": "/azure/aks/hybrid/aks-create-clusters-cli",
13261326
"redirect_document_id": false
13271327
},
13281328
{
1329-
"source_path": "AKS-Hybrid/create-aks-hybrid-preview-portal.md",
1329+
"source_path": "AKS-Arc/create-aks-hybrid-preview-portal.md",
13301330
"redirect_url": "/azure/aks/hybrid/aks-create-clusters-cli",
13311331
"redirect_document_id": false
13321332
},
13331333
{
1334-
"source_path": "AKS-Hybrid/troubleshoot-aks-hybrid-preview.md",
1334+
"source_path": "AKS-Arc/troubleshoot-aks-hybrid-preview.md",
13351335
"redirect_url": "/azure/aks/hybrid/aks-hybrid-preview-uninstall",
13361336
"redirect_document_id": false
13371337
},
13381338
{
1339-
"source_path": "AKS-Hybrid/aks-hybrid-options-overview.md",
1339+
"source_path": "AKS-Arc/aks-hybrid-options-overview.md",
13401340
"redirect_url": "/azure/aks/hybrid/overview",
13411341
"redirect_document_id": false
13421342
},
13431343
{
1344-
"source_path": "AKS-Hybrid/aks-preview-overview.md",
1344+
"source_path": "AKS-Arc/aks-preview-overview.md",
13451345
"redirect_url": "/azure/aks/hybrid/aks-whatsnew-23h2",
13461346
"redirect_document_id": false
13471347
},
13481348
{
1349-
"source_path": "AKS-Hybrid/view-logs.md",
1349+
"source_path": "AKS-Arc/view-logs.md",
13501350
"redirect_url": "/azure/aks/hybrid/get-on-demand-logs",
13511351
"redirect_document_id": false
13521352
},
13531353
{
1354-
"source_path": "AKS-Hybrid/use-node-pools.md",
1354+
"source_path": "AKS-Arc/use-node-pools.md",
13551355
"redirect_url": "/azure/aks/hybrid/manage-node-pools",
13561356
"redirect_document_id": false
13571357
},
13581358
{
1359-
"source_path": "AKS-Hybrid/manage-control-plane-nodes.md",
1359+
"source_path": "AKS-Arc/manage-control-plane-nodes.md",
13601360
"redirect_url": "/azure/aks/hybrid/manage-node-pools",
13611361
"redirect_document_id": false
13621362
},
13631363
{
1364-
"source_path": "AKS-Hybrid/deploy-metallb.md",
1364+
"source_path": "AKS-Arc/deploy-metallb.md",
13651365
"redirect_url": "/azure/aks/hybrid/deploy-load-balancer",
13661366
"redirect_document_id": false
13671367
},
13681368
{
1369-
"source_path": "AKS-Hybrid/get-kubelet-logs.md",
1369+
"source_path": "AKS-Arc/get-kubelet-logs.md",
13701370
"redirect_url": "/azure/aks/hybrid/aks-get-kubelet-logs",
13711371
"redirect_document_id": false
13721372
},
13731373
{
1374-
"source_path": "AKS-Hybrid/reference/aks-edge-ps/set-aksedgebillingpodstate.md",
1374+
"source_path": "AKS-Arc/reference/aks-edge-ps/set-aksedgebillingpodstate.md",
13751375
"redirect_url": "/azure/aks/hybrid/reference/aks-edge-ps/",
13761376
"redirect_document_id": false
13771377
},
13781378
{
1379-
"source_path": "AKS-Hybrid/reference/aks-edge-ps/set-aksedgenodeconnectivitymode.md",
1379+
"source_path": "AKS-Arc/reference/aks-edge-ps/set-aksedgenodeconnectivitymode.md",
13801380
"redirect_url": "/azure/aks/hybrid/reference/aks-edge-ps/",
13811381
"redirect_document_id": false
13821382
},
13831383
{
1384-
"source_path": "AKS-Hybrid/aks-hci-evaluation-guide.md",
1384+
"source_path": "AKS-Arc/aks-hci-evaluation-guide.md",
13851385
"redirect_url": "/azure/aks/hybrid/overview",
13861386
"redirect_document_id": false
13871387
},
13881388
{
1389-
"source_path": "AKS-Hybrid/deploy-load-balancer.md",
1389+
"source_path": "AKS-Arc/deploy-load-balancer.md",
13901390
"redirect_url": "/azure/aks/hybrid/deploy-load-balancer-cli",
13911391
"redirect_document_id": false
13921392
},
13931393
{
1394-
"source_path": "AKS-Hybrid/offline-download.md",
1394+
"source_path": "AKS-Arc/offline-download.md",
13951395
"redirect_url": "/azure/aks/hybrid/aks-whats-new-23h2",
13961396
"redirect_document_id": false
13971397
},
13981398
{
1399-
"source_path": "AKS-Hybrid/kubernetes-rbac-azure-ad.md",
1399+
"source_path": "AKS-Arc/kubernetes-rbac-azure-ad.md",
14001400
"redirect_url": "/azure/aks/hybrid/kubernetes-rbac-entra-id",
14011401
"redirect_document_id": false
14021402
},
14031403
{
1404-
"source_path": "AKS-Hybrid/calico-networking-policy.md",
1404+
"source_path": "AKS-Arc/calico-networking-policy.md",
14051405
"redirect_url": "/azure/aks/hybrid/concepts-security",
14061406
"redirect_document_id": false
14071407
},
14081408
{
1409-
"source_path": "AKS-Hybrid/webhook-denied-request.md",
1409+
"source_path": "AKS-Arc/webhook-denied-request.md",
14101410
"redirect_url": "/azure/aks/hybrid/troubleshoot-overview",
14111411
"redirect_document_id": false
14121412
},
14131413
{
1414-
"source_path": "AKS-Hybrid/create-storage-classes.md",
1414+
"source_path": "AKS-Arc/create-storage-classes.md",
14151415
"redirect_url": "/azure/aks/hybrid/overview",
14161416
"redirect_document_id": false
14171417
},
14181418
{
1419-
"source_path": "AKS-Hybrid/storage-class-overview.md",
1419+
"source_path": "AKS-Arc/storage-class-overview.md",
14201420
"redirect_url": "/azure/aks/hybrid/overview",
14211421
"redirect_document_id": false
14221422
},
14231423
{
1424-
"source_path": "AKS-Hybrid/infrastructure-components.md",
1424+
"source_path": "AKS-Arc/infrastructure-components.md",
14251425
"redirect_url": "/azure/aks/hybrid/cluster-architecture",
14261426
"redirect_document_id": false
1427+
},
1428+
{
1429+
"source_path": "AKS-Arc/azure-hybrid-benefit.md",
1430+
"redirect_url": "/azure/aks/hybrid/pricing",
1431+
"redirect_document_id": false
14271432
}
14281433
]
14291434
}

0 commit comments

Comments
 (0)