Add support for memcached instance

Removing the existing memcached container will be done in a follow up commit.
cschwede · Jan 31, 2024 · b29e3c8 · b29e3c8
1 parent 678ba24
commit b29e3c8
Show file tree

Hide file tree

Showing 21 changed files with 168 additions and 16 deletions.
diff --git a/api/bases/swift.openstack.org_swiftproxies.yaml b/api/bases/swift.openstack.org_swiftproxies.yaml
@@ -54,6 +54,10 @@ spec:
               containerImageProxy:
                 description: Swift Proxy Container Image URL
                 type: string
+              memcachedServers:
+                default: ""
+                description: List of memcached servers.
+                type: string
               networkAttachments:
                 description: NetworkAttachments is a list of NetworkAttachment resource
                   names to expose the services to the given network
@@ -269,6 +273,7 @@ spec:
             required:
             - containerImageMemcached
             - containerImageProxy
+            - memcachedServers
             - replicas
             - secret
             - serviceUser

diff --git a/api/bases/swift.openstack.org_swifts.yaml b/api/bases/swift.openstack.org_swifts.yaml
@@ -48,6 +48,10 @@ spec:
           spec:
             description: SwiftSpec defines the desired state of Swift
             properties:
+              memcachedInstance:
+                default: memcached
+                description: Memcached instance name.
+                type: string
               networkAttachments:
                 description: NetworkAttachments is a list of NetworkAttachment resource
                   names to expose the services to the given network
@@ -73,6 +77,10 @@ spec:
                   containerImageProxy:
                     description: Swift Proxy Container Image URL
                     type: string
+                  memcachedServers:
+                    default: ""
+                    description: List of memcached servers.
+                    type: string
                   networkAttachments:
                     description: NetworkAttachments is a list of NetworkAttachment
                       resource names to expose the services to the given network
@@ -296,6 +304,7 @@ spec:
                 required:
                 - containerImageMemcached
                 - containerImageProxy
+                - memcachedServers
                 - replicas
                 - secret
                 - serviceUser
@@ -342,6 +351,10 @@ spec:
                   containerImageProxy:
                     description: Image URL for Swift proxy service
                     type: string
+                  memcachedServers:
+                    default: ""
+                    description: List of memcached servers.
+                    type: string
                   networkAttachments:
                     description: NetworkAttachments is a list of NetworkAttachment
                       resource names to expose the services to the given network
@@ -371,12 +384,14 @@ spec:
                 - containerImageMemcached
                 - containerImageObject
                 - containerImageProxy
+                - memcachedServers
                 - replicas
                 - storageClass
                 - storageRequest
                 - swiftConfSecret
                 type: object
             required:
+            - memcachedInstance
             - storageClass
             - swiftConfSecret
             - swiftProxy

diff --git a/api/bases/swift.openstack.org_swiftstorages.yaml b/api/bases/swift.openstack.org_swiftstorages.yaml
@@ -63,6 +63,10 @@ spec:
               containerImageProxy:
                 description: Image URL for Swift proxy service
                 type: string
+              memcachedServers:
+                default: ""
+                description: List of memcached servers.
+                type: string
               networkAttachments:
                 description: NetworkAttachments is a list of NetworkAttachment resource
                   names to expose the services to the given network
@@ -92,6 +96,7 @@ spec:
             - containerImageMemcached
             - containerImageObject
             - containerImageProxy
+            - memcachedServers
             - replicas
             - storageClass
             - storageRequest

diff --git a/api/v1beta1/swift_types.go b/api/v1beta1/swift_types.go
@@ -59,6 +59,11 @@ type SwiftSpec struct {
 	// +kubebuilder:validation:Optional
 	// NetworkAttachments is a list of NetworkAttachment resource names to expose the services to the given network
 	NetworkAttachments []string `json:"networkAttachments,omitempty"`
+
+	// +kubebuilder:validation:Required
+	// +kubebuilder:default=memcached
+	// Memcached instance name.
+	MemcachedInstance string `json:"memcachedInstance"`
 }
 
 // SwiftStatus defines the observed state of Swift

diff --git a/api/v1beta1/swiftproxy_types.go b/api/v1beta1/swiftproxy_types.go
@@ -49,7 +49,6 @@ type SwiftProxySpec struct {
 	// Image URL for Memcache servicd
 	ContainerImageMemcached string `json:"containerImageMemcached"`
 
-	// +kubebuilder:validation:Required
 	// +kubebuilder:default=swift
 	// ServiceUser - optional username used for this service to register in Swift
 	ServiceUser string `json:"serviceUser"`
@@ -76,6 +75,11 @@ type SwiftProxySpec struct {
 	// +kubebuilder:validation:Optional
 	// NetworkAttachments is a list of NetworkAttachment resource names to expose the services to the given network
 	NetworkAttachments []string `json:"networkAttachments,omitempty"`
+
+	// +kubebuilder:validation:Required
+	// +kubebuilder:default=""
+	// List of memcached servers.
+	MemcachedServers string `json:"memcachedServers"`
 }
 
 // ProxyOverrideSpec to override the generated manifest of several child resources.

diff --git a/api/v1beta1/swiftstorage_types.go b/api/v1beta1/swiftstorage_types.go
@@ -69,6 +69,11 @@ type SwiftStorageSpec struct {
 	// +kubebuilder:validation:Optional
 	// NetworkAttachments is a list of NetworkAttachment resource names to expose the services to the given network
 	NetworkAttachments []string `json:"networkAttachments,omitempty"`
+
+	// +kubebuilder:validation:Required
+	// +kubebuilder:default=""
+	// List of memcached servers.
+	MemcachedServers string `json:"memcachedServers"`
 }
 
 // SwiftStorageStatus defines the observed state of SwiftStorage

diff --git a/config/crd/bases/swift.openstack.org_swiftproxies.yaml b/config/crd/bases/swift.openstack.org_swiftproxies.yaml
@@ -54,6 +54,10 @@ spec:
               containerImageProxy:
                 description: Swift Proxy Container Image URL
                 type: string
+              memcachedServers:
+                default: ""
+                description: List of memcached servers.
+                type: string
               networkAttachments:
                 description: NetworkAttachments is a list of NetworkAttachment resource
                   names to expose the services to the given network
@@ -269,6 +273,7 @@ spec:
             required:
             - containerImageMemcached
             - containerImageProxy
+            - memcachedServers
             - replicas
             - secret
             - serviceUser

diff --git a/config/crd/bases/swift.openstack.org_swifts.yaml b/config/crd/bases/swift.openstack.org_swifts.yaml
@@ -48,6 +48,10 @@ spec:
           spec:
             description: SwiftSpec defines the desired state of Swift
             properties:
+              memcachedInstance:
+                default: memcached
+                description: Memcached instance name.
+                type: string
               networkAttachments:
                 description: NetworkAttachments is a list of NetworkAttachment resource
                   names to expose the services to the given network
@@ -73,6 +77,10 @@ spec:
                   containerImageProxy:
                     description: Swift Proxy Container Image URL
                     type: string
+                  memcachedServers:
+                    default: ""
+                    description: List of memcached servers.
+                    type: string
                   networkAttachments:
                     description: NetworkAttachments is a list of NetworkAttachment
                       resource names to expose the services to the given network
@@ -296,6 +304,7 @@ spec:
                 required:
                 - containerImageMemcached
                 - containerImageProxy
+                - memcachedServers
                 - replicas
                 - secret
                 - serviceUser
@@ -342,6 +351,10 @@ spec:
                   containerImageProxy:
                     description: Image URL for Swift proxy service
                     type: string
+                  memcachedServers:
+                    default: ""
+                    description: List of memcached servers.
+                    type: string
                   networkAttachments:
                     description: NetworkAttachments is a list of NetworkAttachment
                       resource names to expose the services to the given network
@@ -371,12 +384,14 @@ spec:
                 - containerImageMemcached
                 - containerImageObject
                 - containerImageProxy
+                - memcachedServers
                 - replicas
                 - storageClass
                 - storageRequest
                 - swiftConfSecret
                 type: object
             required:
+            - memcachedInstance
             - storageClass
             - swiftConfSecret
             - swiftProxy

diff --git a/config/crd/bases/swift.openstack.org_swiftstorages.yaml b/config/crd/bases/swift.openstack.org_swiftstorages.yaml
@@ -63,6 +63,10 @@ spec:
               containerImageProxy:
                 description: Image URL for Swift proxy service
                 type: string
+              memcachedServers:
+                default: ""
+                description: List of memcached servers.
+                type: string
               networkAttachments:
                 description: NetworkAttachments is a list of NetworkAttachment resource
                   names to expose the services to the given network
@@ -92,6 +96,7 @@ spec:
             - containerImageMemcached
             - containerImageObject
             - containerImageProxy
+            - memcachedServers
             - replicas
             - storageClass
             - storageRequest

diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -159,6 +159,14 @@ rules:
   - patch
   - update
   - watch
+- apiGroups:
+  - memcached.openstack.org
+  resources:
+  - memcacheds
+  verbs:
+  - get
+  - list
+  - watch
 - apiGroups:
   - networking.k8s.io
   resources: