Merge pull request #294 from dprince/core_api

Add HorizonSpecCore struct
openstack-k8s-operators · Mar 4, 2024 · 946bc7d · 946bc7d
2 parents 8c50610 + c1363cc
commit 946bc7d
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 3 deletions.
diff --git a/api/v1beta1/horizon_types.go b/api/v1beta1/horizon_types.go
@@ -35,9 +35,15 @@ const (
 
 // HorizonSpec defines the desired state of Horizon
 type HorizonSpec struct {
+	HorizonSpecCore `json:",inline"`
+
 	// +kubebuilder:validation:Required
 	// horizon Container Image URL
 	ContainerImage string `json:"containerImage"`
+}
+
+// HorizonSpecBase -
+type HorizonSpecCore struct {
 
 	// +kubebuilder:validation:Optional
 	// +kubebuilder:default=1

diff --git a/api/v1beta1/horizon_webhook.go b/api/v1beta1/horizon_webhook.go
@@ -66,9 +66,16 @@ func (r *Horizon) Default() {
 
 // Default - set defaults for this Horizon spec
 func (spec *HorizonSpec) Default() {
+    // NOTE: only containerImage validations go here
 	if spec.ContainerImage == "" {
 		spec.ContainerImage = horizonDefaults.ContainerImageURL
 	}
+	spec.HorizonSpecCore.Default()
+}
+
+// Default - set defaults for this Horizon spec core (this one gets used by OpenstackControlPlane)
+func (spec *HorizonSpecCore) Default() {
+	// nothing here yet
 }
 
 // TODO(user): change verbs to "verbs=create;update;delete" if you want to enable deletion validation.

diff --git a/api/v1beta1/zz_generated.deepcopy.go b/api/v1beta1/zz_generated.deepcopy.go