From 998957037a26b28491d27d73cd50d22f3a1d8afb Mon Sep 17 00:00:00 2001 From: noasaunders219 <117283483+noasaunders219@users.noreply.github.com> Date: Sun, 1 Oct 2023 13:58:10 +0300 Subject: [PATCH 1/3] vnet subnets and pod subnets added to node pool properties --- .../schemas/ocean-nodePoolProperties.yaml | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/api/services/ocean/aksV2/schemas/ocean-nodePoolProperties.yaml b/api/services/ocean/aksV2/schemas/ocean-nodePoolProperties.yaml index af92898fe..32ea90810 100644 --- a/api/services/ocean/aksV2/schemas/ocean-nodePoolProperties.yaml +++ b/api/services/ocean/aksV2/schemas/ocean-nodePoolProperties.yaml @@ -43,7 +43,21 @@ properties: kubernetesVersion: type: string description: | - The desired Kubernetes version of the luanched nodes. + The desired Kubernetes version of the launched nodes. In case the value is null, the Kubernetes version of the control plane is used. - example: 1.26 \ No newline at end of file + example: 1.26 + vnetSubnetIDs: + type: array + description: > + A comma-separated list of subnet identifiers for ---. Subnet identifiers should be configured with auto-assign public IP. + items: + type: string + example: ["subnet-4c1d1538", "subnet-2791bb61"] + podSubnetIDs: + type: array + description: > + A comma-separated list of subnet identifiers for ---. Subnet identifiers should be configured with auto-assign public IP. + items: + type: string + example: ["subnet-4c1d1538", "subnet-2791bb61"] \ No newline at end of file From bfae3c5d0cd132bc6c17403a8114f0c362675117 Mon Sep 17 00:00:00 2001 From: noasaunders219 <117283483+noasaunders219@users.noreply.github.com> Date: Mon, 2 Oct 2023 13:54:12 +0300 Subject: [PATCH 2/3] vnet subnets and pod subnets added to node pool properties --- .../aksV2/schemas/ocean-nodePoolProperties.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/api/services/ocean/aksV2/schemas/ocean-nodePoolProperties.yaml b/api/services/ocean/aksV2/schemas/ocean-nodePoolProperties.yaml index 32ea90810..cec00e613 100644 --- a/api/services/ocean/aksV2/schemas/ocean-nodePoolProperties.yaml +++ b/api/services/ocean/aksV2/schemas/ocean-nodePoolProperties.yaml @@ -49,15 +49,15 @@ properties: example: 1.26 vnetSubnetIDs: type: array - description: > - A comma-separated list of subnet identifiers for ---. Subnet identifiers should be configured with auto-assign public IP. + description: | + The IDs of subnets in an existing VNet into which to assign nodes in the cluster (requires azure network-plugin). items: type: string - example: ["subnet-4c1d1538", "subnet-2791bb61"] + example: ["/subscription/{...}/resourceGroups/{....}/virtualNetworks/{...}/subnets/{default}"] podSubnetIDs: type: array - description: > - A comma-separated list of subnet identifiers for ---. Subnet identifiers should be configured with auto-assign public IP. + description: | + The IDs of subnets in an existing VNet into which to assign pods in the cluster (requires azure network-plugin). items: type: string - example: ["subnet-4c1d1538", "subnet-2791bb61"] \ No newline at end of file + example: ["/subscription/{...}/resourceGroups/{....}/virtualNetworks/{...}/subnets/{default}"] \ No newline at end of file From 0796d997716aaaf33a95c086a7beafa32389f5d5 Mon Sep 17 00:00:00 2001 From: noasaunders219 <117283483+noasaunders219@users.noreply.github.com> Date: Mon, 2 Oct 2023 13:57:57 +0300 Subject: [PATCH 3/3] subnet id example fix --- .../schemas/ocean-nodePoolProperties.yaml | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/api/services/ocean/aksV2/schemas/ocean-nodePoolProperties.yaml b/api/services/ocean/aksV2/schemas/ocean-nodePoolProperties.yaml index cec00e613..cbcffe4c3 100644 --- a/api/services/ocean/aksV2/schemas/ocean-nodePoolProperties.yaml +++ b/api/services/ocean/aksV2/schemas/ocean-nodePoolProperties.yaml @@ -16,18 +16,18 @@ properties: type: boolean example: true osDiskSizeGB: - type: integer - description: | - The size of the OS disk in GB. - For Linux OS, the minimum size is 32GB and for Windows OS the minimum is 128GB. - maximum: 1023 - example: 64 + type: integer + description: | + The size of the OS disk in GB. + For Linux OS, the minimum size is 32GB and for Windows OS the minimum is 128GB. + maximum: 1023 + example: 64 osDiskType: - type: string - description: | - The type of the OS disk. - enum: [ Managed, Ephemeral ] - example: Managed + type: string + description: | + The type of the OS disk. + enum: [ Managed, Ephemeral ] + example: Managed osType: type: string description: | @@ -53,11 +53,11 @@ properties: The IDs of subnets in an existing VNet into which to assign nodes in the cluster (requires azure network-plugin). items: type: string - example: ["/subscription/{...}/resourceGroups/{....}/virtualNetworks/{...}/subnets/{default}"] + example: [ "/subscriptions/123456-1234-1234-1234-123456789/resourceGroups/ExampleResourceGroup/providers/Microsoft.Network/virtualNetworks/ExampleVirtualNetwork/subnets/default" ] podSubnetIDs: type: array description: | The IDs of subnets in an existing VNet into which to assign pods in the cluster (requires azure network-plugin). items: type: string - example: ["/subscription/{...}/resourceGroups/{....}/virtualNetworks/{...}/subnets/{default}"] \ No newline at end of file + example: [ "/subscriptions/123456-1234-1234-1234-123456789/resourceGroups/ExampleResourceGroup/providers/Microsoft.Network/virtualNetworks/ExampleVirtualNetwork/subnets/default" ] \ No newline at end of file