UI bugfix, Workload Identity promoted out of featureflag (#438)

* update window history on card change

* k8s default version

Signed-off-by: Gordonby <gordon.byers@microsoft.com>

* remove workload-id feature flag

Signed-off-by: Gordonby <gordon.byers@microsoft.com>

* workloadId

Signed-off-by: Gordonby <gordon.byers@microsoft.com>

* aksResourceId output

Signed-off-by: Gordonby <gordon.byers@microsoft.com>

Signed-off-by: Gordonby <gordon.byers@microsoft.com>

README.md

@@ -1,6 +1,6 @@
-# AKS Accelerator
+# AKS Construction
 
-Building a complete Kubernetes operational environment is hard work! __AKS Accelerator__ dramatically speeds up this work by providing the templates and deployment scripts to quickly create a  __fully configured__, Kubernetes environment, tailored to meet your operational and security needs, ready to run your workloads in production.
+Building a complete Kubernetes operational environment is hard work! __AKS Construction__ dramatically accelerates this work by providing the templates and deployment scripts to quickly create a  __fully configured__, Kubernetes environment, tailored to meet your operational and security needs, ready to run your workloads in production.
 
 ![animated preview of AKS Construction Helper](docs/images/animgif.gif)
 
@@ -12,7 +12,7 @@ Building a complete Kubernetes operational environment is hard work! __AKS Accel
 * #### **Step 2** Select your Requirements (optional)
   Select your base `Operational` and `Security` Principles using the presets that have been designed from our field experience
 
-  ![](docs/images/helper-presets.jpg)
+  ![presets](docs/images/helper-presets.jpg)
   <br/>
   > **Note**
   > If following Azure's **Landing Zone** methodology, select `Enterprise Scale` from the dropdown, then select your environment type
@@ -20,11 +20,11 @@ Building a complete Kubernetes operational environment is hard work! __AKS Accel
 * #### **Step 3** Fine tune (optional)
   Use the tabs to fine tune your cluster requirements
 
-  ![](docs/images/helper-tabs.jpg)
+  ![fine tune](docs/images/helper-tabs.jpg)
 * #### **Step 4** Deploy
   In the `Deploy` tab, choose how you will deploy your new cluster, and follow the instructions
 
-  ![](docs/images/helper-deploy.jpg)
+  ![deploy](docs/images/helper-deploy.jpg)
 
 ## Advanced Scenarios
 

bicep/main.bicep

@@ -833,7 +833,7 @@ output ApplicationGatewayName string = deployAppGw ? appgw.name : ''
 param dnsPrefix string = '${resourceName}-dns'
 
 @description('Kubernetes Version')
-param kubernetesVersion string = '1.23.8'
+param kubernetesVersion string = '1.23.12'
 
 @description('Enable Azure AD integration on AKS')
 param enable_aad bool = false
@@ -1286,7 +1286,12 @@ output aksOidcFedIdentityProperties object = {
   subject: 'system:serviceaccount:ns:svcaccount'
 }
 
+@description('The name of the managed resource group AKS uses')
 output aksNodeResourceGroup string = aks.properties.nodeResourceGroup
+
+@description('The Azure resource id for the AKS cluster')
+output aksResourceId string = aks.id
+
 //output aksNodePools array = [for nodepool in agentPoolProfiles: name]
 
 @description('Not giving Rbac at the vnet level when using private dns results in ReconcilePrivateDNS. Therefore we need to upgrade the scope when private dns is being used, because it wants to set up the dns->vnet integration.')

helper/src/components/addonsTab.js

@@ -383,18 +383,16 @@ export default function ({ tabValues, updateFn, featureFlag, invalidArray }) {
                 <Checkbox styles={{ root: { marginLeft: '50px' } }} inputProps={{ "data-testid": "addons-osm-Checkbox"}} checked={addons.openServiceMeshAddon} onChange={(ev, v) => updateFn("openServiceMeshAddon", v)} label="Install the Open Service Mesh AddOn" />
             </Stack.Item>
 
-            { wiFeatureFlag &&
-            <>
-                <Separator className="notopmargin" />
+            <Separator className="notopmargin" />
 
-                <Stack.Item align="start">
-                    <Label required={true}>
-                        Workload Identity : Enable Azure Workload Identity on the AKS Cluster
-                        (<a target="_new" href="https://github.com/Azure/azure-workload-identity">project</a>)
-                    </Label>
-                    <Checkbox styles={{ root: { marginLeft: '50px' } }} inputProps={{ "data-testid": "addons-workloadIdentity-Checkbox"}} checked={addons.workloadIdentity} onChange={(ev, v) => updateFn("workloadIdentity", v)} label="Install Workload Identity" />
-                </Stack.Item>
-            </>}
+            <Stack.Item align="start">
+                <Label required={true}>
+                    Workload Identity : Enable Azure Workload Identity on the AKS Cluster
+                    (<a target="_new" href="https://learn.microsoft.com/en-us/azure/aks/workload-identity-deploy-cluster">*preview</a>)
+                    (<a target="_new" href="https://github.com/Azure/azure-workload-identity">project</a>)
+                </Label>
+                <Checkbox styles={{ root: { marginLeft: '50px' } }} inputProps={{ "data-testid": "addons-workloadIdentity-Checkbox"}} checked={addons.workloadIdentity} onChange={(ev, v) => updateFn("workloadIdentity", v)} label="Install Workload Identity" />
+            </Stack.Item>
 
             <Separator className="notopmargin" />
 

helper/src/components/deployTab.js

@@ -129,7 +129,7 @@ export default function DeployTab({ defaults, updateFn, tabValues, invalidArray,
     }),
     ...(defaults.addons.kedaAddon !== addons.kedaAddon && {kedaAddon: addons.kedaAddon }),
     ...(defaults.addons.blobCSIAddon !== addons.blobCSIAddon && {blobCSIAddon: addons.blobCSIAddon }),
-    ...(defaults.addons.workloadIdentity !== addons.workloadIdentity && {workloadIdentity: addons.workloadIdentity }),
+    ...(defaults.addons.workloadIdentity !== addons.workloadIdentity && {oidcIssuer: true, workloadIdentity: addons.workloadIdentity }),
     ...(net.networkPlugin === 'azure' && net.networkPluginMode && {networkPluginMode: 'Overlay'}),
     ...(urlParams.getAll('feature').includes('defender') && cluster.DefenderForContainers !== defaults.cluster.DefenderForContainers && { DefenderForContainers: cluster.DefenderForContainers })
   }

helper/src/components/portalnav.js

@@ -207,7 +207,7 @@ export default function PortalNav({ config }) {
     setSelected({ preset: selected.preset, values: { ...selected.values, [sectionKey]: cardKey } })
     setTabValues(currentTabValues => updateTabValues(currentTabValues, sections, sectionKey, cardKey))
 
-    //window.history.replaceState(null, null, "?"+urlParams.toString())
+    window.history.replaceState(null, null, "?"+urlParams.toString())
   }
 
 

helper/src/config.json

@@ -9,7 +9,7 @@
     "defaults": {
         "deploy": {
             "enableTelemetry": true,
-            "kubernetesVersion": "1.23.8",
+            "kubernetesVersion": "1.23.12",
             "location": "WestEurope",
             "apiips": "",
             "demoapp": false,