Merge pull request openstack-k8s-operators#314 from dprince/core_api

Add NeutronAPISpecCore struct

Author: openshift-merge-bot[bot]

api/v1beta1/neutronapi_types.go

@@ -42,6 +42,14 @@ const (
 
 // NeutronAPISpec defines the desired state of NeutronAPI
 type NeutronAPISpec struct {
+	NeutronAPISpecCore `json:",inline"`
+	// +kubebuilder:validation:Required
+	// NeutronAPI Container Image URL (will be set to environmental default if empty)
+	ContainerImage string `json:"containerImage"`
+}
+
+// NeutronAPISpecCore -
+type NeutronAPISpecCore struct {
 	// +kubebuilder:validation:Optional
 	// +kubebuilder:default=neutron
 	// ServiceUser - optional username used for this service to register in neutron
@@ -70,10 +78,6 @@ type NeutronAPISpec struct {
 	// Memcached instance name.
 	MemcachedInstance string `json:"memcachedInstance"`
 
-	// +kubebuilder:validation:Required
-	// NeutronAPI Container Image URL (will be set to environmental default if empty)
-	ContainerImage string `json:"containerImage"`
-
 	// +kubebuilder:validation:Optional
 	// +kubebuilder:default=1
 	// +kubebuilder:validation:Maximum=32

api/v1beta1/neutronapi_webhook.go

@@ -66,9 +66,16 @@ func (r *NeutronAPI) Default() {
 
 // Default - set defaults for this NeutronAPI spec
 func (spec *NeutronAPISpec) Default() {
+	// only container image validations go here
 	if spec.ContainerImage == "" {
 		spec.ContainerImage = neutronAPIDefaults.ContainerImageURL
 	}
+	spec.NeutronAPISpecCore.Default()
+}
+
+// Default - set defaults for this NeutronAPI spec core. This version gets used by OpenStackControlplane
+func (spec *NeutronAPISpecCore) Default() {
+	// nothing here yet
 }
 
 // TODO(user): change verbs to "verbs=create;update;delete" if you want to enable deletion validation.