Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 0 additions & 4 deletions apis/hive/v1/clusterdeployment_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import (
"github.com/openshift/hive/apis/hive/v1/none"
"github.com/openshift/hive/apis/hive/v1/nutanix"
"github.com/openshift/hive/apis/hive/v1/openstack"
"github.com/openshift/hive/apis/hive/v1/ovirt"
"github.com/openshift/hive/apis/hive/v1/vsphere"
)

Expand Down Expand Up @@ -667,9 +666,6 @@ type Platform struct {
// VSphere is the configuration used when installing on vSphere
VSphere *vsphere.Platform `json:"vsphere,omitempty"`

// Ovirt is the configuration used when installing on oVirt
Ovirt *ovirt.Platform `json:"ovirt,omitempty"`

// AgentBareMetal is the configuration used when performing an Assisted Agent based installation
// to bare metal.
AgentBareMetal *agent.BareMetalPlatform `json:"agentBareMetal,omitempty"`
Expand Down
14 changes: 0 additions & 14 deletions apis/hive/v1/clusterdeprovision_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,6 @@ type ClusterDeprovisionPlatform struct {
OpenStack *OpenStackClusterDeprovision `json:"openstack,omitempty"`
// VSphere contains VMWare vSphere-specific deprovision settings
VSphere *VSphereClusterDeprovision `json:"vsphere,omitempty"`
// Ovirt contains oVirt-specific deprovision settings
Ovirt *OvirtClusterDeprovision `json:"ovirt,omitempty"`
// IBMCloud contains IBM Cloud specific deprovision settings
IBMCloud *IBMClusterDeprovision `json:"ibmcloud,omitempty"`
// Nutanix contains Nutanix-specific deprovision settings
Expand Down Expand Up @@ -134,18 +132,6 @@ type VSphereClusterDeprovision struct {
VCenter string `json:"vCenter"`
}

// OvirtClusterDeprovision contains oVirt-specific configuration for a ClusterDeprovision
type OvirtClusterDeprovision struct {
// The oVirt cluster ID
ClusterID string `json:"clusterID"`
// CredentialsSecretRef is the oVirt account credentials to use for deprovisioning the cluster
// secret fields: ovirt_url, ovirt_username, ovirt_password, ovirt_ca_bundle
CredentialsSecretRef corev1.LocalObjectReference `json:"credentialsSecretRef"`
// CertificatesSecretRef refers to a secret that contains the oVirt CA certificates
// necessary for communicating with the oVirt.
CertificatesSecretRef corev1.LocalObjectReference `json:"certificatesSecretRef"`
}

// IBMClusterDeprovision contains IBM Cloud specific configuration for a ClusterDeprovision
type IBMClusterDeprovision struct {
// CredentialsSecretRef is the IBM Cloud credentials to use for deprovisioning the cluster
Expand Down
3 changes: 0 additions & 3 deletions apis/hive/v1/machinepool_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import (
"github.com/openshift/hive/apis/hive/v1/ibmcloud"
"github.com/openshift/hive/apis/hive/v1/nutanix"
"github.com/openshift/hive/apis/hive/v1/openstack"
"github.com/openshift/hive/apis/hive/v1/ovirt"
"github.com/openshift/hive/apis/hive/v1/vsphere"
)

Expand Down Expand Up @@ -95,8 +94,6 @@ type MachinePoolPlatform struct {
OpenStack *openstack.MachinePool `json:"openstack,omitempty"`
// VSphere is the configuration used when installing on vSphere
VSphere *vsphere.MachinePool `json:"vsphere,omitempty"`
// Ovirt is the configuration used when installing on oVirt.
Ovirt *ovirt.MachinePool `json:"ovirt,omitempty"`
// IBMCloud is the configuration used when installing on IBM Cloud.
IBMCloud *ibmcloud.MachinePool `json:"ibmcloud,omitempty"`
// Nutanix is the configuration used when installing on Nutanix prism central.
Expand Down
4 changes: 0 additions & 4 deletions apis/hive/v1/ovirt/doc.go

This file was deleted.

61 changes: 0 additions & 61 deletions apis/hive/v1/ovirt/machinepool.go

This file was deleted.

22 changes: 0 additions & 22 deletions apis/hive/v1/ovirt/platform.go

This file was deleted.

82 changes: 0 additions & 82 deletions apis/hive/v1/ovirt/zz_generated.deepcopy.go

This file was deleted.

34 changes: 0 additions & 34 deletions apis/hive/v1/zz_generated.deepcopy.go

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

52 changes: 0 additions & 52 deletions config/crds/hive.openshift.io_clusterdeployments.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -975,58 +975,6 @@ spec:
- cloud
- credentialsSecretRef
type: object
ovirt:
description: Ovirt is the configuration used when installing on oVirt
properties:
certificatesSecretRef:
description: |-
CertificatesSecretRef refers to a secret that contains the oVirt CA certificates
necessary for communicating with oVirt.
properties:
name:
default: ""
description: |-
Name of the referent.
This field is effectively required, but due to backwards compatibility is
allowed to be empty. Instances of this type with an empty value here are
almost certainly wrong.
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
type: string
type: object
x-kubernetes-map-type: atomic
credentialsSecretRef:
description: |-
CredentialsSecretRef refers to a secret that contains the oVirt account access
credentials with fields: ovirt_url, ovirt_username, ovirt_password, ovirt_ca_bundle
properties:
name:
default: ""
description: |-
Name of the referent.
This field is effectively required, but due to backwards compatibility is
allowed to be empty. Instances of this type with an empty value here are
almost certainly wrong.
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
type: string
type: object
x-kubernetes-map-type: atomic
ovirt_cluster_id:
description: The target cluster under which all VMs will run
type: string
ovirt_network_name:
description: |-
The target network of all the network interfaces of the nodes. Omitting defaults to ovirtmgmt
network which is a default network for evert ovirt cluster.
type: string
storage_domain_id:
description: The target storage domain under which all VM disk would be created.
type: string
required:
- certificatesSecretRef
- credentialsSecretRef
- ovirt_cluster_id
- storage_domain_id
type: object
vsphere:
description: VSphere is the configuration used when installing on vSphere
properties:
Expand Down
Loading