Skip to content

Add KubeVirt platform type #734

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

Merged
openshift-merge-robot merged 2 commits into from
Oct 2, 2020
Merged

Add KubeVirt platform type #734

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b1cc5ee
Add KubeVirt platform type
nirarg Aug 18, 2020
a4d285f
Auto generated files ("make update")
nirarg Sep 2, 2020
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
29 changes: 27 additions & 2 deletions config/v1/0000_10_config-operator_01_infrastructure.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,10 @@ spec:
description: IBMCloud contains settings specific to the IBMCloud
infrastructure provider.
type: object
kubevirt:
description: Kubevirt contains settings specific to the kubevirt
infrastructure provider.
type: object
openstack:
description: OpenStack contains settings specific to the OpenStack
infrastructure provider.
Expand All @@ -127,8 +131,8 @@ spec:
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", and "None". Individual components may not
support all platforms, and must handle unrecognized platforms
"VSphere", "oVirt", "KubeVirt" and "None". Individual components
may not support all platforms, and must handle unrecognized platforms
as None if they do not support that platform.
type: string
enum:
Expand All @@ -143,6 +147,7 @@ spec:
- VSphere
- oVirt
- IBMCloud
- KubeVirt
vsphere:
description: VSphere contains settings specific to the VSphere infrastructure
provider.
Expand Down Expand Up @@ -190,6 +195,7 @@ spec:
- VSphere
- oVirt
- IBMCloud
- KubeVirt
platformStatus:
description: platformStatus holds status information specific to the
underlying infrastructure provider.
Expand Down Expand Up @@ -307,6 +313,24 @@ spec:
description: ResourceGroupName is the Resource Group for new
IBMCloud resources created for the cluster.
type: string
kubevirt:
description: Kubevirt contains settings specific to the kubevirt
infrastructure provider.
type: object
properties:
apiServerInternalIP:
description: 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.
type: string
ingressIP:
description: 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.
type: string
openstack:
description: OpenStack contains settings specific to the OpenStack
infrastructure provider.
Expand Down Expand Up @@ -385,6 +409,7 @@ spec:
- VSphere
- oVirt
- IBMCloud
- KubeVirt
vsphere:
description: VSphere contains settings specific to the VSphere infrastructure
provider.
Expand Down
32 changes: 30 additions & 2 deletions config/v1/types_infrastructure.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ type InfrastructureStatus struct {
}

// PlatformType is a specific supported infrastructure provider.
// +kubebuilder:validation:Enum="";AWS;Azure;BareMetal;GCP;Libvirt;OpenStack;None;VSphere;oVirt;IBMCloud
// +kubebuilder:validation:Enum="";AWS;Azure;BareMetal;GCP;Libvirt;OpenStack;None;VSphere;oVirt;IBMCloud;KubeVirt
type PlatformType string

const (
Expand Down Expand Up @@ -112,6 +112,9 @@ const (

// IBMCloudPlatformType represents IBM Cloud infrastructure.
IBMCloudPlatformType PlatformType = "IBMCloud"

// KubevirtPlatformType represents KubeVirt/Openshift Virtualization infrastructure.
KubevirtPlatformType PlatformType = "KubeVirt"
)

// IBMCloudProviderType is a specific supported IBM Cloud provider cluster type
Expand All @@ -134,7 +137,7 @@ type PlatformSpec 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", and "None". Individual components may not support
// "OpenStack", "VSphere", "oVirt", "KubeVirt" and "None". Individual components may not support
// all platforms, and must handle unrecognized platforms as None if they do
// not support that platform.
//
Expand Down Expand Up @@ -172,6 +175,10 @@ type PlatformSpec struct {
// IBMCloud contains settings specific to the IBMCloud infrastructure provider.
// +optional
IBMCloud *IBMCloudPlatformSpec `json:"ibmcloud,omitempty"`

// Kubevirt contains settings specific to the kubevirt infrastructure provider.
// +optional
Kubevirt *KubevirtPlatformSpec `json:"kubevirt,omitempty"`
}

// PlatformStatus holds the current status specific to the underlying infrastructure provider
Expand Down Expand Up @@ -222,6 +229,10 @@ type PlatformStatus struct {
// IBMCloud contains settings specific to the IBMCloud infrastructure provider.
// +optional
IBMCloud *IBMCloudPlatformStatus `json:"ibmcloud,omitempty"`

// Kubevirt contains settings specific to the kubevirt infrastructure provider.
// +optional
Kubevirt *KubevirtPlatformStatus `json:"kubevirt,omitempty"`
}

// AWSServiceEndpoint store the configuration of a custom url to
Expand Down Expand Up @@ -433,6 +444,23 @@ type IBMCloudPlatformStatus struct {
ProviderType IBMCloudProviderType `json:"providerType,omitempty"`
}

// KubevirtPlatformSpec holds the desired state of the kubevirt infrastructure provider.
// This only includes fields that can be modified in the cluster.
type KubevirtPlatformSpec struct{}

// KubevirtPlatformStatus holds the current status of the kubevirt infrastructure provider.
type KubevirtPlatformStatus 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"`

// 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
Expand Down
42 changes: 42 additions & 0 deletions config/v1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 21 additions & 1 deletion config/v1/zz_generated.swagger_doc_generated.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.