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

openshift-merge-bot[bot] · web-flow · commit 038a5ec77a70 · 2024-03-04T12:39:04.000Z
Add *Core structs for redis,netconfig,memcached
diff --git a/apis/memcached/v1beta1/memcached_types.go b/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
diff --git a/apis/memcached/v1beta1/memcached_webhook.go b/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.
diff --git a/apis/memcached/v1beta1/zz_generated.deepcopy.go b/apis/memcached/v1beta1/zz_generated.deepcopy.go
diff --git a/apis/network/v1beta1/dnsmasq_types.go b/apis/network/v1beta1/dnsmasq_types.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
diff --git a/apis/network/v1beta1/dnsmasq_webhook.go b/apis/network/v1beta1/dnsmasq_webhook.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.
diff --git a/apis/network/v1beta1/zz_generated.deepcopy.go b/apis/network/v1beta1/zz_generated.deepcopy.go
diff --git a/apis/redis/v1beta1/redis_types.go b/apis/redis/v1beta1/redis_types.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
diff --git a/apis/redis/v1beta1/redis_webhook.go b/apis/redis/v1beta1/redis_webhook.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.
diff --git a/apis/redis/v1beta1/zz_generated.deepcopy.go b/apis/redis/v1beta1/zz_generated.deepcopy.go

Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,12 @@ func (spec *MemcachedSpec) Default() {`
`69`	`69`	`if spec.ContainerImage == "" {`
`70`	`70`	`spec.ContainerImage = memcachedDefaults.ContainerImageURL`
`71`	`71`	`}`
	`72`	`+ spec.MemcachedSpecCore.Default()`
	`73`	`+}`
	`74`	`+`
	`75`	`+// Default - common validations go here (for the OpenStackControlplane which uses this one)`
	`76`	`+func (spec *MemcachedSpecCore) Default() {`
	`77`	`+ // nothing here`
`72`	`78`	`}`
`73`	`79`
`74`	`80`	`// TODO(user): change verbs to "verbs=create;update;delete" if you want to enable deletion validation.`
Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,12 @@ func (spec *DNSMasqSpec) Default() {`
`63`	`63`	`if spec.ContainerImage == "" {`
`64`	`64`	`spec.ContainerImage = dnsMasqDefaults.ContainerImageURL`
`65`	`65`	`}`
	`66`	`+ spec.DNSMasqSpecCore.Default()`
	`67`	`+}`
	`68`	`+`
	`69`	`+// Default - common validations go here (for the OpenStackControlplane which uses this one)`
	`70`	`+func (spec *DNSMasqSpecCore) Default() {`
	`71`	`+ // nothing here`
`66`	`72`	`}`
`67`	`73`
`68`	`74`	`// TODO(user): change verbs to "verbs=create;update;delete" if you want to enable deletion validation.`
Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,12 @@ func (spec *RedisSpec) Default() {`
`69`	`69`	`if spec.ContainerImage == "" {`
`70`	`70`	`spec.ContainerImage = redisDefaults.ContainerImageURL`
`71`	`71`	`}`
	`72`	`+ spec.RedisSpecCore.Default()`
	`73`	`+}`
	`74`	`+`
	`75`	`+// Default - common validations go here (for the OpenStackControlplane which uses this one)`
	`76`	`+func (spec *RedisSpecCore) Default() {`
	`77`	`+ //nothing to validate yet`
`72`	`78`	`}`
`73`	`79`
`74`	`80`	`// TODO(user): change verbs to "verbs=create;update;delete" if you want to enable deletion validation.`