Merge pull request #263 from stuggi/redis_optional

Make RedisServiceName optional and add listType annotations
openstack-k8s-operators · Dec 16, 2024 · 7bc56aa · 7bc56aa
2 parents 6bb92cd + 8928e66
commit 7bc56aa
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 3 deletions.
diff --git a/api/bases/designate.openstack.org_designatecentrals.yaml b/api/bases/designate.openstack.org_designatecentrals.yaml
@@ -134,6 +134,7 @@ spec:
                 items:
                   type: string
                 type: array
+                x-kubernetes-list-type: atomic
               replicas:
                 default: 1
                 description: Replicas - Designate Central Replicas

diff --git a/api/bases/designate.openstack.org_designateproducers.yaml b/api/bases/designate.openstack.org_designateproducers.yaml
@@ -133,6 +133,7 @@ spec:
                 items:
                   type: string
                 type: array
+                x-kubernetes-list-type: atomic
               replicas:
                 default: 1
                 description: Replicas - Designate Producer Replicas

diff --git a/api/bases/designate.openstack.org_designates.yaml b/api/bases/designate.openstack.org_designates.yaml
@@ -706,6 +706,7 @@ spec:
                     items:
                       type: string
                     type: array
+                    x-kubernetes-list-type: atomic
                   replicas:
                     default: 1
                     description: Replicas - Designate Central Replicas
@@ -1063,6 +1064,7 @@ spec:
                     items:
                       type: string
                     type: array
+                    x-kubernetes-list-type: atomic
                   replicas:
                     default: 1
                     description: Replicas - Designate Producer Replicas
@@ -1548,7 +1550,6 @@ spec:
             - designateProducer
             - designateWorker
             - rabbitMqClusterName
-            - redisServiceName
             - secret
             type: object
           status:

diff --git a/api/v1beta1/designate_types.go b/api/v1beta1/designate_types.go
@@ -182,7 +182,7 @@ type DesignateSpecBase struct {
 	// DesignateNetworkAttachment is a NetworkAttachment resource name for the Designate Control Network
 	DesignateNetworkAttachment string `json:"designateNetworkAttachment"`
 
-	// +kubebuilder:validation:Required
+	// +kubebuilder:validation:Optional
 	// +kubebuilder:default="designate-redis"
 	// RedisServiceName is the name of the Redis instance to be used (must be in the same namespace as designate)
 	RedisServiceName string `json:"redisServiceName"`

diff --git a/api/v1beta1/designatecentral_types.go b/api/v1beta1/designatecentral_types.go
@@ -69,6 +69,7 @@ type DesignateCentralSpecBase struct {
 	TLS tls.Ca `json:"tls,omitempty"`
 
 	// List of Redis Host IP addresses
+	// +listType:=atomic
 	RedisHostIPs []string `json:"redisHostIPs,omitempty"`
 }
 

diff --git a/api/v1beta1/designateproducer_types.go b/api/v1beta1/designateproducer_types.go
@@ -69,6 +69,7 @@ type DesignateProducerSpecBase struct {
 	TLS tls.Ca `json:"tls,omitempty"`
 
 	// List of Redis Host IP addresses
+	// +listType:=atomic
 	RedisHostIPs []string `json:"redisHostIPs,omitempty"`
 }
 

diff --git a/config/crd/bases/designate.openstack.org_designatecentrals.yaml b/config/crd/bases/designate.openstack.org_designatecentrals.yaml
@@ -134,6 +134,7 @@ spec:
                 items:
                   type: string
                 type: array
+                x-kubernetes-list-type: atomic
               replicas:
                 default: 1
                 description: Replicas - Designate Central Replicas

diff --git a/config/crd/bases/designate.openstack.org_designateproducers.yaml b/config/crd/bases/designate.openstack.org_designateproducers.yaml
@@ -133,6 +133,7 @@ spec:
                 items:
                   type: string
                 type: array
+                x-kubernetes-list-type: atomic
               replicas:
                 default: 1
                 description: Replicas - Designate Producer Replicas

diff --git a/config/crd/bases/designate.openstack.org_designates.yaml b/config/crd/bases/designate.openstack.org_designates.yaml
@@ -706,6 +706,7 @@ spec:
                     items:
                       type: string
                     type: array
+                    x-kubernetes-list-type: atomic
                   replicas:
                     default: 1
                     description: Replicas - Designate Central Replicas
@@ -1063,6 +1064,7 @@ spec:
                     items:
                       type: string
                     type: array
+                    x-kubernetes-list-type: atomic
                   replicas:
                     default: 1
                     description: Replicas - Designate Producer Replicas
@@ -1548,7 +1550,6 @@ spec:
             - designateProducer
             - designateWorker
             - rabbitMqClusterName
-            - redisServiceName
             - secret
             type: object
           status: