Bug 2049838: added Nutanix platform to openshift/api #1059
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -124,7 +124,7 @@ const ( | |
| ) | ||
|
|
||
| // PlatformType is a specific supported infrastructure provider. | ||
| // +kubebuilder:validation:Enum="";AWS;Azure;BareMetal;GCP;Libvirt;OpenStack;None;VSphere;oVirt;IBMCloud;KubeVirt;EquinixMetal;PowerVS;AlibabaCloud;Nutanix | ||
| type PlatformType string | ||
|
|
||
| const ( | ||
|
|
@@ -169,6 +169,9 @@ const ( | |
|
|
||
| // AlibabaCloudPlatformType represents Alibaba Cloud infrastructure. | ||
| AlibabaCloudPlatformType PlatformType = "AlibabaCloud" | ||
|
|
||
| // NutanixPlatformType represents Nutanix infrastructure. | ||
| NutanixPlatformType PlatformType = "Nutanix" | ||
| ) | ||
|
|
||
| // IBMCloudProviderType is a specific supported IBM Cloud provider cluster type | ||
|
|
@@ -192,7 +195,7 @@ type PlatformSpec struct { | |
| // other integrations are enabled. If None, no infrastructure automation is | ||
| // enabled. Allowed values are "AWS", "Azure", "BareMetal", "GCP", "Libvirt", | ||
| // "OpenStack", "VSphere", "oVirt", "KubeVirt", "EquinixMetal", "PowerVS", | ||
| // "AlibabaCloud", "Nutanix" and "None". Individual components may not support all platforms, | ||
| // and must handle unrecognized platforms as None if they do not support that platform. | ||
| // | ||
| // +unionDiscriminator | ||
|
|
@@ -245,6 +248,10 @@ type PlatformSpec struct { | |
| // AlibabaCloud contains settings specific to the Alibaba Cloud infrastructure provider. | ||
| // +optional | ||
| AlibabaCloud *AlibabaCloudPlatformSpec `json:"alibabaCloud,omitempty"` | ||
|
|
||
| // Nutanix contains settings specific to the Nutanix infrastructure provider. | ||
| // +optional | ||
| Nutanix *NutanixPlatformSpec `json:"nutanix,omitempty"` | ||
| } | ||
|
|
||
| // PlatformStatus holds the current status specific to the underlying infrastructure provider | ||
|
|
@@ -256,7 +263,7 @@ type PlatformStatus struct { | |
| // balancers, dynamic volume provisioning, machine creation and deletion, and | ||
| // other integrations are enabled. If None, no infrastructure automation is | ||
| // enabled. Allowed values are "AWS", "Azure", "BareMetal", "GCP", "Libvirt", | ||
| // "OpenStack", "VSphere", "oVirt", "EquinixMetal", "PowerVS", "AlibabaCloud", "Nutanix" and "None". | ||
| // Individual components may not support all platforms, and must handle | ||
| // unrecognized platforms as None if they do not support that platform. | ||
| // | ||
|
|
@@ -311,6 +318,10 @@ type PlatformStatus struct { | |
| // AlibabaCloud contains settings specific to the Alibaba Cloud infrastructure provider. | ||
| // +optional | ||
| AlibabaCloud *AlibabaCloudPlatformStatus `json:"alibabaCloud,omitempty"` | ||
|
|
||
| // Nutanix contains settings specific to the Nutanix infrastructure provider. | ||
| // +optional | ||
| Nutanix *NutanixPlatformStatus `json:"nutanix,omitempty"` | ||
| } | ||
|
|
||
| // AWSServiceEndpoint store the configuration of a custom url to | ||
|
|
@@ -678,6 +689,23 @@ type AlibabaCloudResourceTag struct { | |
| Value string `json:"value"` | ||
| } | ||
|
|
||
| // NutanixPlatformSpec holds the desired state of the Nutanix infrastructure provider. | ||
| // This only includes fields that can be modified in the cluster. | ||
| type NutanixPlatformSpec struct{} | ||
|
|
||
| // NutanixPlatformStatus holds the current status of the Nutanix infrastructure provider. | ||
| type NutanixPlatformStatus struct { | ||
| // apiServerInternalIP is an IP address to contact the Kubernetes API server that can be used | ||
| // by components inside the cluster, like kubelets using the infrastructure rather | ||
| // than Kubernetes networking. It is the IP that the Infrastructure.status.apiServerInternalURI | ||
| // points to. It is the IP for a self-hosted load balancer in front of the API servers. | ||
| APIServerInternalIP string `json:"apiServerInternalIP,omitempty"` | ||
|
Contributor
There was a problem hiding this comment. why do we need this in addition?
Contributor
There was a problem hiding this comment. @sttts Correct me if I'm wrong but AFAIK on-prem platforms are expected to provide both these fields to the machine config operator. see: https://github.com/openshift/machine-config-operator/pull/2852/files# |
||
|
|
||
| // ingressIP is an external IP which routes to the default ingress controller. | ||
| // The IP is a suitable target of a wildcard DNS record used to resolve default route host names. | ||
| IngressIP string `json:"ingressIP,omitempty"` | ||
| } | ||
|
|
||
| // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object | ||
|
|
||
| // InfrastructureList is | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This value needs to be added to the
+kubebuilder:validation:Enumannotation on thePlatformTypetype.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@staebler Added the value as requested.