Merge pull request #405 from dprince/core_api

Add IronicSpecCore struct

api/v1beta1/ironic_types.go

@@ -50,15 +50,20 @@ const (
 
 // IronicSpec defines the desired state of Ironic
 type IronicSpec struct {
-	// +kubebuilder:validation:Optional
-	// +kubebuilder:default=false
-	// Whether to deploy a standalone Ironic.
-	Standalone bool `json:"standalone"`
+	IronicSpecCore `json:",inline"`
 
 	// +kubebuilder:validation:Optional
 	// +kubebuilder:default={}
 	// Images - Container images for all ironic services
 	Images IronicImages `json:"images"`
+}
+
+// IronicSpec defines the desired state of Ironic
+type IronicSpecCore struct {
+	// +kubebuilder:validation:Optional
+	// +kubebuilder:default=false
+	// Whether to deploy a standalone Ironic.
+	Standalone bool `json:"standalone"`
 
 	// +kubebuilder:validation:Optional
 	// +kubebuilder:default=ironic

api/v1beta1/ironic_webhook.go

@@ -504,6 +504,7 @@ func (r *Ironic) Default() {
 // Default - Exported function wrapping non-exported defaulter functions,
 // this function can be called externally to default an ironic spec.
 func (spec *IronicSpec) Default() {
+	// only validate default images in this function
 	if spec.Images.API == "" {
 		spec.Images.API = imageDefaults.API
 	}
@@ -522,4 +523,12 @@ func (spec *IronicSpec) Default() {
 	if spec.Images.IronicPythonAgent == "" {
 		spec.Images.IronicPythonAgent = imageDefaults.IronicPythonAgent
 	}
+	spec.IronicSpecCore.Default()
+}
+
+// Default - Exported function wrapping non-exported defaulter functions,
+// this function can be called externally to default an ironic spec.
+// NOTE: this version is called by OpenStackControlplane
+func (spec *IronicSpecCore) Default() {
+	// nothing here yet, core validations go here
 }