Add *Core structs for redis,netconfig,memcached

Adds a version of the structs (called "core") is meant to
be used via the OpenStackControlplane. It is the same
as the normal Spec's for redis, netconfig, and memcached
only it is missing the containerImages.

The Default() function for webhooks has been updated accordingly.

Jira: OSPRH-4835

Author: dprince

apis/memcached/v1beta1/memcached_types.go

@@ -32,9 +32,15 @@ const (
 
 // MemcachedSpec defines the desired state of Memcached
 type MemcachedSpec struct {
+	MemcachedSpecCore `json:",inline"`
+
 	// +kubebuilder:validation:Required
 	// Name of the memcached container image to run (will be set to environmental default if empty)
 	ContainerImage string `json:"containerImage"`
+}
+
+// MemcachedSpecCore - this version is used by the OpenStackControlplane CR (no container images)
+type MemcachedSpecCore struct {
 
 	// +kubebuilder:validation:Optional
 	// +kubebuilder:default=1

apis/memcached/v1beta1/memcached_webhook.go

@@ -69,6 +69,12 @@ func (spec *MemcachedSpec) Default() {
 	if spec.ContainerImage == "" {
 		spec.ContainerImage = memcachedDefaults.ContainerImageURL
 	}
+	spec.MemcachedSpecCore.Default()
+}
+
+// Default - common validations go here (for the OpenStackControlplane which uses this one)
+func (spec *MemcachedSpecCore) Default() {
+	// nothing here
 }
 
 // TODO(user): change verbs to "verbs=create;update;delete" if you want to enable deletion validation.

apis/memcached/v1beta1/zz_generated.deepcopy.go

@@ -46,9 +46,15 @@ type DNSMasqOption struct {
 
 // DNSMasqSpec defines the desired state of DNSMasq
 type DNSMasqSpec struct {
+	DNSMasqSpecCore `json:",inline"`
+
 	// +kubebuilder:validation:Optional
 	// DNSMasq Container Image URL
 	ContainerImage string `json:"containerImage"`
+}
+
+// DNSMasqSpecCore - this version is used by the OpenStackControlplane CR (no container images)
+type DNSMasqSpecCore struct {
 
 	// +kubebuilder:validation:Optional
 	// +kubebuilder:default=1

apis/network/v1beta1/dnsmasq_types.go

@@ -63,6 +63,12 @@ func (spec *DNSMasqSpec) Default() {
 	if spec.ContainerImage == "" {
 		spec.ContainerImage = dnsMasqDefaults.ContainerImageURL
 	}
+	spec.DNSMasqSpecCore.Default()
+}
+
+// Default - common validations go here (for the OpenStackControlplane which uses this one)
+func (spec *DNSMasqSpecCore) Default() {
+	// nothing here
 }
 
 // TODO(user): change verbs to "verbs=create;update;delete" if you want to enable deletion validation.

apis/network/v1beta1/dnsmasq_webhook.go

@@ -32,9 +32,15 @@ const (
 
 // RedisSpec defines the desired state of Redis
 type RedisSpec struct {
+	RedisSpecCore `json:",inline"`
+
 	// +kubebuilder:validation:Required
 	// Name of the redis container image to run (will be set to environmental default if empty)
 	ContainerImage string `json:"containerImage"`
+}
+
+// RedisSpecCore - this version is used by the OpenStackControlplane CR (no container images)
+type RedisSpecCore struct {
 	// +kubebuilder:validation:Optional
 	// +kubebuilder:default=1
 	// Size of the redis cluster

apis/network/v1beta1/zz_generated.deepcopy.go

@@ -69,6 +69,12 @@ func (spec *RedisSpec) Default() {
 	if spec.ContainerImage == "" {
 		spec.ContainerImage = redisDefaults.ContainerImageURL
 	}
+	spec.RedisSpecCore.Default()
+}
+
+// Default - common validations go here (for the OpenStackControlplane which uses this one)
+func (spec *RedisSpecCore) Default() {
+	//nothing to validate yet
 }
 
 // TODO(user): change verbs to "verbs=create;update;delete" if you want to enable deletion validation.