Skip to content

Add Metal3 specific config items to BareMetalPlatformStatus #480

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

Closed
sadasu wants to merge 1 commit into from
Closed

Add Metal3 specific config items to BareMetalPlatformStatus #480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 29 additions & 0 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 @@ -123,6 +123,15 @@ spec:
points to. It is the IP for a self-hosted load balancer in
front of the API servers.
type: string
cacheURL:
description: cacheURL is the location where images have been
previously downloaded and available for faster image downloads
within the cluster.
type: string
dhcpRange:
description: dhcpRange is the IP address range on the provisioning
subnet from which baremetal hosts can be assigned an IP address.
type: string
ingressIP:
description: ingressIP is an external IP which routes to the
default ingress controller. The IP is a suitable target of
Expand All @@ -137,6 +146,26 @@ spec:
a DNS service is hosted as a static pod to serve those hostnames
to the nodes in the cluster.
type: string
provisioningIP:
description: provisioningIP is the IP address assigned to the
provisioningInterface for provisioning the baremetal node.
This IP address should be within the provisioning subnet,
and outside of the DHCP range.
type: string
provisioningInterface:
description: provisioningInterface is the name of the network
interface on a Baremetal server connected to the provisioning
network.
type: string
provisioningNetworkCIDR:
description: provisioningNetworkCIDR is the network on which
the baremetal nodes are provisioned. The provisioningIP and
the IPs in the dhcpRange all come from within this network.
type: string
rhcosImageURL:
description: rhcosImageURL is the URL for RHCOS Image for deploying
new nodes in the cluster.
type: string
gcp:
description: GCP contains settings specific to the Google Cloud
Platform infrastructure provider.
Expand Down
24 changes: 24 additions & 0 deletions config/v1/types_infrastructure.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,30 @@ type BareMetalPlatformStatus struct {
// datacenter DNS, a DNS service is hosted as a static pod to serve those hostnames
// to the nodes in the cluster.
NodeDNSIP string `json:"nodeDNSIP,omitempty"`

// provisioningInterface is the name of the network interface on a Baremetal server connected
// to the provisioning network.
ProvisioningInterface string `json:"provisioningInterface"`

// provisioningIP is the IP address assigned to the provisioningInterface for provisioning
// the baremetal node. This IP address should be within the provisioning subnet, and
// outside of the DHCP range.
ProvisioningIP string `json:"provisioningIP"`

// provisioningNetworkCIDR is the network on which the baremetal nodes are provisioned.
// The provisioningIP and the IPs in the dhcpRange all come from within this network.
ProvisioningNetworkCIDR string `json:"provisioningNetworkCIDR"`

// dhcpRange is the IP address range on the provisioning subnet from which baremetal hosts
// can be assigned an IP address.
DHCPRange string `json:"dhcpRange"`
Copy link

@hardys hardys Oct 28, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To make it clear what this is for should we call this ProvisioningDHCPRange?

Also I think a previous reviewer asked for clarification on the format here - currently we expect a comma-separated list of two IPs, so we should mention that in the comment.

Alternatively we could instead have two parameters (ProvisioningDHCPStart and ProvisioningDHCPEnd), or a CIDR to express the range, I don't really have a strong opinion on which although it would be nice to decide soon so we can align the related installer PR with the same interface.


// cacheURL is the location where images have been previously downloaded and available
// for faster image downloads within the cluster.
CacheURL string `json:"cacheURL,omitempty"`

// rhcosImageURL is the URL for RHCOS Image for deploying new nodes in the cluster.
RHCOSImageURL string `json:"rhcosImageURL"`
}

// OpenStackPlatformStatus holds the current status of the OpenStack infrastructure provider.
Expand Down
14 changes: 10 additions & 4 deletions 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.