Merge pull request #105 from dprince/core_api

Add BarbicanSpecCore struct

api/v1beta1/barbican_types.go

@@ -40,6 +40,28 @@ const (
 
 // BarbicanSpec defines the desired state of Barbican
 type BarbicanSpec struct {
+	BarbicanSpecBase `json:",inline"`
+
+	BarbicanAPI BarbicanAPITemplate `json:"barbicanAPI"`
+
+	BarbicanWorker BarbicanWorkerTemplate `json:"barbicanWorker"`
+
+	BarbicanKeystoneListener BarbicanKeystoneListenerTemplate `json:"barbicanKeystoneListener"`
+}
+
+// BarbicanSpecCore defines the desired state of Barbican, for use with the OpenStackControlplane CR (no containerImages)
+type BarbicanSpecCore struct {
+	BarbicanSpecBase `json:",inline"`
+
+	BarbicanAPI BarbicanAPITemplateCore `json:"barbicanAPI"`
+
+	BarbicanWorker BarbicanWorkerTemplateCore `json:"barbicanWorker"`
+
+	BarbicanKeystoneListener BarbicanKeystoneListenerTemplateCore `json:"barbicanKeystoneListener"`
+}
+
+// BarbicanSpecBase -
+type BarbicanSpecBase struct {
 	BarbicanTemplate `json:",inline"`
 
 	// +kubebuilder:validation:Optional
@@ -66,12 +88,6 @@ type BarbicanSpec struct {
 
 	// +kubebuilder:validation:Required
 	// BarbicanAPIInternal - Spec definition for the internal and admin API service of this Barbican deployment
-
-	BarbicanAPI BarbicanAPITemplate `json:"barbicanAPI"`
-
-	BarbicanWorker BarbicanWorkerTemplate `json:"barbicanWorker"`
-
-	BarbicanKeystoneListener BarbicanKeystoneListenerTemplate `json:"barbicanKeystoneListener"`
 }
 
 // BarbicanStatus defines the observed state of Barbican

api/v1beta1/barbican_webhook.go

@@ -79,6 +79,18 @@ func (spec *BarbicanSpec) Default() {
 	if spec.BarbicanKeystoneListener.ContainerImage == "" {
 		spec.BarbicanKeystoneListener.ContainerImage = barbicanDefaults.KeystoneListenerContainerImageURL
 	}
+	spec.BarbicanSpecBase.Default()
+}
+
+// Default - for shared base validations
+func (spec *BarbicanSpecBase) Default() {
+	// no validations
+}
+
+// Default - set defaults for this BarbicanSpecBase. NOTE: this version is used by the OpenStackControlplane webhook
+func (spec *BarbicanSpecCore) Default() {
+	// no validations
+	spec.BarbicanSpecBase.Default()
 }
 
 // TODO(user): change verbs to "verbs=create;update;delete" if you want to enable deletion validation.

api/v1beta1/barbicanapi_types.go

@@ -25,6 +25,15 @@ import (
 
 // BarbicanAPITemplate defines the input parameters for the Barbican API service
 type BarbicanAPITemplate struct {
+	BarbicanAPITemplateCore `json:",inline"`
+
+	// +kubebuilder:validation:Required
+	// ContainerImage - Barbican Container Image URL (will be set to environmental default if empty)
+	ContainerImage string `json:"containerImage"`
+}
+
+// BarbicanAPITemplateCore -
+type BarbicanAPITemplateCore struct {
 	// Common input parameters for the Barbican API service
 	BarbicanComponentTemplate `json:",inline"`
 

api/v1beta1/barbicankeystonelistener_types.go

@@ -24,6 +24,15 @@ import (
 
 // BarbicanKeystoneListenerTemplate defines common Spec elements for the KeystoneListener process
 type BarbicanKeystoneListenerTemplate struct {
+	BarbicanKeystoneListenerTemplateCore `json:",inline"`
+
+	// +kubebuilder:validation:Required
+	// ContainerImage - Barbican Container Image URL (will be set to environmental default if empty)
+	ContainerImage string `json:"containerImage"`
+}
+
+// BarbicanKeystoneListenerTemplate defines common Spec elements for the KeystoneListener process
+type BarbicanKeystoneListenerTemplateCore struct {
 	BarbicanComponentTemplate `json:",inline"`
 
 	// TODO(dmendiza): Do we need a setting for number of keystone listener processes

api/v1beta1/barbicanworker_types.go

@@ -24,6 +24,15 @@ import (
 
 // BarbicanWorkerTemplate defines common Spec elements for the Worker process
 type BarbicanWorkerTemplate struct {
+	BarbicanWorkerTemplateCore `json:",inline"`
+
+	// +kubebuilder:validation:Required
+	// ContainerImage - Barbican Container Image URL (will be set to environmental default if empty)
+	ContainerImage string `json:"containerImage"`
+}
+
+// BarbicanWorkerTemplateCore -
+type BarbicanWorkerTemplateCore struct {
 	BarbicanComponentTemplate `json:",inline"`
 
 	// TODO(dmendiza): Do we need a setting for number of worker processes

api/v1beta1/common_types.go

@@ -61,10 +61,6 @@ type BarbicanTemplate struct {
 // (e.g. API, Worker, Listener)
 type BarbicanComponentTemplate struct {
 
-	// +kubebuilder:validation:Required
-	// ContainerImage - Barbican Container Image URL (will be set to environmental default if empty)
-	ContainerImage string `json:"containerImage"`
-
 	// +kubebuilder:validation:Optional
 	// NodeSelector to target subset of worker nodes running this component. Setting here overrides
 	// any global NodeSelector settings within the Barbican CR.