From cfbe55eb982977a09f142e512549d3c0c7f30e9f Mon Sep 17 00:00:00 2001 From: Paul Lewis Date: Mon, 14 Aug 2023 11:39:43 +0200 Subject: [PATCH] Fixed some spelling issues, broken link checker, and default build template version (#635) * Fixed some spelling issues * Added spelling exception * Updated link to Cloud Shell to fix validation error * Reverting default template to 0.10.0 * Added lycheeignore to exclude certain sites from broken link checking * Renamed ignore file * Corrected final reference to getCreds --- .github/workflows/AKSC_Deploy.yml | 2 +- .lycheeignore | 3 +++ cspell.json | 1 + helper/src/components/deployTab.js | 18 +++++++++--------- helper/src/config.json | 2 +- 5 files changed, 15 insertions(+), 11 deletions(-) create mode 100644 .lycheeignore diff --git a/.github/workflows/AKSC_Deploy.yml b/.github/workflows/AKSC_Deploy.yml index e9525bd6f..c8e4e8639 100644 --- a/.github/workflows/AKSC_Deploy.yml +++ b/.github/workflows/AKSC_Deploy.yml @@ -10,7 +10,7 @@ on: templateVersion: description: 'Template Version' required: false - default: '0.10.0-preview' + default: '0.10.0' type: string rg: description: 'Resource Group name' diff --git a/.lycheeignore b/.lycheeignore new file mode 100644 index 000000000..be7815dfd --- /dev/null +++ b/.lycheeignore @@ -0,0 +1,3 @@ +http://shell.azure.com +https://shell.azure.com +https://portal.azure.com/#cloudshell/ diff --git a/cspell.json b/cspell.json index 89648d69f..a69d702ee 100644 --- a/cspell.json +++ b/cspell.json @@ -52,6 +52,7 @@ "demoapp", "denydefault", "deploycmd", + "deployparams", "deploystr", "DNAT", "dnsname", diff --git a/helper/src/components/deployTab.js b/helper/src/components/deployTab.js index 7e3bd3c50..0b514540e 100644 --- a/helper/src/components/deployTab.js +++ b/helper/src/components/deployTab.js @@ -261,7 +261,7 @@ export default function DeployTab({ defaults, updateFn, tabValues, invalidArray, const displayPostCmd = Object.keys(post_params).length >0 || (!deploy.disablePreviews && Object.keys(preview_post_params).length >0) - const getCredentials = + const displayGetCredentials = '# Get credentials for your new AKS cluster & login (interactive)\n' + `az aks get-credentials -g ${deploy.rg} -n ${aks}\n` + 'kubectl get nodes' @@ -273,8 +273,8 @@ export default function DeployTab({ defaults, updateFn, tabValues, invalidArray, `\n"${deploy.selectedTemplate === "local" ? ' --file ./postdeploy/scripts/postdeploy.sh --file ./postdeploy/helm/Az-CertManagerIssuer-0.3.0.tgz --file ./postdeploy/k8smanifests/networkpolicy-deny-all.yml --file ./helper/src/dependencies.json' : ''}` const post_deployBASHstr = cluster.apisecurity !== "private" ? - (deploy.getCreds || displayPostCmd ? - getCredentials + (displayPostCmd ? post_deployBASHcmd : '') + (deploy.getCredentials || displayPostCmd ? + displayGetCredentials + (displayPostCmd ? post_deployBASHcmd : '') : '') : @@ -297,7 +297,7 @@ export default function DeployTab({ defaults, updateFn, tabValues, invalidArray, return ` \\\n\t${k}=${targetVal}` }).join('') + '\n\n' + - (displayPostCmd || deploy.getCreds ? post_deployBASHstr : '') + (displayPostCmd || deploy.getCredentials ? post_deployBASHstr : '') //Powershell (Remember to align any changes with Bash) const preview_post_deployPScmd = Object.keys(preview_post_params).map(k => { @@ -317,8 +317,8 @@ export default function DeployTab({ defaults, updateFn, tabValues, invalidArray, (!deploy.disablePreviews ? preview_post_deployPScmd : '') const post_deployPSstr = cluster.apisecurity !== "private" ? - (deploy.getCreds || displayPostCmd ? - getCredentials + (displayPostCmd ? post_deployPScmd : '') + (deploy.getCredentials || displayPostCmd ? + displayGetCredentials + (displayPostCmd ? post_deployPScmd : '') : '') : @@ -335,7 +335,7 @@ export default function DeployTab({ defaults, updateFn, tabValues, invalidArray, return ` \`\n\t${k}=${targetVal}` }).join('') + '\n\n' + - (displayPostCmd || deploy.getCreds ? post_deployPSstr : '') + (displayPostCmd || deploy.getCredentials ? post_deployPSstr : '') //Terraform const deployTfcmd = `#download the *.tf files and run these commands to deploy using terraform\n#for more AKS Construction samples of deploying with terraform, see https://aka.ms/aksc/terraform\n\nterraform fmt\nterraform init\nterraform validate\nterraform plan -out main.tfplan\nterraform apply main.tfplan\nterraform output` @@ -467,7 +467,7 @@ az role assignment create --role "Managed Identity Operator" --assignee-principa - updateFn("getCreds", v)} label="Always show the 'az aks get-credentials' command to quickly connect to your new cluster" /> + updateFn("getCredentials", v)} label="Always show the 'az aks get-credentials' command to quickly connect to your new cluster" /> @@ -501,7 +501,7 @@ az role assignment create --role "Managed Identity Operator" --assignee-principa - Requires AZ CLI (2.37.0 or greater), or execute in the Azure Cloud Shell. + Requires AZ CLI (2.37.0 or greater), or execute in the Azure Cloud Shell. diff --git a/helper/src/config.json b/helper/src/config.json index 6af967804..3c92aceda 100644 --- a/helper/src/config.json +++ b/helper/src/config.json @@ -29,7 +29,7 @@ "githubrepobranch": "main", "deployItemKey": "deployArmCli", "workloadDeployCommands" : [], - "getCreds" : true + "getCredentials" : true }, "cluster": { "keyVaultKmsByoRG": "",