Merge pull request #1963 from shiftstack/deprecate-unused-mapo-fields

OSASINFRA-3689: Deprecate unused MAPO fields

Author: openshift-merge-bot[bot]

machine/v1alpha1/types_openstack.go

@@ -51,6 +51,7 @@ type OpenstackProviderSpec struct {
 	KeyName string `json:"keyName,omitempty"`
 
 	// The machine ssh username
+	// Deprecated: sshUserName is silently ignored.
 	SshUserName string `json:"sshUserName,omitempty"`
 
 	// A networks object. Required parameter when there are multiple networks defined for the tenant.
@@ -108,6 +109,7 @@ type OpenstackProviderSpec struct {
 	ServerGroupName string `json:"serverGroupName,omitempty"`
 
 	// The subnet that a set of machines will get ingress/egress traffic from
+	// Deprecated: primarySubnet is silently ignored. Use subnets instead.
 	PrimarySubnet string `json:"primarySubnet,omitempty"`
 }
 
@@ -161,6 +163,7 @@ type NetworkParam struct {
 	// The UUID of the network. Required if you omit the port attribute.
 	UUID string `json:"uuid,omitempty"`
 	// A fixed IPv4 address for the NIC.
+	// Deprecated: fixedIP is silently ignored. Use subnets instead.
 	FixedIp string `json:"fixedIp,omitempty"`
 	// Filters for optional network query
 	Filter Filter `json:"filter,omitempty"`
@@ -233,6 +236,7 @@ type SubnetParam struct {
 	PortTags []string `json:"portTags,omitempty"`
 
 	// portSecurity optionally enables or disables security on ports managed by OpenStack
+	// Deprecated: portSecurity is silently ignored. Set portSecurity on the parent network instead.
 	PortSecurity *bool `json:"portSecurity,omitempty"`
 }
 
@@ -263,6 +267,7 @@ type SubnetFilter struct {
 	// ipv6RaMode filters subnets by IPv6 router adversiement mode.
 	IPv6RAMode string `json:"ipv6RaMode,omitempty"`
 	// subnetpoolId filters subnets by subnet pool ID.
+	// Deprecated: subnetpoolId is silently ignored.
 	SubnetPoolID string `json:"subnetpoolId,omitempty"`
 	// tags filters by subnets containing all specified tags.
 	// Multiple tags are comma separated.
@@ -307,11 +312,12 @@ type PortOpts struct {
 	// tenantID specifies the tenant ID of the created port. Note that this
 	// requires OpenShift to have administrative permissions, which is
 	// typically not the case. Use of this field is not recommended.
-	// Deprecated: use projectID instead. It will be ignored if projectID is set.
+	// Deprecated: tenantID is silently ignored.
 	TenantID string `json:"tenantID,omitempty"`
 	// projectID specifies the project ID of the created port. Note that this
 	// requires OpenShift to have administrative permissions, which is
 	// typically not the case. Use of this field is not recommended.
+	// Deprecated: projectID is silently ignored.
 	ProjectID string `json:"projectID,omitempty"`
 	// securityGroups specifies a set of security group UUIDs to use instead
 	// of the machine's default security groups. The default security groups

machine/v1alpha1/zz_generated.swagger_doc_generated.go

@@ -19965,7 +19965,7 @@
           "$ref": "#/definitions/com.github.openshift.api.machine.v1alpha1.Filter"
         },
         "fixedIp": {
-          "description": "A fixed IPv4 address for the NIC.",
+          "description": "A fixed IPv4 address for the NIC. Deprecated: fixedIP is silently ignored. Use subnets instead.",
           "type": "string"
         },
         "noAllowedAddressPairs": {
@@ -20097,7 +20097,7 @@
           }
         },
         "primarySubnet": {
-          "description": "The subnet that a set of machines will get ingress/egress traffic from",
+          "description": "The subnet that a set of machines will get ingress/egress traffic from Deprecated: primarySubnet is silently ignored. Use subnets instead.",
           "type": "string"
         },
         "rootVolume": {
@@ -20129,7 +20129,7 @@
           }
         },
         "sshUserName": {
-          "description": "The machine ssh username",
+          "description": "The machine ssh username Deprecated: sshUserName is silently ignored.",
           "type": "string"
         },
         "tags": {
@@ -20210,7 +20210,7 @@
           }
         },
         "projectID": {
-          "description": "projectID specifies the project ID of the created port. Note that this requires OpenShift to have administrative permissions, which is typically not the case. Use of this field is not recommended.",
+          "description": "projectID specifies the project ID of the created port. Note that this requires OpenShift to have administrative permissions, which is typically not the case. Use of this field is not recommended. Deprecated: projectID is silently ignored.",
           "type": "string"
         },
         "securityGroups": {
@@ -20230,7 +20230,7 @@
           }
         },
         "tenantID": {
-          "description": "tenantID specifies the tenant ID of the created port. Note that this requires OpenShift to have administrative permissions, which is typically not the case. Use of this field is not recommended. Deprecated: use projectID instead. It will be ignored if projectID is set.",
+          "description": "tenantID specifies the tenant ID of the created port. Note that this requires OpenShift to have administrative permissions, which is typically not the case. Use of this field is not recommended. Deprecated: tenantID is silently ignored.",
           "type": "string"
         },
         "trunk": {
@@ -20423,7 +20423,7 @@
           "type": "string"
         },
         "subnetpoolId": {
-          "description": "subnetpoolId filters subnets by subnet pool ID.",
+          "description": "subnetpoolId filters subnets by subnet pool ID. Deprecated: subnetpoolId is silently ignored.",
           "type": "string"
         },
         "tags": {
@@ -20449,7 +20449,7 @@
           "$ref": "#/definitions/com.github.openshift.api.machine.v1alpha1.SubnetFilter"
         },
         "portSecurity": {
-          "description": "portSecurity optionally enables or disables security on ports managed by OpenStack",
+          "description": "portSecurity optionally enables or disables security on ports managed by OpenStack Deprecated: portSecurity is silently ignored. Set portSecurity on the parent network instead.",
           "type": "boolean"
         },
         "portTags": {