Merge pull request #203 from dprince/core_api

Add GaleraSpecCore struct

api/v1beta1/galera_types.go

@@ -39,6 +39,14 @@ type AdoptionRedirectSpec struct {
 
 // GaleraSpec defines the desired state of Galera
 type GaleraSpec struct {
+	GaleraSpecCore `json:",inline"`
+	// Name of the galera container image to run (will be set to environmental default if empty)
+	// +kubebuilder:validation:Required
+	ContainerImage string `json:"containerImage"`
+}
+
+// GaleraSpec defines the desired state of Galera
+type GaleraSpecCore struct {
 	// Name of the secret to look for password keys
 	// +kubebuilder:validation:Required
 	Secret string `json:"secret"`
@@ -48,9 +56,6 @@ type GaleraSpec struct {
 	// Storage size allocated for the mariadb databases
 	// +kubebuilder:validation:Required
 	StorageRequest string `json:"storageRequest"`
-	// Name of the galera container image to run (will be set to environmental default if empty)
-	// +kubebuilder:validation:Required
-	ContainerImage string `json:"containerImage"`
 	// +kubebuilder:validation:Minimum=1
 	// +kubebuilder:default=1
 	// +kubebuilder:validation:Enum=1;3

api/v1beta1/galera_webhook.go

@@ -52,11 +52,18 @@ func (r *Galera) Default() {
 	r.Spec.Default()
 }
 
-// Default - set defaults for this MariaDB spec
+// Default - set defaults for this GaleraSpec
 func (spec *GaleraSpec) Default() {
+	// only image validations go here
 	if spec.ContainerImage == "" {
 		spec.ContainerImage = galeraDefaults.ContainerImageURL
 	}
+	spec.GaleraSpecCore.Default()
+}
+
+// Default - set defaults for the GaleraSpecCore. This version is used by OpenStackControlplane
+func (spec *GaleraSpecCore) Default() {
+	// nothing here yet
 }
 
 // TODO(user): change verbs to "verbs=create;update;delete" if you want to enable deletion validation.