Merge branch 'main' into gb-bicepswitchup

Azure · Oct 25, 2023 · bf42162 · bf42162
2 parents 29691d3 + ee32936
commit bf42162
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 18 deletions.
diff --git 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'
+        default: '0.10.2'
         type: string
       rg:
         description: 'Resource Group name'

diff --git a/.github/workflows/StandardCI.yml b/.github/workflows/StandardCI.yml
@@ -31,7 +31,7 @@ on:
     - cron: "0 23 * * 2"
 env:
   RG: "AksBicepAcc-Ci-BasicCluster" #The resource group we're deploying to.
-  ParamFilePath: "https://raw.githubusercontent.com/Azure/AKS-Construction/0.10.0-preview/.github/workflows_dep/AksDeploy-Basic.parameters.json" # ".github/workflows_dep/AksDeploy-Basic.parameters.json" #Path to parameter file
+  ParamFilePath: "https://raw.githubusercontent.com/Azure/AKS-Construction/0.10.2/.github/workflows_dep/AksDeploy-Basic.parameters.json" # ".github/workflows_dep/AksDeploy-Basic.parameters.json" #Path to parameter file
   RESNAME: "AksStan" #Used in Azure Resource Naming, overrides the default in the parameter file
   DEPNAME: "Dep${{ github.run_number }}" #Deployment Name
   AZCLIVERSION: 2.43.0 #Pinning to a specific AZ CLI version

diff --git a/.github/workflows/ghpagesTest.yml b/.github/workflows/ghpagesTest.yml
@@ -102,7 +102,7 @@ jobs:
 
       - name: Html Broken Link Checker
         id: lychee
-        uses: lycheeverse/lychee-action@v1.5.1
+        uses: lycheeverse/lychee-action@v1.8.0
         env:
           GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
         with:

diff --git a/bicep/network.bicep b/bicep/network.bicep
@@ -189,13 +189,13 @@ var aks_podSubnet =  {
 }
 
 var aks_subnet = networkSecurityGroups ? union(aks_baseSubnet, nsgAks.outputs.nsgSubnetObj) : aks_baseSubnet
