This commit is contained in:
Christoph Blecker 2022-08-30 11:44:12 -07:00
Родитель 3359533a4a
Коммит 295940d4c6
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: B34A59A9D39F838B
8 изменённых файлов: 1 добавлений и 64 удалений

Просмотреть файл

@ -1,4 +1,4 @@
468fa0da0a50d50640ec57843ad288af343128b39f5bf23e76e4e336580883d4 swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/stable/2020-04-30/redhatopenshift.json
c323c84befa5ea11da50a2407050abed6540ea01e796720bc2241604ce80567c swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/preview/2021-09-01-preview/redhatopenshift.json
e4e522e41855de71c0318db31cbd96c8713e7a74e7c81911bb494f0b194b3f43 swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/stable/2022-04-01/redhatopenshift.json
4c3d8755c87f9b749a0ff6c76fae08d44225f7aa7becd913936a883bfe9ecfe3 swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/stable/2022-09-04/redhatopenshift.json
1904724f413437e8f7bec1493e1c332e48b2dffd0f7d1f2f6060c281c07880ce swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/stable/2022-09-04/redhatopenshift.json

Просмотреть файл

@ -89,21 +89,6 @@ func PossibleProvisioningStateValues() []ProvisioningState {
return []ProvisioningState{AdminUpdating, Creating, Deleting, Failed, Succeeded, Updating}
}
// SoftwareDefinedNetwork enumerates the values for software defined network.
type SoftwareDefinedNetwork string
const (
// OpenShiftSDN ...
OpenShiftSDN SoftwareDefinedNetwork = "OpenShiftSDN"
// OVNKubernetes ...
OVNKubernetes SoftwareDefinedNetwork = "OVNKubernetes"
)
// PossibleSoftwareDefinedNetworkValues returns an array of possible values for the SoftwareDefinedNetwork const type.
func PossibleSoftwareDefinedNetworkValues() []SoftwareDefinedNetwork {
return []SoftwareDefinedNetwork{OpenShiftSDN, OVNKubernetes}
}
// Visibility enumerates the values for visibility.
type Visibility string

Просмотреть файл

@ -142,8 +142,6 @@ type MasterProfile struct {
// NetworkProfile networkProfile represents a network profile.
type NetworkProfile struct {
// SoftwareDefinedNetwork - The SDN type used for OpenShift/Kubernetes Pods. Possible values include: 'OVNKubernetes', 'OpenShiftSDN'
SoftwareDefinedNetwork SoftwareDefinedNetwork `json:"softwareDefinedNetwork,omitempty"`
// PodCidr - The CIDR used for OpenShift/Kubernetes Pods.
PodCidr *string `json:"podCidr,omitempty"`
// ServiceCidr - The CIDR used for OpenShift/Kubernetes Services.

Просмотреть файл

@ -62,7 +62,6 @@ from ._azure_red_hat_open_shift_client_enums import (
EncryptionAtHost,
FipsValidatedModules,
ProvisioningState,
SoftwareDefinedNetwork,
Visibility,
)
@ -91,6 +90,5 @@ __all__ = [
'EncryptionAtHost',
'FipsValidatedModules',
'ProvisioningState',
'SoftwareDefinedNetwork',
'Visibility',
]

Просмотреть файл

@ -53,13 +53,6 @@ class ProvisioningState(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)):
SUCCEEDED = "Succeeded"
UPDATING = "Updating"
class SoftwareDefinedNetwork(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)):
"""SoftwareDefinedNetwork is a choice of network used for Pods.
"""
OVN_KUBERNETES = "OVNKubernetes"
OPEN_SHIFT_SDN = "OpenShiftSDN"
class Visibility(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)):
"""Visibility represents visibility.
"""

Просмотреть файл

