Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feature/CON-22742_supportPodSubnetIds #538

Closed
wants to merge 4 commits into from
+37 −23
Closed

feature/CON-22742_supportPodSubnetIds #538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9989570
vnet subnets and pod subnets added to node pool properties
noasaunders219 Oct 1, 2023
bfae3c5
vnet subnets and pod subnets added to node pool properties
noasaunders219 Oct 2, 2023
0796d99
subnet id example fix
noasaunders219 Oct 2, 2023
414dc5f
labels example fix
noasaunders219 Oct 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/services/ocean/aksV2/schemas/create/ocean-virtualNodeGroup.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ properties:
* "kubernetes.azure.com/fips_enabled"
* "kubernetes.azure.com/os-sku"
example:
- key: value
key: value
taints:
type: array
description: |
Expand Down
2 changes: 1 addition & 1 deletion api/services/ocean/aksV2/schemas/create/ocean-virtualNodeGroupTemplate.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ properties:
* "kubernetes.azure.com/fips_enabled"
* "kubernetes.azure.com/os-sku"
example:
- key: value
key: value
taints:
type: array
description: |
Expand Down
2 changes: 1 addition & 1 deletion api/services/ocean/aksV2/schemas/import/ocean-virtualNodeGroup.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ properties:
* "kubernetes.azure.com/fips_enabled"
* "kubernetes.azure.com/os-sku"
example:
- key: value
key: value
taints:
type: array
description: |
Expand Down
2 changes: 1 addition & 1 deletion api/services/ocean/aksV2/schemas/import/ocean-virtualNodeGroupTemplate.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ properties:
* "kubernetes.azure.com/fips_enabled"
* "kubernetes.azure.com/os-sku"
example:
- key: value
key: value
taints:
type: array
description: |
Expand Down
40 changes: 27 additions & 13 deletions api/services/ocean/aksV2/schemas/ocean-nodePoolProperties.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand All @@ -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
example: 1.26
vnetSubnetIDs:
type: array
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: [ "/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: [ "/subscriptions/123456-1234-1234-1234-123456789/resourceGroups/ExampleResourceGroup/providers/Microsoft.Network/virtualNetworks/ExampleVirtualNetwork/subnets/default" ]
2 changes: 1 addition & 1 deletion api/services/ocean/aksV2/schemas/ocean-virtualNodeGroup.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ properties:
* "kubernetes.azure.com/fips_enabled"
* "kubernetes.azure.com/os-sku"
example:
- key: value
key: value
taints:
type: array
description: |
Expand Down
2 changes: 1 addition & 1 deletion api/services/ocean/aksV2/schemas/ocean-virtualNodeGroupTemplate.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ properties:
* "kubernetes.azure.com/fips_enabled"
* "kubernetes.azure.com/os-sku"
example:
- key: value
key: value
taints:
type: array
description: |
Expand Down
4 changes: 2 additions & 2 deletions api/services/ocean/aksV2/schemas/ocean-vmSizes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ properties:
x86_64 includes both intel64 and amd64.
items:
type: string
enum: [ x86_64, intel64, amd64, arm64 ]
example: [ "x86_64" ]
enum: [ X86_64, INTEL64 , AMD64, ARM64 ]
example: [ "X86_64" ]
series:
type: array
description: |
Expand Down
2 changes: 1 addition & 1 deletion api/services/ocean/aksV2/schemas/update/ocean-virtualNodeGroup.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ properties:
* "kubernetes.azure.com/fips_enabled"
* "kubernetes.azure.com/os-sku"
example:
- key: value
key: value
taints:
type: array
description: |
Expand Down
2 changes: 1 addition & 1 deletion api/services/ocean/aksV2/schemas/update/ocean-virtualNodeGroupTemplate.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ properties:
* "kubernetes.azure.com/fips_enabled"
* "kubernetes.azure.com/os-sku"
example:
- key: value
key: value
taints:
type: array
description: |
Expand Down
Loading