Merge pull request #291593 from j-egler/jessegler/vm-naks-ga-api-update

GA API Update

Author: Stacyrch140

articles/operator-nexus/concepts-nexus-networking.md

@@ -227,8 +227,8 @@ field.
 [vrf]: https://en.wikipedia.org/wiki/Virtual_routing_and_forwarding
 [isd]: ./howto-configure-isolation-domain.md
 [internal-net]: ./howto-configure-isolation-domain.md#create-internal-network
-[vm-netattach]: /rest/api/networkcloud/virtual-machines/create-or-update?view=rest-networkcloud-2023-07-01&tabs=HTTP#networkattachment
-[attachednetconf]: /rest/api/networkcloud/kubernetes-clusters/create-or-update?view=rest-networkcloud-2023-07-01&tabs=HTTP#attachednetworkconfiguration
+[vm-netattach]: /rest/api/networkcloud/virtual-machines/create-or-update?view=rest-networkcloud-2024-07-01&tabs=HTTP#networkattachment
+[attachednetconf]: /rest/api/networkcloud/kubernetes-clusters/create-or-update?view=rest-networkcloud-2024-07-01&tabs=HTTP#attachednetworkconfiguration
 
 ## Operator Nexus Kubernetes networking
 

articles/operator-nexus/howto-virtual-machine-image.md

@@ -19,7 +19,7 @@ Before you begin creating a virtual machine (VM) image, ensure you have the foll
 
    * Install the latest version of the [necessary Azure CLI extensions](./howto-install-cli-extensions.md).
 
-   * This article requires version 2.49.0 or later of the Azure CLI. If using Azure Cloud Shell, the latest version is already installed.
+   * This article requires version 2.61.0 or later of the Azure CLI. If using Azure Cloud Shell, the latest version is already installed.
 
    * Azure Container Registry (ACR): Set up a working Azure Container Registry to store and manage your container images. ACR provides a secure and private registry for storing Docker images used in your VM image creation process. You can create an ACR by following the official documentation at [Azure Container Registry](/azure/container-registry/container-registry-intro) documentation.
 

articles/operator-nexus/includes/kubernetes-cluster/quickstart-arm-add-node-pool.json