@ -299,10 +299,6 @@ class MasterProfile(msrest.serialization.Model):
class NetworkProfile(msrest.serialization.Model):
"""NetworkProfile represents a network profile.
:ivar software_defined_network: The SDN type used for OpenShift/Kubernetes Pods. Possible
values include: "OVNKubernetes", "OpenShiftSDN".
:vartype software_defined_network: str or
~azure.mgmt.redhatopenshift.v2022_09_04.models.SoftwareDefinedNetwork
:ivar pod_cidr: The CIDR used for OpenShift/Kubernetes Pods.
:vartype pod_cidr: str
:ivar service_cidr: The CIDR used for OpenShift/Kubernetes Services.
@ -310,7 +306,6 @@ class NetworkProfile(msrest.serialization.Model):
"""
_attribute_map = {
'software_defined_network': {'key': 'softwareDefinedNetwork', 'type': 'str'},
'pod_cidr': {'key': 'podCidr', 'type': 'str'},
'service_cidr': {'key': 'serviceCidr', 'type': 'str'},
}
@ -320,17 +315,12 @@ class NetworkProfile(msrest.serialization.Model):
**kwargs
):
"""
:keyword software_defined_network: The SDN type used for OpenShift/Kubernetes Pods. Possible
values include: "OVNKubernetes", "OpenShiftSDN".
:paramtype software_defined_network: str or
~azure.mgmt.redhatopenshift.v2022_09_04.models.SoftwareDefinedNetwork
:keyword pod_cidr: The CIDR used for OpenShift/Kubernetes Pods.
:paramtype pod_cidr: str
:keyword service_cidr: The CIDR used for OpenShift/Kubernetes Services.
:paramtype service_cidr: str
"""
super(NetworkProfile, self).__init__(**kwargs)
self.software_defined_network = kwargs.get('software_defined_network', None)
self.pod_cidr = kwargs.get('pod_cidr', None)
self.service_cidr = kwargs.get('service_cidr', None)

Просмотреть файл

@ -335,10 +335,6 @@ class MasterProfile(msrest.serialization.Model):
class NetworkProfile(msrest.serialization.Model):
"""NetworkProfile represents a network profile.
:ivar software_defined_network: The SDN type used for OpenShift/Kubernetes Pods. Possible
values include: "OVNKubernetes", "OpenShiftSDN".
:vartype software_defined_network: str or
~azure.mgmt.redhatopenshift.v2022_09_04.models.SoftwareDefinedNetwork
:ivar pod_cidr: The CIDR used for OpenShift/Kubernetes Pods.
:vartype pod_cidr: str
:ivar service_cidr: The CIDR used for OpenShift/Kubernetes Services.
@ -346,7 +342,6 @@ class NetworkProfile(msrest.serialization.Model):
"""
_attribute_map = {
'software_defined_network': {'key': 'softwareDefinedNetwork', 'type': 'str'},
'pod_cidr': {'key': 'podCidr', 'type': 'str'},
'service_cidr': {'key': 'serviceCidr', 'type': 'str'},
}
@ -354,23 +349,17 @@ class NetworkProfile(msrest.serialization.Model):
def __init__(
self,
*,
software_defined_network: Optional[Union[str, "SoftwareDefinedNetwork"]] = None,
pod_cidr: Optional[str] = None,
service_cidr: Optional[str] = None,
**kwargs
):
"""
:keyword software_defined_network: The SDN type used for OpenShift/Kubernetes Pods. Possible
values include: "OVNKubernetes", "OpenShiftSDN".
:paramtype software_defined_network: str or
~azure.mgmt.redhatopenshift.v2022_09_04.models.SoftwareDefinedNetwork
:keyword pod_cidr: The CIDR used for OpenShift/Kubernetes Pods.
:paramtype pod_cidr: str
:keyword service_cidr: The CIDR used for OpenShift/Kubernetes Services.
:paramtype service_cidr: str
"""
super(NetworkProfile, self).__init__(**kwargs)
self.software_defined_network = software_defined_network
self.pod_cidr = pod_cidr
self.service_cidr = service_cidr

Просмотреть файл

@ -679,10 +679,6 @@
"description": "NetworkProfile represents a network profile.",
"type": "object",
"properties": {
"softwareDefinedNetwork": {
"$ref": "#/definitions/SoftwareDefinedNetwork",
"description": "The SDN type used for OpenShift/Kubernetes Pods."
},
"podCidr": {
"description": "The CIDR used for OpenShift/Kubernetes Pods.",
"type": "string"
@ -894,18 +890,6 @@
}
}
},
"SoftwareDefinedNetwork": {
"description": "SoftwareDefinedNetwork is a choice of network used for Pods.",
"enum": [
"OVNKubernetes",
"OpenShiftSDN"
],
"type": "string",
"x-ms-enum": {
"name": "SoftwareDefinedNetwork",
"modelAsString": true
}
},
"Tags": {
"description": "Tags represents an OpenShift cluster's tags.",
"type": "object",