From 9dab51e266dcc64a9ade49d9c59bf3e7bbba3653 Mon Sep 17 00:00:00 2001 From: nont Date: Thu, 29 Jun 2023 15:38:30 -0700 Subject: [PATCH] Add v20230701preview API changes for NSG Enhancement --- .sha256sum | 2 +- pkg/api/admin/zz_generated_installphase_enumer.go | 1 - pkg/api/openshiftclusterdocument_example.go | 5 +++-- pkg/api/v20230701preview/openshiftcluster.go | 12 ++++++++++++ .../v20230701preview/openshiftcluster_convert.go | 7 ++++--- pkg/api/zz_generated_installphase_enumer.go | 1 - .../2023-07-01-preview/redhatopenshift/enums.go | 15 +++++++++++++++ .../2023-07-01-preview/redhatopenshift/models.go | 2 ++ pkg/env/zz_generated_feature_enumer.go | 1 - pkg/operator/controllers/rbac/bindata.go | 12 +++++++----- pkg/portal/cluster/bindata.go | 12 +++++++----- .../v2023_07_01_preview/models/__init__.py | 2 ++ .../_azure_red_hat_open_shift_client_enums.py | 7 +++++++ .../v2023_07_01_preview/models/_models.py | 10 ++++++++++ .../v2023_07_01_preview/models/_models_py3.py | 11 +++++++++++ .../OpenShiftClusters_CreateOrUpdate.json | 9 ++++++--- .../examples/OpenShiftClusters_Get.json | 3 ++- .../examples/OpenShiftClusters_List.json | 3 ++- .../OpenShiftClusters_ListByResourceGroup.json | 3 ++- .../examples/OpenShiftClusters_Update.json | 9 ++++++--- .../2023-07-01-preview/redhatopenshift.json | 12 ++++++++++++ 21 files changed, 111 insertions(+), 28 deletions(-) diff --git a/.sha256sum b/.sha256sum index 6b43b3ed6d9..0cc39541a79 100644 --- a/.sha256sum +++ b/.sha256sum @@ -3,4 +3,4 @@ 239c63228da1db172f298cd81d0c3cc0d52ecca907915efe61be98c42b6d8f1d swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/stable/2022-04-01/redhatopenshift.json 1d167031baf0209fe8c46df9654585c64e8cc9a0c89555d7479c4ed6dc150251 swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/stable/2022-09-04/redhatopenshift.json 622404e8311c62f27fba778e30e760bb1901e5bd221b23de72f449cafbdf0c45 swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/stable/2023-04-01/redhatopenshift.json -4df3ebacaf35d77d09f5eab75fb9608241929b6ef8d00fb506455cd38e383640 swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/preview/2023-07-01-preview/redhatopenshift.json +daab3ae0f3e21da0c63fd3f5a895d090cba06374c7e6912444cd82e834a773d6 swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/preview/2023-07-01-preview/redhatopenshift.json diff --git a/pkg/api/admin/zz_generated_installphase_enumer.go b/pkg/api/admin/zz_generated_installphase_enumer.go index db9c9868bf8..1efc5bed426 100644 --- a/pkg/api/admin/zz_generated_installphase_enumer.go +++ b/pkg/api/admin/zz_generated_installphase_enumer.go @@ -1,6 +1,5 @@ // Code generated by "enumer -type InstallPhase -output zz_generated_installphase_enumer.go"; DO NOT EDIT. -// package admin import ( diff --git a/pkg/api/openshiftclusterdocument_example.go b/pkg/api/openshiftclusterdocument_example.go index a04815fea6c..fd6cd8f4815 100644 --- a/pkg/api/openshiftclusterdocument_example.go +++ b/pkg/api/openshiftclusterdocument_example.go @@ -50,8 +50,9 @@ func ExampleOpenShiftClusterDocument() *OpenShiftClusterDocument { ClientID: "clientId", }, NetworkProfile: NetworkProfile{ - PodCIDR: "10.128.0.0/14", - ServiceCIDR: "172.30.0.0/16", + PodCIDR: "10.128.0.0/14", + ServiceCIDR: "172.30.0.0/16", + PreconfiguredNSG: PreconfiguredNSGDisabled, }, MasterProfile: MasterProfile{ VMSize: VMSizeStandardD8sV3, diff --git a/pkg/api/v20230701preview/openshiftcluster.go b/pkg/api/v20230701preview/openshiftcluster.go index 3f092dcd4e6..1ce41fc90d0 100644 --- a/pkg/api/v20230701preview/openshiftcluster.go +++ b/pkg/api/v20230701preview/openshiftcluster.go @@ -143,8 +143,20 @@ type NetworkProfile struct { // The OutboundType used for egress traffic. OutboundType OutboundType `json:"outboundType,omitempty"` + + // Specifies whether subnets are pre-attached with an NSG + PreconfiguredNSG PreconfiguredNSG `json:"preconfiguredNSG,omitempty"` } +// PreconfiguredNSG represents whether customers want to use their own NSG attached to the subnets +type PreconfiguredNSG string + +// PreconfiguredNSG constants +const ( + PreconfiguredNSGEnabled PreconfiguredNSG = "Enabled" + PreconfiguredNSGDisabled PreconfiguredNSG = "Disabled" +) + // EncryptionAtHost represents encryption at host state type EncryptionAtHost string diff --git a/pkg/api/v20230701preview/openshiftcluster_convert.go b/pkg/api/v20230701preview/openshiftcluster_convert.go index 33658928cbe..564d967ef3e 100644 --- a/pkg/api/v20230701preview/openshiftcluster_convert.go +++ b/pkg/api/v20230701preview/openshiftcluster_convert.go @@ -36,9 +36,10 @@ func (c openShiftClusterConverter) ToExternal(oc *api.OpenShiftCluster) interfac ClientSecret: string(oc.Properties.ServicePrincipalProfile.ClientSecret), }, NetworkProfile: NetworkProfile{ - PodCIDR: oc.Properties.NetworkProfile.PodCIDR, - ServiceCIDR: oc.Properties.NetworkProfile.ServiceCIDR, - OutboundType: OutboundType(oc.Properties.NetworkProfile.OutboundType), + PodCIDR: oc.Properties.NetworkProfile.PodCIDR, + ServiceCIDR: oc.Properties.NetworkProfile.ServiceCIDR, + OutboundType: OutboundType(oc.Properties.NetworkProfile.OutboundType), + PreconfiguredNSG: PreconfiguredNSG(oc.Properties.NetworkProfile.PreconfiguredNSG), }, MasterProfile: MasterProfile{ VMSize: VMSize(oc.Properties.MasterProfile.VMSize), diff --git a/pkg/api/zz_generated_installphase_enumer.go b/pkg/api/zz_generated_installphase_enumer.go index fd8de98e728..efb962a4924 100644 --- a/pkg/api/zz_generated_installphase_enumer.go +++ b/pkg/api/zz_generated_installphase_enumer.go @@ -1,6 +1,5 @@ // Code generated by "enumer -type InstallPhase -output zz_generated_installphase_enumer.go"; DO NOT EDIT. -// package api import ( diff --git a/pkg/client/services/redhatopenshift/mgmt/2023-07-01-preview/redhatopenshift/enums.go b/pkg/client/services/redhatopenshift/mgmt/2023-07-01-preview/redhatopenshift/enums.go index 10d62db85e9..ff2e10bc0cb 100644 --- a/pkg/client/services/redhatopenshift/mgmt/2023-07-01-preview/redhatopenshift/enums.go +++ b/pkg/client/services/redhatopenshift/mgmt/2023-07-01-preview/redhatopenshift/enums.go @@ -81,6 +81,21 @@ func PossibleOutboundTypeValues() []OutboundType { return []OutboundType{Loadbalancer, UserDefinedRouting} } +// PreconfiguredNSG enumerates the values for preconfigured nsg. +type PreconfiguredNSG string + +const ( + // PreconfiguredNSGDisabled ... + PreconfiguredNSGDisabled PreconfiguredNSG = "Disabled" + // PreconfiguredNSGEnabled ... + PreconfiguredNSGEnabled PreconfiguredNSG = "Enabled" +) + +// PossiblePreconfiguredNSGValues returns an array of possible values for the PreconfiguredNSG const type. +func PossiblePreconfiguredNSGValues() []PreconfiguredNSG { + return []PreconfiguredNSG{PreconfiguredNSGDisabled, PreconfiguredNSGEnabled} +} + // ProvisioningState enumerates the values for provisioning state. type ProvisioningState string diff --git a/pkg/client/services/redhatopenshift/mgmt/2023-07-01-preview/redhatopenshift/models.go b/pkg/client/services/redhatopenshift/mgmt/2023-07-01-preview/redhatopenshift/models.go index 8cb96ea7ea9..85ea6132a0d 100644 --- a/pkg/client/services/redhatopenshift/mgmt/2023-07-01-preview/redhatopenshift/models.go +++ b/pkg/client/services/redhatopenshift/mgmt/2023-07-01-preview/redhatopenshift/models.go @@ -440,6 +440,8 @@ type NetworkProfile struct { ServiceCidr *string `json:"serviceCidr,omitempty"` // OutboundType - The OutboundType used for egress traffic. Possible values include: 'Loadbalancer', 'UserDefinedRouting' OutboundType OutboundType `json:"outboundType,omitempty"` + // PreconfiguredNSG - Specifies whether subnets are pre-attached with an NSG. Possible values include: 'PreconfiguredNSGDisabled', 'PreconfiguredNSGEnabled' + PreconfiguredNSG PreconfiguredNSG `json:"preconfiguredNSG,omitempty"` } // OpenShiftCluster openShiftCluster represents an Azure Red Hat OpenShift cluster. diff --git a/pkg/env/zz_generated_feature_enumer.go b/pkg/env/zz_generated_feature_enumer.go index 020fe9c7402..13c788b33d6 100644 --- a/pkg/env/zz_generated_feature_enumer.go +++ b/pkg/env/zz_generated_feature_enumer.go @@ -1,6 +1,5 @@ // Code generated by "enumer -type Feature -output zz_generated_feature_enumer.go"; DO NOT EDIT. -// package env import ( diff --git a/pkg/operator/controllers/rbac/bindata.go b/pkg/operator/controllers/rbac/bindata.go index 897c37ac400..b38d5466977 100644 --- a/pkg/operator/controllers/rbac/bindata.go +++ b/pkg/operator/controllers/rbac/bindata.go @@ -178,11 +178,13 @@ var _bindata = map[string]func() (*asset, error){ // directory embedded in the file by go-bindata. // For example if you run go-bindata on data/... and data contains the // following hierarchy: -// data/ -// foo.txt -// img/ -// a.png -// b.png +// +// data/ +// foo.txt +// img/ +// a.png +// b.png +// // then AssetDir("data") would return []string{"foo.txt", "img"} // AssetDir("data/img") would return []string{"a.png", "b.png"} // AssetDir("foo.txt") and AssetDir("notexist") would return an error diff --git a/pkg/portal/cluster/bindata.go b/pkg/portal/cluster/bindata.go index 310a54f4974..ab0f3c84b33 100644 --- a/pkg/portal/cluster/bindata.go +++ b/pkg/portal/cluster/bindata.go @@ -222,11 +222,13 @@ var _bindata = map[string]func() (*asset, error){ // directory embedded in the file by go-bindata. // For example if you run go-bindata on data/... and data contains the // following hierarchy: -// data/ -// foo.txt -// img/ -// a.png -// b.png +// +// data/ +// foo.txt +// img/ +// a.png +// b.png +// // then AssetDir("data") would return []string{"foo.txt", "img"} // AssetDir("data/img") would return []string{"a.png", "b.png"} // AssetDir("foo.txt") and AssetDir("notexist") would return an error diff --git a/python/client/azure/mgmt/redhatopenshift/v2023_07_01_preview/models/__init__.py b/python/client/azure/mgmt/redhatopenshift/v2023_07_01_preview/models/__init__.py index 4083d9b949a..322bddae21f 100644 --- a/python/client/azure/mgmt/redhatopenshift/v2023_07_01_preview/models/__init__.py +++ b/python/client/azure/mgmt/redhatopenshift/v2023_07_01_preview/models/__init__.py @@ -92,6 +92,7 @@ EncryptionAtHost, FipsValidatedModules, OutboundType, + PreconfiguredNSG, ProvisioningState, Visibility, ) @@ -136,6 +137,7 @@ 'EncryptionAtHost', 'FipsValidatedModules', 'OutboundType', + 'PreconfiguredNSG', 'ProvisioningState', 'Visibility', ] diff --git a/python/client/azure/mgmt/redhatopenshift/v2023_07_01_preview/models/_azure_red_hat_open_shift_client_enums.py b/python/client/azure/mgmt/redhatopenshift/v2023_07_01_preview/models/_azure_red_hat_open_shift_client_enums.py index 4c3b60b3156..45326fc5e65 100644 --- a/python/client/azure/mgmt/redhatopenshift/v2023_07_01_preview/models/_azure_red_hat_open_shift_client_enums.py +++ b/python/client/azure/mgmt/redhatopenshift/v2023_07_01_preview/models/_azure_red_hat_open_shift_client_enums.py @@ -47,6 +47,13 @@ class OutboundType(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): LOADBALANCER = "Loadbalancer" USER_DEFINED_ROUTING = "UserDefinedRouting" +class PreconfiguredNSG(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): + """PreconfiguredNSG represents whether customers want to use their own NSG attached to the subnets + """ + + DISABLED = "Disabled" + ENABLED = "Enabled" + class ProvisioningState(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): """ProvisioningState represents a provisioning state. """ diff --git a/python/client/azure/mgmt/redhatopenshift/v2023_07_01_preview/models/_models.py b/python/client/azure/mgmt/redhatopenshift/v2023_07_01_preview/models/_models.py index fe0313be99a..e4b245361c6 100644 --- a/python/client/azure/mgmt/redhatopenshift/v2023_07_01_preview/models/_models.py +++ b/python/client/azure/mgmt/redhatopenshift/v2023_07_01_preview/models/_models.py @@ -502,12 +502,17 @@ class NetworkProfile(msrest.serialization.Model): "Loadbalancer", "UserDefinedRouting". :vartype outbound_type: str or ~azure.mgmt.redhatopenshift.v2023_07_01_preview.models.OutboundType + :ivar preconfigured_nsg: Specifies whether subnets are pre-attached with an NSG. Possible + values include: "Disabled", "Enabled". + :vartype preconfigured_nsg: str or + ~azure.mgmt.redhatopenshift.v2023_07_01_preview.models.PreconfiguredNSG """ _attribute_map = { 'pod_cidr': {'key': 'podCidr', 'type': 'str'}, 'service_cidr': {'key': 'serviceCidr', 'type': 'str'}, 'outbound_type': {'key': 'outboundType', 'type': 'str'}, + 'preconfigured_nsg': {'key': 'preconfiguredNSG', 'type': 'str'}, } def __init__( @@ -523,11 +528,16 @@ def __init__( "Loadbalancer", "UserDefinedRouting". :paramtype outbound_type: str or ~azure.mgmt.redhatopenshift.v2023_07_01_preview.models.OutboundType + :keyword preconfigured_nsg: Specifies whether subnets are pre-attached with an NSG. Possible + values include: "Disabled", "Enabled". + :paramtype preconfigured_nsg: str or + ~azure.mgmt.redhatopenshift.v2023_07_01_preview.models.PreconfiguredNSG """ super(NetworkProfile, self).__init__(**kwargs) self.pod_cidr = kwargs.get('pod_cidr', None) self.service_cidr = kwargs.get('service_cidr', None) self.outbound_type = kwargs.get('outbound_type', None) + self.preconfigured_nsg = kwargs.get('preconfigured_nsg', None) class TrackedResource(Resource): diff --git a/python/client/azure/mgmt/redhatopenshift/v2023_07_01_preview/models/_models_py3.py b/python/client/azure/mgmt/redhatopenshift/v2023_07_01_preview/models/_models_py3.py index 339d1b7d5e0..d7b48d540bd 100644 --- a/python/client/azure/mgmt/redhatopenshift/v2023_07_01_preview/models/_models_py3.py +++ b/python/client/azure/mgmt/redhatopenshift/v2023_07_01_preview/models/_models_py3.py @@ -545,12 +545,17 @@ class NetworkProfile(msrest.serialization.Model): "Loadbalancer", "UserDefinedRouting". :vartype outbound_type: str or ~azure.mgmt.redhatopenshift.v2023_07_01_preview.models.OutboundType + :ivar preconfigured_nsg: Specifies whether subnets are pre-attached with an NSG. Possible + values include: "Disabled", "Enabled". + :vartype preconfigured_nsg: str or + ~azure.mgmt.redhatopenshift.v2023_07_01_preview.models.PreconfiguredNSG """ _attribute_map = { 'pod_cidr': {'key': 'podCidr', 'type': 'str'}, 'service_cidr': {'key': 'serviceCidr', 'type': 'str'}, 'outbound_type': {'key': 'outboundType', 'type': 'str'}, + 'preconfigured_nsg': {'key': 'preconfiguredNSG', 'type': 'str'}, } def __init__( @@ -559,6 +564,7 @@ def __init__( pod_cidr: Optional[str] = None, service_cidr: Optional[str] = None, outbound_type: Optional[Union[str, "OutboundType"]] = None, + preconfigured_nsg: Optional[Union[str, "PreconfiguredNSG"]] = None, **kwargs ): """ @@ -570,11 +576,16 @@ def __init__( "Loadbalancer", "UserDefinedRouting". :paramtype outbound_type: str or ~azure.mgmt.redhatopenshift.v2023_07_01_preview.models.OutboundType + :keyword preconfigured_nsg: Specifies whether subnets are pre-attached with an NSG. Possible + values include: "Disabled", "Enabled". + :paramtype preconfigured_nsg: str or + ~azure.mgmt.redhatopenshift.v2023_07_01_preview.models.PreconfiguredNSG """ super(NetworkProfile, self).__init__(**kwargs) self.pod_cidr = pod_cidr self.service_cidr = service_cidr self.outbound_type = outbound_type + self.preconfigured_nsg = preconfigured_nsg class TrackedResource(Resource): diff --git a/swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/preview/2023-07-01-preview/examples/OpenShiftClusters_CreateOrUpdate.json b/swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/preview/2023-07-01-preview/examples/OpenShiftClusters_CreateOrUpdate.json index 3fc0a5292dd..f5499224c1d 100644 --- a/swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/preview/2023-07-01-preview/examples/OpenShiftClusters_CreateOrUpdate.json +++ b/swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/preview/2023-07-01-preview/examples/OpenShiftClusters_CreateOrUpdate.json @@ -23,7 +23,8 @@ }, "networkProfile": { "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" + "serviceCidr": "172.30.0.0/16", + "preconfiguredNSG": "Disabled" }, "masterProfile": { "vmSize": "Standard_D8s_v3", @@ -84,7 +85,8 @@ }, "networkProfile": { "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" + "serviceCidr": "172.30.0.0/16", + "preconfiguredNSG": "Disabled" }, "masterProfile": { "vmSize": "Standard_D8s_v3", @@ -146,7 +148,8 @@ }, "networkProfile": { "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" + "serviceCidr": "172.30.0.0/16", + "preconfiguredNSG": "Disabled" }, "masterProfile": { "vmSize": "Standard_D8s_v3", diff --git a/swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/preview/2023-07-01-preview/examples/OpenShiftClusters_Get.json b/swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/preview/2023-07-01-preview/examples/OpenShiftClusters_Get.json index 4fe9c288fcb..8e8edb888c1 100644 --- a/swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/preview/2023-07-01-preview/examples/OpenShiftClusters_Get.json +++ b/swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/preview/2023-07-01-preview/examples/OpenShiftClusters_Get.json @@ -38,7 +38,8 @@ }, "networkProfile": { "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" + "serviceCidr": "172.30.0.0/16", + "preconfiguredNSG": "Disabled" }, "masterProfile": { "vmSize": "Standard_D8s_v3", diff --git a/swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/preview/2023-07-01-preview/examples/OpenShiftClusters_List.json b/swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/preview/2023-07-01-preview/examples/OpenShiftClusters_List.json index 999c9f124ad..b5ec98d559c 100644 --- a/swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/preview/2023-07-01-preview/examples/OpenShiftClusters_List.json +++ b/swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/preview/2023-07-01-preview/examples/OpenShiftClusters_List.json @@ -38,7 +38,8 @@ }, "networkProfile": { "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" + "serviceCidr": "172.30.0.0/16", + "preconfiguredNSG": "Disabled" }, "masterProfile": { "vmSize": "Standard_D8s_v3", diff --git a/swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/preview/2023-07-01-preview/examples/OpenShiftClusters_ListByResourceGroup.json b/swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/preview/2023-07-01-preview/examples/OpenShiftClusters_ListByResourceGroup.json index 025c1e47e45..0b10b194716 100644 --- a/swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/preview/2023-07-01-preview/examples/OpenShiftClusters_ListByResourceGroup.json +++ b/swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/preview/2023-07-01-preview/examples/OpenShiftClusters_ListByResourceGroup.json @@ -39,7 +39,8 @@ }, "networkProfile": { "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" + "serviceCidr": "172.30.0.0/16", + "preconfiguredNSG": "Disabled" }, "masterProfile": { "vmSize": "Standard_D8s_v3", diff --git a/swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/preview/2023-07-01-preview/examples/OpenShiftClusters_Update.json b/swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/preview/2023-07-01-preview/examples/OpenShiftClusters_Update.json index 600e16709b3..ac21c3e785f 100644 --- a/swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/preview/2023-07-01-preview/examples/OpenShiftClusters_Update.json +++ b/swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/preview/2023-07-01-preview/examples/OpenShiftClusters_Update.json @@ -22,7 +22,8 @@ }, "networkProfile": { "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" + "serviceCidr": "172.30.0.0/16", + "preconfiguredNSG": "Disabled" }, "masterProfile": { "vmSize": "Standard_D8s_v3", @@ -83,7 +84,8 @@ }, "networkProfile": { "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" + "serviceCidr": "172.30.0.0/16", + "preconfiguredNSG": "Disabled" }, "masterProfile": { "vmSize": "Standard_D8s_v3", @@ -145,7 +147,8 @@ }, "networkProfile": { "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" + "serviceCidr": "172.30.0.0/16", + "preconfiguredNSG": "Disabled" }, "masterProfile": { "vmSize": "Standard_D8s_v3", diff --git a/swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/preview/2023-07-01-preview/redhatopenshift.json b/swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/preview/2023-07-01-preview/redhatopenshift.json index 1add4b1c2b6..567f48fd767 100644 --- a/swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/preview/2023-07-01-preview/redhatopenshift.json +++ b/swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/preview/2023-07-01-preview/redhatopenshift.json @@ -1989,6 +1989,10 @@ "outboundType": { "$ref": "#/definitions/OutboundType", "description": "The OutboundType used for egress traffic." + }, + "preconfiguredNSG": { + "$ref": "#/definitions/PreconfiguredNSG", + "description": "Specifies whether subnets are pre-attached with an NSG" } } }, @@ -2219,6 +2223,14 @@ ], "type": "string" }, + "PreconfiguredNSG": { + "description": "PreconfiguredNSG represents whether customers want to use their own NSG attached to the subnets", + "enum": [ + "Disabled", + "Enabled" + ], + "type": "string" + }, "ProvisioningState": { "description": "ProvisioningState represents a provisioning state.", "enum": [