-var aks_podsubnet = networkSecurityGroups ? union(aks_podSubnet, nsgAks.outputs.nsgSubnetObj) : aks_podSubnet
+var aks_finalPodSubnet = networkSecurityGroups ? union(aks_podSubnet, nsgAks.outputs.nsgSubnetObj) : aks_podSubnet
 
 
 
 var subnets = union(
   array(aks_subnet),
-  cniDynamicIpAllocation ? array(aks_podsubnet) : [],
+  cniDynamicIpAllocation ? array(aks_finalPodSubnet) : [],
   azureFirewalls ? array(fw_subnet) : [],
   privateLinks ? array(private_link_subnet) : [],
   acrPrivatePool ? array(acrpool_subnet) : [],

diff --git a/helper/.playwrighttests/helper-test-managednatgw.spec.js b/helper/.playwrighttests/helper-test-managednatgw.spec.js
@@ -4,7 +4,7 @@ const { matchers } = require('playwright-expect');
 // add custom matchers
 expect.extend(matchers);
 
-test('managed-natgw-option-is-now-the-prod-default', async ({ page }) => {
+test('default-outbound-option-to-be-load-balancer', async ({ page }) => {
 
   await page.goto('http://localhost:3000/AKS-Construction');
 
@@ -14,15 +14,31 @@ test('managed-natgw-option-is-now-the-prod-default', async ({ page }) => {
   //Check default value
   const dropdown = await page.waitForSelector('[data-testid="net-aksEgressType"]')
   await expect(dropdown).toBeVisible()
+  await expect(dropdown).toMatchText('Load Balancer')
+
+});
+
+test('managed-natgw-option-is-now-the-prod-default', async ({ page }) => {
+
+  await page.goto('http://localhost:3000/AKS-Construction');
+
+  // Click the 4th Tab in the portal Navigation Pivot (network)
+  await page.click('[data-testid="portalnav-Pivot"] > button:nth-child(4)');
+
+  //Change default value
+  const dropdown = await page.waitForSelector('[data-testid="net-aksEgressType"]')
+  await expect(dropdown).toBeVisible()
   await expect(dropdown).toMatchText('NAT Gateway')
 
   // Click the 1st Tab in the portal Navigation Pivot (network)
   await page.click('[data-testid="portalnav-Pivot"] > button:nth-child(1)');
 
-  // //Check parameter is there
+  // Check parameter is absent
   await page.waitForSelector('[data-testid="deploy-deploycmd"]')
   const clitextbox = await page.$('[data-testid="deploy-deploycmd"]')
   await expect(clitextbox).toBeVisible()
-  await expect(clitextbox).toContainText('aksOutboundTrafficType=natGateway')
+  await expect(clitextbox).not.toContainText('natGateway')
 
 });
+
+ //TODO: Change value and check (this is a real pain with the DropDown control)
diff --git a/helper/src/components/clusterTab.js b/helper/src/components/clusterTab.js
@@ -397,7 +397,7 @@ export default function ({ defaults, tabValues, updateFn, featureFlag, invalidAr
                     options={[
                         { key: 'none', text: 'Public IP with no IP restrictions' },
                         { key: 'whitelist', text: 'Create allowed IP ranges (defaults to IP address of machine running the script)' },
-                        { key: 'private', text: 'Private Cluster (WARNING: most complex to operate)' }
+                        { key: 'private', text: 'Private Cluster (Most secure option for your apps, but requires most involved access management)' }
 
                     ]}
                     onChange={(ev, { key }) => updateFn("apisecurity", key)}
@@ -503,4 +503,4 @@ export default function ({ defaults, tabValues, updateFn, featureFlag, invalidAr
             </>}
         </Stack>
     )
-}
+}
diff --git a/helper/src/configpresets/principals.json b/helper/src/configpresets/principals.json
@@ -281,7 +281,8 @@
                                 "vnet_opt": "custom",
                                 "vnetprivateend": false,
                                 "afw": false,
-                                "bastion": false
+                                "bastion": false,
+                                "aksOutboundTrafficType":"loadBalancer"
                             }
                         }
                     },
@@ -291,7 +292,7 @@
                         "description": {
                             "title": "Best option for highly secure, regulated environments or sensitive data requirements.",
                             "titleWarning": {
-                                "description": "WARNING: most complex environment option to operate",
+                                "description": "Most secure option for your apps, but requires most involved access management",
                                 "MessageBarType": 5
                             },
                             "bulets": [
@@ -386,7 +387,8 @@
                                 "vnet_opt": "custom",
                                 "vnetprivateend": true,
                                 "afw": true,
-                                "bastion": true
+                                "bastion": true,
+                                "aksOutboundTrafficType": "userDefinedRouting"
                             }
                         }
                     }
@@ -426,8 +428,6 @@
                                 "automationAccountScheduledStartStop": "Weekday"
                             },
                             "net": {
-                                "createNatGateway": false,
-                                "aksOutboundTrafficType": "loadBalancer"
                             }
                         }
                     },
@@ -462,13 +462,11 @@
                                 "automationAccountScheduledStartStop": ""
                             },
                             "net": {
-                                "createNatGateway": true,
-                                "aksOutboundTrafficType": "natGateway"
                             }
                         }
                     }
                 ]
             }
         ]
     }
-}
+}
diff --git a/helper/src/index.css b/helper/src/index.css
@@ -87,3 +87,12 @@ code {
 a {
     color: #9370DB !important;
 }
+
+
+span code{
+    color: #171717;
+    background-color: #e6e6e6;
+    line-height: 130%;
+    direction: ltr;
+    font-family: SFMono-Regular,Consolas,Liberation Mono,Menlo,Courier,monospace;
+}