Merge branch 'main' into gb-spotvm

Azure · Sep 18, 2023 · 4beaa09 · 4beaa09
2 parents c02ec9b + ef95b74
commit 4beaa09
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 13 deletions.
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
@@ -398,7 +398,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)}
@@ -504,4 +504,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"
                             }
                         }
                     }
                 ]
             }
         ]
     }
-}
+}