@@ -160,7 +160,7 @@
     "resources": [
       {
         "type": "Microsoft.NetworkCloud/kubernetesClusters/agentpools",
-        "apiVersion": "2023-07-01",
+        "apiVersion": "2024-07-01",
         "name": "[concat(parameters('kubernetesClusterName'), '/', parameters('kubernetesClusterName'), '-', parameters('agentPoolName'))]",
         "location": "[parameters('location')]",
         "extendedLocation": {

articles/operator-nexus/includes/kubernetes-cluster/quickstart-arm-deploy.json

@@ -173,12 +173,58 @@
           }
         */
       },
+      "fabricPeeringEnabled": {
+        "type": "string",
+        "metadata": {
+          "description": "The indicator to specify if the load balancer peers with the network fabric."
+        },
+        "defaultValue": "True"
+      },
+      "bgpAdvertisements": {
+        "type": "array",
+        "metadata": {
+          "description": "The association of IP address pools to the communities and peers, allowing for announcement of IPs."
+        },
+        "defaultValue": []
+        /*
+          {
+            "advertiseToFabric": "True/False",
+            "communities": [
+              "string"
+            ],
+            "ipAddressPools": [
+              "string"
+            ],
+            "pools": [
+              "string"
+            ]
+          }
+        */
+      },
+      "bgpPeers": {
+        "type": "array",
+        "metadata": {
+          "description": "The list of additional BgpPeer entities that the Kubernetes cluster will peer with. All peering must be explicitly defined."
+        },
+        "defaultValue": []
+        /*
+          {
+            "bfdEnabled": "True/False",
+            "bgpMultiHop": "True/False",
+            "myAsn": 0-4294967295,
+            "name": "string",
+            "password": "string",
+            "peerAddress": "string",
+            "peerPort": 179
+          }
+        */
+      },
       "kubernetesVersion": {
         "type": "string",
         "metadata": {
           "description": "The version of Kubernetes to be used in the Nexus Kubernetes cluster"
         },
-        "defaultValue": "v1.24.9"
+        "defaultValue": "v1.27.1"
       },
       "controlPlaneCount": {
         "type": "int",
@@ -310,7 +356,7 @@
     "resources": [
       {
         "type": "Microsoft.NetworkCloud/kubernetesClusters",
-        "apiVersion": "2023-07-01",
+        "apiVersion": "2024-07-01",
         "name": "[parameters('kubernetesClusterName')]",
         "location": "[parameters('location')]",
         "tags": "[parameters('tags')]",
@@ -376,7 +422,10 @@
               "trunkedNetworks": "[if(empty(parameters('trunkedNetworks')), json('null'), parameters('trunkedNetworks'))]"
             },
             "bgpServiceLoadBalancerConfiguration": {
-              "ipAddressPools": "[if(empty(parameters('ipAddressPools')), json('null'), parameters('ipAddressPools'))]"
+              "ipAddressPools": "[if(empty(parameters('ipAddressPools')), json('null'), parameters('ipAddressPools'))]",
+              "fabricPeeringEnabled": "[if(empty(parameters('fabricPeeringEnabled')), json('null'), parameters('fabricPeeringEnabled'))]",
+              "bgpAdvertisements": "[if(empty(parameters('bgpAdvertisements')), json('null'), parameters('bgpAdvertisements'))]",
+              "bgpPeers": "[if(empty(parameters('bgpPeers')), json('null'), parameters('bgpPeers'))]"
             }
           }
         }

articles/operator-nexus/includes/kubernetes-cluster/quickstart-bicep-add-node-pool.bicep

@@ -83,7 +83,7 @@ param trunkedNetworks array = []
 //   pluginType: 'SRIOV|DPDK|OSDevice|MACVLAN|IPVLAN'
 // }
 
-resource agentPools 'Microsoft.NetworkCloud/kubernetesClusters/agentPools@2023-07-01' = {
+resource agentPools 'Microsoft.NetworkCloud/kubernetesClusters/agentPools@2024-07-01' = {
   name: '${kubernetesClusterName}/${kubernetesClusterName}-${agentPoolName}'
   location: location
   tags: tags

articles/operator-nexus/includes/kubernetes-cluster/quickstart-bicep-deploy.bicep

@@ -93,7 +93,7 @@ param ipAddressPools array = []
 // Cluster Configuration Parameters
 
 @description('The version of Kubernetes to be used in the Nexus Kubernetes cluster')
-param kubernetesVersion string = 'v1.24.9'
+param kubernetesVersion string = 'v1.27.1'
 
 @description('The number of control plane nodes to be deployed in the cluster')
 param controlPlaneCount int = 1
@@ -161,8 +161,17 @@ param taints array = []
 //   key: 'string'
 //   value: 'string:NoSchedule|PreferNoSchedule|NoExecute'
 // }
+@description('The association of IP address pools to the communities and peers, allowing for announcement of IPs.')
+param bgpAdvertisements array = []
 
-resource kubernetescluster 'Microsoft.NetworkCloud/kubernetesClusters@2023-07-01' = {
+@description('"The list of additional BgpPeer entities that the Kubernetes cluster will peer with. All peering must be explicitly defined.')
+param bgpPeers array = []
+
+@description('The indicator to specify if the load balancer peers with the network fabric.')
+param fabricPeeringEnabled string = 'False'
+
+
+resource kubernetescluster 'Microsoft.NetworkCloud/kubernetesClusters@2024-07-01' = {
   name: kubernetesClusterName
   location: location
   tags: tags
@@ -228,6 +237,9 @@ resource kubernetescluster 'Microsoft.NetworkCloud/kubernetesClusters@2023-07-01
         trunkedNetworks: empty(trunkedNetworks) ? null : trunkedNetworks
       }
       bgpServiceLoadBalancerConfiguration: {
+        bgpAdvertisements: empty(bgpAdvertisements) ? null : bgpAdvertisements
+        bgpPeers: empty(bgpPeers) ? null : bgpPeers
+        fabricPeeringEnabled: fabricPeeringEnabled
         ipAddressPools: empty(ipAddressPools) ? null : ipAddressPools
       }
     }

articles/operator-nexus/includes/kubernetes-cluster/quickstart-prereq.md

@@ -12,7 +12,7 @@ ms.custom: devx-track-azurecli
 [!INCLUDE [azure-cli-prepare-your-environment-no-header.md](~/reusable-content/azure-cli/azure-cli-prepare-your-environment-no-header.md)]
 
 * Install the latest version of the [necessary Azure CLI extensions](../../howto-install-cli-extensions.md).
-* This article requires version 2.49.0 or later of the Azure CLI. If using Azure Cloud Shell, the latest version is already installed.
+* This article requires version 2.61.0 or later of the Azure CLI. If using Azure Cloud Shell, the latest version is already installed.
 * If you have multiple Azure subscriptions, select the appropriate subscription ID in which the resources should be billed using the [`az account`][az-account] command.
 * Refer the VM SKU table in the [reference section](../../reference-nexus-kubernetes-cluster-sku.md) for the list of supported VM SKUs.
 * Refer the [supported Kubernetes versions](../../reference-nexus-kubernetes-cluster-supported-versions.md) for the list of supported Kubernetes versions.

articles/operator-nexus/includes/virtual-machine/quickstart-prereq.md

@@ -12,7 +12,7 @@ ms.custom: devx-track-azurecli
 [!INCLUDE [azure-cli-prepare-your-environment-no-header.md](~/reusable-content/azure-cli/azure-cli-prepare-your-environment-no-header.md)]
 
 * Install the latest version of the [necessary Azure CLI extensions](../../howto-install-cli-extensions.md).
-* This article requires version 2.49.0 or later of the Azure CLI. If using Azure Cloud Shell, the latest version is already installed.
+* This article requires version 2.61.0 or later of the Azure CLI. If using Azure Cloud Shell, the latest version is already installed.
 * If you have multiple Azure subscriptions, select the appropriate subscription ID in which the resources should be billed using the [`az account`][az-account] command.
 * Before proceeding with virtual machine creation, ensure that the container image to be used is created according to the [instructions](../../howto-virtual-machine-image.md).
 * Create a resource group using the [`az group create`][az-group-create] command. An [Azure resource group][azure-resource-group] is a logical group in which Azure resources are deployed and managed. When you create a resource group, you're prompted to specify a location. This location is the storage location of your resource group metadata and where your resources run in Azure if you don't specify another region during resource creation. The following example creates a resource group named *myResourceGroup* in the *eastus* location.

articles/operator-nexus/includes/virtual-machine/virtual-machine-arm-template.json

@@ -152,7 +152,8 @@
             "type": "object",
             "metadata": {
                 "description": "Credentials used to login to the image repository."
-            }
+            },
+            "defaultValue": {}
             /*
                 "password": "string",
                 "registryUrl": "string",
@@ -163,7 +164,7 @@
     "resources": [
         {
             "type": "Microsoft.NetworkCloud/virtualMachines",
-            "apiVersion": "2023-07-01",
+            "apiVersion": "2024-07-01",
             "name": "[parameters('vmName')]",
             "location": "[parameters('location')]",
             "extendedLocation": {
@@ -176,7 +177,6 @@
                 "bootMethod": "[if(empty(parameters('bootMethod')), json('null'), parameters('bootMethod'))]",
                 "cloudServicesNetworkAttachment": {
                     "attachedNetworkId": "[parameters('cloudServicesNetworkId')]",
-                    "defaultGateway": "False",
                     "ipAllocationMethod": "Dynamic"
                 },
                 "cpuCores": "[parameters('cpuCores')]",

articles/operator-nexus/includes/virtual-machine/virtual-machine-bicep-template.bicep

@@ -84,12 +84,12 @@ param vmDeviceModel string = 'T2'
 param vmImage string
 
 @description('Credentials used to login to the image repository.')
-param vmImageRepositoryCredentials object
+param vmImageRepositoryCredentials object = {}
 // password: "string"
 // registryUrl: "string"
 // username: "string"
 
-resource vm 'Microsoft.NetworkCloud/virtualMachines@2023-07-01' = {
+resource vm 'Microsoft.NetworkCloud/virtualMachines@2024-07-01' = {
   name: vmName
   location: location
   extendedLocation: {
@@ -102,7 +102,6 @@ resource vm 'Microsoft.NetworkCloud/virtualMachines@2023-07-01' = {
     bootMethod: (empty(bootMethod) ? null : bootMethod)
     cloudServicesNetworkAttachment: {
       attachedNetworkId: cloudServicesNetworkId
-      defaultGateway: 'False'
       ipAllocationMethod: 'Dynamic'
     }
     cpuCores: cpuCores