Skip to content

Commit

Permalink
Merge branch 'main' into flkelly-powershell-greenfield
Browse files Browse the repository at this point in the history
  • Loading branch information
jchancellor-ms authored Feb 13, 2024
2 parents 012e6db + 9528004 commit 81723f7
Show file tree
Hide file tree
Showing 311 changed files with 15,692 additions and 3,291 deletions.
24 changes: 17 additions & 7 deletions .github/config/.wordlist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ ActionGroup
addon
addons
Addons
ANF
AspNet
AustraliaEast
AVS
Expand All @@ -22,17 +23,20 @@ CrossAVS
CrossAVSGlobalReach
CrossAVSWithinRegion
CrossRegion
datastore
DeploymentName
DevOps
DotNet
ESLZ
ESLZDeploy
ESLZSingleRegionDeployment
ESXi
ExpressRoute
ExistingVNet
ExpressRoute
Expressroute
ExR
ExRConnection
firewalling
GatewaySubnet
GenerateAuthKey
GlobalReach
Expand All @@ -45,11 +49,14 @@ InterConnect
json
Jumpbox
jumpbox
Microhack
microsoft
msrc
MSRC
NetApp
NewVNet
NSX
NVAs
onboardsupport
OnPremises
ons
Expand All @@ -59,10 +66,12 @@ pgandham
PID
PIDs
PIM
PortalUI
PowerShell
powershell
preconfigured
Preconfigured
prem
privatecloud
PrivateCloud
PrivateCloudWithHCX
Expand All @@ -79,11 +88,11 @@ SDDC
SeparateAuthKey
SeperateAuthKey
ServiceHealth
SKU
SoutheastAsia
subnets
subnet
SRM
SKU
subnet
subnets
terraform
Terraform
tf
Expand All @@ -92,11 +101,12 @@ TODO
UI
vCenter
VM
VMs
VMware
VNet
VNetWithExR
vnetgwconnection
VNetWithExR
vSphere
WithinRegion
WithHCX
XR
WithinRegion
XR
65 changes: 65 additions & 0 deletions .github/workflows/wiki-sync.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
---
name: Docs/Wiki Sync

# yamllint disable-line rule:truthy
on:
push:
branches:
- main
paths:
- "docs/wiki/**"
workflow_dispatch: {}

env:
wiki_source_repo: "${{ github.repository }}"
wiki_source_repo_dir: "${{ github.repository }}/docs/wiki"
wiki_target_repo: "${{ github.repository }}.wiki"
github_user_name: "github-actions"
github_email: "41898282+github-actions[bot]@users.noreply.github.com"
github_commit_message: "GitHub Action syncing wiki from docs/wiki"

jobs:
sync-wiki:
name: Sync docs/wiki to Wiki
if: github.repository == 'Azure/Enterprise-Scale' || github.event_name == 'workflow_dispatch'
runs-on: ubuntu-latest
steps:
- name: Checkout Source Repo
uses: actions/checkout@v2
with:
repository: ${{ env.wiki_source_repo }}
path: ${{ env.wiki_source_repo }}

- name: Checkout Wiki Repo
uses: actions/checkout@v2
with:
repository: ${{ env.wiki_target_repo }}
path: ${{ env.wiki_target_repo }}

- name: Configure Local Git
run: |
git config --global user.name $github_user_name
git config --global user.email $github_email
working-directory: ${{ env.GITHUB_WORKSPACE }}

- name: Sync docs/wiki Into Wiki Repo
run: |
rsync -avzr --delete --exclude='.git/' "$wiki_source_repo_dir/" "$wiki_target_repo"
working-directory: ${{ env.GITHUB_WORKSPACE }}

- name: Check for changes
id: git_status
run: |
mapfile -t CHECK_GIT_STATUS < <(git status -s)
printf "%s\n" "${CHECK_GIT_STATUS[@]}"
echo "changes=${#CHECK_GIT_STATUS[@]}" >> $GITHUB_OUTPUT
working-directory: ${{ env.wiki_target_repo }}

- name: Add files, commit and push into Wiki
if: steps.git_status.outputs.changes > 0
run: |
echo "Pushing changes to origin..."
git add .
git commit -m "$github_commit_message [$GITHUB_ACTOR/${GITHUB_SHA::8}]"
git push --set-upstream "https://[email protected]/$wiki_target_repo.git" master
working-directory: ${{ env.wiki_target_repo }}
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,9 @@

# Dev tfvars files
dev.tfvars

#drawio diagrams
**/.$computeprofile1.drawio.bkp
**/.$computeprofile1.drawio.dtmp
**/.$hcx-options.drawio.bkp
**/.$hcx-options2.drawio.bkp
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@
"type": "Microsoft.Common.DropDown",
"visible": true,
"label": "AVS SKU",
"defaultValue": "AV36",
"defaultValue": "AV36P",
"multiLine": true,
"toolTip": "Ensure you select the correct SKU as per your quota request",
"constraints": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
},
"PrivateCloudSKU": {
"type": "string",
"defaultValue": "AV36",
"defaultValue": "AV36P",
"allowedValues": [
"AV36",
"AV36T",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ param PrivateCloudAddressSpace string = ''
'AV36PT'
'AV52'
])
param PrivateCloudSKU string = 'AV36'
param PrivateCloudSKU string = 'AV36P'
@description('The number of nodes to be deployed in the first/default cluster, ensure you have quota before deploying')
param PrivateCloudHostCount int = 3
@description('Existing Private Cloud Name')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"value": "10.55.0.0/22"
},
"PrivateCloudSKU": {
"value": "AV36"
"value": "AV36P"
},
"PrivateCloudHostCount": {
"value": 3
Expand Down
Loading

0 comments on commit 81723f7

Please sign in to comment.