Merge branch 'Azure:main' into aro-5736

Azure · May 15, 2024 · 54b7b40 · 54b7b40
2 parents 73bf23b + dd28057
commit 54b7b40
Show file tree

Hide file tree

Showing 11 changed files with 108 additions and 736 deletions.
diff --git a/.devcontainer/postCreate.sh b/.devcontainer/postCreate.sh
@@ -16,7 +16,7 @@ npm ci
 
 # Install the tsp cli
 # pinned to the last working version combination
-npm install -g @typespec/compiler@0.55.0
+npm install -g @typespec/compiler@0.56.0
 
 # Install azure/oav for validation of openapi and swagger example generation
 # https://github.com/Azure/oav

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -11,8 +11,6 @@ updates:
       typespec:
         patterns:
           - '@typespec/*'
-      azure-tools:
-        patterns:
           - '@azure-tools/*'
     schedule:
       interval: 'weekly'
diff --git a/api/redhatopenshift/HcpCluster/hcpCluster-models.tsp b/api/redhatopenshift/HcpCluster/hcpCluster-models.tsp
@@ -28,7 +28,7 @@ model HcpOpenShiftClusterResource
   @segment("hcpOpenShiftClusters")
   name: string;
 
-  ...ManagedServiceIdentity;
+  ...ManagedServiceIdentityProperty;
 }
 
 // The NodePool needs to be TrackedResource for the following reasons:

diff --git a/...nshift/resource-manager/Microsoft.RedHatOpenshift/preview/2024-06-10-preview/openapi.json b/...nshift/resource-manager/Microsoft.RedHatOpenshift/preview/2024-06-10-preview/openapi.json
@@ -2162,24 +2162,6 @@
         }
       }
     },
-    "Versions": {
-      "type": "string",
-      "description": "The available API versions.",
-      "enum": [
-        "2024-06-10-preview"
-      ],
-      "x-ms-enum": {
-        "name": "Versions",
-        "modelAsString": true,
-        "values": [
-          {
-            "name": "v2024_06_10_preview",
-            "value": "2024-06-10-preview",
-            "description": "2024-06-10-preview version"
-          }
-        ]
-      }
-    },
     "Visibility": {
       "type": "string",
       "description": "The visibility of the API server",

diff --git a/dev-infrastructure/modules/aks-cluster-base.bicep b/dev-infrastructure/modules/aks-cluster-base.bicep
@@ -395,7 +395,7 @@ module serviceAccounts './aks-manifest.bicep' = {
         apiVersion: 'v1'
         kind: 'ServiceAccount'
         metadata: {
-          name: workloadIdentities[i].value.uamiName
+          name: workloadIdentities[i].value.serviceAccountName
           namespace: workloadIdentities[i].value.namespace
           annotations: {
             'azure.workload.identity/client-id': uami[i].properties.clientId

diff --git a/dev-infrastructure/modules/aks-manifest.bicep b/dev-infrastructure/modules/aks-manifest.bicep
@@ -3,15 +3,18 @@ param aksClusterName string
 param location string
 param aksManagedIdentityId string
 param manifests array
+param forceUpdateTag string = guid(string(manifests))
 
-var namespaces = [for manifest in manifests: manifest.metadata.namespace]
+var namespaces = [
+  for manifest in filter(manifests, m => contains(m.metadata, 'namespace')): manifest.metadata.namespace
+]
 var uniqueNamespaces = union(namespaces, [])
 var namespaceManifests = [
-  for i in range(0, length(uniqueNamespaces)): {
+  for ns in uniqueNamespaces: {
     apiVersion: 'v1'
     kind: 'Namespace'
     metadata: {
-      name: uniqueNamespaces[i]
+      name: ns
     }
   }
 ]
@@ -54,6 +57,7 @@ resource deploymentScript 'Microsoft.Resources/deploymentScripts@2023-08-01' = {
     // * avoid the need for a network path to the cluster
     //
     // right now az aks command invoke fails with `MissingAADClusterToken` when run within a deploymentscript
+    forceUpdateTag: forceUpdateTag
     environmentVariables: [
       {
         name: 'AKS_CLUSTER_RG'

diff --git a/internal/api/v20240610preview/generated_constants.go b/internal/api/v20240610preview/generated_constants.go