Skip to content

Commit e53cc6f

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #245 from beagles/redis
Re-introduce redis
2 parents c06a12f + c373c65 commit e53cc6f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+747
-426
lines changed

‎api/bases/designate.openstack.org_designatecentrals.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,11 @@ spec:
126126
from the Secret
127127
type: string
128128
type: object
129+
redisHostIPs:
130+
description: List of Redis Host IP addresses
131+
items:
132+
type: string
133+
type: array
129134
replicas:
130135
default: 1
131136
description: Replicas - Designate Central Replicas

‎api/bases/designate.openstack.org_designateproducers.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,11 @@ spec:
125125
from the Secret
126126
type: string
127127
type: object
128+
redisHostIPs:
129+
description: List of Redis Host IP addresses
130+
items:
131+
type: string
132+
type: array
128133
replicas:
129134
default: 1
130135
description: Replicas - Designate Producer Replicas

‎api/bases/designate.openstack.org_designates.yaml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -713,6 +713,11 @@ spec:
713713
password from the Secret
714714
type: string
715715
type: object
716+
redisHostIPs:
717+
description: List of Redis Host IP addresses
718+
items:
719+
type: string
720+
type: array
716721
replicas:
717722
default: 1
718723
description: Replicas - Designate Central Replicas
@@ -1043,6 +1048,11 @@ spec:
10431048
password from the Secret
10441049
type: string
10451050
type: object
1051+
redisHostIPs:
1052+
description: List of Redis Host IP addresses
1053+
items:
1054+
type: string
1055+
type: array
10461056
replicas:
10471057
default: 1
10481058
description: Replicas - Designate Producer Replicas
@@ -1430,6 +1440,11 @@ spec:
14301440
description: RabbitMQ instance name Needed to request a transportURL
14311441
that is created and used in Designate
14321442
type: string
1443+
redisServiceName:
1444+
default: designate-redis
1445+
description: RedisServiceName is the name of the Redis instance to
1446+
be used (must be in the same namespace as designate)
1447+
type: string
14331448
resources:
14341449
description: Resources - Compute Resources required by this service
14351450
(Limits/Requests). https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
@@ -1497,6 +1512,7 @@ spec:
14971512
- designateProducer
14981513
- designateWorker
14991514
- rabbitMqClusterName
1515+
- redisServiceName
15001516
- secret
15011517
type: object
15021518
status:
@@ -1594,6 +1610,11 @@ spec:
15941610
ContainerImage)
15951611
format: int64
15961612
type: integer
1613+
redisHostIPs:
1614+
description: List of Redis Host IP addresses
1615+
items:
1616+
type: string
1617+
type: array
15971618
transportURLSecret:
15981619
description: TransportURLSecret - Secret containing RabbitMQ transportURL
15991620
type: string

‎api/v1beta1/designate_types.go‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,11 @@ type DesignateSpecBase struct {
181181
// +kubebuilder:default=designate
182182
// DesignateNetworkAttachment is a NetworkAttachment resource name for the Designate Control Network
183183
DesignateNetworkAttachment string `json:"designateNetworkAttachment"`
184+
185+
// +kubebuilder:validation:Required
186+
// +kubebuilder:default="designate-redis"
187+
// RedisServiceName is the name of the Redis instance to be used (must be in the same namespace as designate)
188+
RedisServiceName string `json:"redisServiceName"`
184189
}
185190

186191
// DesignateStatus defines the observed state of Designate
@@ -227,6 +232,9 @@ type DesignateStatus struct {
227232
// then the controller has not processed the latest changes injected by
228233
// the opentack-operator in the top-level CR (e.g. the ContainerImage)
229234
ObservedGeneration int64 `json:"observedGeneration,omitempty"`
235+
236+
// List of Redis Host IP addresses
237+
RedisHostIPs []string `json:"redisHostIPs,omitempty"`
230238
}
231239

232240
// +kubebuilder:object:root=true

‎api/v1beta1/designatecentral_types.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,9 @@ type DesignateCentralSpecBase struct {
6767
// +operator-sdk:csv:customresourcedefinitions:type=spec
6868
// TLS - Parameters related to the TLS
6969
TLS tls.Ca `json:"tls,omitempty"`
70+
71+
// List of Redis Host IP addresses
72+
RedisHostIPs []string `json:"redisHostIPs,omitempty"`
7073
}
7174

7275
// DesignateCentralStatus defines the observed state of DesignateCentral

‎api/v1beta1/designateproducer_types.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,9 @@ type DesignateProducerSpecBase struct {
6767
// +operator-sdk:csv:customresourcedefinitions:type=spec
6868
// TLS - Parameters related to the TLS
6969
TLS tls.Ca `json:"tls,omitempty"`
70+
71+
// List of Redis Host IP addresses
72+
RedisHostIPs []string `json:"redisHostIPs,omitempty"`
7073
}
7174

7275
// DesignateProducerStatus defines the observed state of DesignateProducer

‎api/v1beta1/zz_generated.deepcopy.go‎

Lines changed: 15 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎config/crd/bases/designate.openstack.org_designatecentrals.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,11 @@ spec:
126126
from the Secret
127127
type: string
128128
type: object
129+
redisHostIPs:
130+
description: List of Redis Host IP addresses
131+
items:
132+
type: string
133+
type: array
129134
replicas:
130135
default: 1
131136
description: Replicas - Designate Central Replicas

‎config/crd/bases/designate.openstack.org_designateproducers.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,11 @@ spec:
125125
from the Secret
126126
type: string
127127
type: object
128+
redisHostIPs:
129+
description: List of Redis Host IP addresses
130+
items:
131+
type: string
132+
type: array
128133
replicas:
129134
default: 1
130135
description: Replicas - Designate Producer Replicas

‎config/crd/bases/designate.openstack.org_designates.yaml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -713,6 +713,11 @@ spec:
713713
password from the Secret
714714
type: string
715715
type: object
716+
redisHostIPs:
717+
description: List of Redis Host IP addresses
718+
items:
719+
type: string
720+
type: array
716721
replicas:
717722
default: 1
718723
description: Replicas - Designate Central Replicas
@@ -1043,6 +1048,11 @@ spec:
10431048
password from the Secret
10441049
type: string
10451050
type: object
1051+
redisHostIPs:
1052+
description: List of Redis Host IP addresses
1053+
items:
1054+
type: string
1055+
type: array
10461056
replicas:
10471057
default: 1
10481058
description: Replicas - Designate Producer Replicas
@@ -1430,6 +1440,11 @@ spec:
14301440
description: RabbitMQ instance name Needed to request a transportURL
14311441
that is created and used in Designate
14321442
type: string
1443+
redisServiceName:
1444+
default: designate-redis
1445+
description: RedisServiceName is the name of the Redis instance to
1446+
be used (must be in the same namespace as designate)
1447+
type: string
14331448
resources:
14341449
description: Resources - Compute Resources required by this service
14351450
(Limits/Requests). https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
@@ -1497,6 +1512,7 @@ spec:
14971512
- designateProducer
14981513
- designateWorker
14991514
- rabbitMqClusterName
1515+
- redisServiceName
15001516
- secret
15011517
type: object
15021518
status:
@@ -1594,6 +1610,11 @@ spec:
15941610
ContainerImage)
15951611
format: int64
15961612
type: integer
1613+
redisHostIPs:
1614+
description: List of Redis Host IP addresses
1615+
items:
1616+
type: string
1617+
type: array
15971618
transportURLSecret:
15981619
description: TransportURLSecret - Secret containing RabbitMQ transportURL
15991620
type: string

0 commit comments

Comments
 (0)