Merge pull request openstack-k8s-operators#231 from dciabrin/memcached

Support for Memcached in the control plane

apis/bases/core.openstack.org_openstackcontrolplanes.yaml

@@ -22268,6 +22268,32 @@ spec:
                       databases
                     type: object
                 type: object
+              memcached:
+                description: Memcached - Parameters related to the Memcached service
+                properties:
+                  enabled:
+                    default: false
+                    description: Enabled - Whether Memcached services should be deployed
+                      and managed
+                    type: boolean
+                  templates:
+                    additionalProperties:
+                      description: MemcachedSpec defines the desired state of Memcached
+                      properties:
+                        containerImage:
+                          default: quay.io/tripleozedcentos9/openstack-memcached:current-tripleo
+                          description: Name of the memcached container image to run
+                          type: string
+                        replicas:
+                          default: 1
+                          description: Size of the memcached cluster
+                          format: int32
+                          type: integer
+                      type: object
+                    description: Templates - Overrides to use when creating the Memcached
+                      databases
+                    type: object
+                type: object
               neutron:
                 description: Neutron - Overrides to use when creating the Neutron
                   Service

apis/core/v1beta1/conditions.go

@@ -27,6 +27,9 @@ const (
 	// OpenStackControlPlaneMariaDBReadyCondition Status=True condition which indicates if MariaDB is configured and operational
 	OpenStackControlPlaneMariaDBReadyCondition condition.Type = "OpenStackControlPlaneMariaDBReady"
 
+	// OpenStackControlPlaneMemcachedReadyCondition Status=True condition which indicates if Memcached is configured and operational
+	OpenStackControlPlaneMemcachedReadyCondition condition.Type = "OpenStackControlPlaneMemcachedReady"
+
 	// OpenStackControlPlaneKeystoneAPIReadyCondition Status=True condition which indicates if KeystoneAPI is configured and operational
 	OpenStackControlPlaneKeystoneAPIReadyCondition condition.Type = "OpenStackControlPlaneKeystoneAPIReady"
 
@@ -97,6 +100,18 @@ const (
 	// OpenStackControlPlaneMariaDBReadyErrorMessage
 	OpenStackControlPlaneMariaDBReadyErrorMessage = "OpenStackControlPlane MariaDB error occured %s"
 
+	// OpenStackControlPlaneMemcachedReadyInitMessage
+	OpenStackControlPlaneMemcachedReadyInitMessage = "OpenStackControlPlane Memcached not started"
+
+	// OpenStackControlPlaneMemcachedReadyMessage
+	OpenStackControlPlaneMemcachedReadyMessage = "OpenStackControlPlane Memcached completed"
+
+	// OpenStackControlPlaneMemcachedReadyRunningMessage
+	OpenStackControlPlaneMemcachedReadyRunningMessage = "OpenStackControlPlane Memcached in progress"
+
+	// OpenStackControlPlaneMemcachedReadyErrorMessage
+	OpenStackControlPlaneMemcachedReadyErrorMessage = "OpenStackControlPlane Memcached error occured %s"
+
 	// OpenStackControlPlaneKeystoneAPIReadyInitMessage
 	OpenStackControlPlaneKeystoneAPIReadyInitMessage = "OpenStackControlPlane KeystoneAPI not started"
 

apis/core/v1beta1/openstackcontrolplane_types.go

@@ -21,6 +21,7 @@ import (
 
 	cinderv1 "github.com/openstack-k8s-operators/cinder-operator/api/v1beta1"
 	glancev1 "github.com/openstack-k8s-operators/glance-operator/api/v1beta1"
+	memcachedv1 "github.com/openstack-k8s-operators/infra-operator/apis/memcached/v1beta1"
 	ironicv1 "github.com/openstack-k8s-operators/ironic-operator/api/v1beta1"
 	keystonev1 "github.com/openstack-k8s-operators/keystone-operator/api/v1beta1"
 	condition "github.com/openstack-k8s-operators/lib-common/modules/common/condition"
@@ -88,6 +89,10 @@ type OpenStackControlPlaneSpec struct {
 	// Rabbitmq - Parameters related to the Rabbitmq service
 	Rabbitmq RabbitmqSection `json:"rabbitmq,omitempty"`
 
+	// +kubebuilder:validation:Optional
+	// Memcached - Parameters related to the Memcached service
+	Memcached MemcachedSection `json:"memcached,omitempty"`
+
 	//+operator-sdk:csv:customresourcedefinitions:type=spec
 	// Ovn - Overrides to use when creating the OVN Services
 	Ovn OvnSection `json:"ovn,omitempty"`
@@ -220,6 +225,18 @@ type RabbitmqSection struct {
 	Templates map[string]RabbitmqTemplate `json:"templates"`
 }
 
+// MemcachedSection defines the desired state of Memcached services
+type MemcachedSection struct {
+	// +kubebuilder:validation:Optional
+	// +kubebuilder:default=false
+	// Enabled - Whether Memcached services should be deployed and managed
+	Enabled bool `json:"enabled"`
+
+	// +kubebuilder:validation:Optional
+	// Templates - Overrides to use when creating the Memcached databases
+	Templates map[string]memcachedv1.MemcachedSpec `json:"templates,omitempty"`
+}
+
 // RabbitmqTemplate definition
 type RabbitmqTemplate struct {
 	// +kubebuilder:validation:Required
@@ -418,6 +435,7 @@ func (instance OpenStackControlPlane) InitConditions() {
 		condition.UnknownCondition(OpenStackControlPlaneOVSReadyCondition, condition.InitReason, OpenStackControlPlaneOVSReadyInitMessage),
 		condition.UnknownCondition(OpenStackControlPlaneNeutronReadyCondition, condition.InitReason, OpenStackControlPlaneNeutronReadyInitMessage),
 		condition.UnknownCondition(OpenStackControlPlaneMariaDBReadyCondition, condition.InitReason, OpenStackControlPlaneMariaDBReadyInitMessage),
+		condition.UnknownCondition(OpenStackControlPlaneMemcachedReadyCondition, condition.InitReason, OpenStackControlPlaneMemcachedReadyInitMessage),
 		condition.UnknownCondition(OpenStackControlPlaneKeystoneAPIReadyCondition, condition.InitReason, OpenStackControlPlaneKeystoneAPIReadyInitMessage),
 		condition.UnknownCondition(OpenStackControlPlanePlacementAPIReadyCondition, condition.InitReason, OpenStackControlPlanePlacementAPIReadyInitMessage),
 		condition.UnknownCondition(OpenStackControlPlaneGlanceReadyCondition, condition.InitReason, OpenStackControlPlaneGlanceReadyInitMessage),

apis/go.mod

@@ -5,6 +5,7 @@ go 1.19
 require (
 	github.com/openstack-k8s-operators/cinder-operator/api v0.0.0-20230315143457-cf28b9aa5fd3
 	github.com/openstack-k8s-operators/glance-operator/api v0.0.0-20230315114127-b6fe60836981
+	github.com/openstack-k8s-operators/infra-operator/apis v0.0.0-20230313171323-3a588eef4569
 	github.com/openstack-k8s-operators/ironic-operator/api v0.0.0-20230314203009-07dc0313f02a
 	github.com/openstack-k8s-operators/keystone-operator/api v0.0.0-20230316144108-f5073e746f5b
 	github.com/openstack-k8s-operators/lib-common/modules/common v0.0.0-20230316162802-ec9e5af1b048

apis/go.sum

@@ -227,6 +227,8 @@ github.com/openstack-k8s-operators/cinder-operator/api v0.0.0-20230315143457-cf2
 github.com/openstack-k8s-operators/cinder-operator/api v0.0.0-20230315143457-cf28b9aa5fd3/go.mod h1:auuZ2u46FUzMsA5odCDsKCDVtuJ7Tz8xWkyX5Qt7UxQ=
 github.com/openstack-k8s-operators/glance-operator/api v0.0.0-20230315114127-b6fe60836981 h1:AJEgrusK1lOCLLboQ693Y90sYQ+ZLqDdqjo9C0hCELA=
 github.com/openstack-k8s-operators/glance-operator/api v0.0.0-20230315114127-b6fe60836981/go.mod h1:Nb9Zb6XqbLc6Jc8hidXsk/tKh20r9ZJko51g2jVTPhs=
+github.com/openstack-k8s-operators/infra-operator/apis v0.0.0-20230313171323-3a588eef4569 h1:KTFb/Chud/N97NZh7kKjYu33EYr94fi43WUze+/AAcM=
+github.com/openstack-k8s-operators/infra-operator/apis v0.0.0-20230313171323-3a588eef4569/go.mod h1:5kG0Ct412tO3fNkZ5b3/BwwSsV7LkSNfOB/apUlbMJI=
 github.com/openstack-k8s-operators/ironic-operator/api v0.0.0-20230314203009-07dc0313f02a h1:P2koKsWnk+GdFzGni+RPRPdoal/j7mIEJu1kkYG73uE=
 github.com/openstack-k8s-operators/ironic-operator/api v0.0.0-20230314203009-07dc0313f02a/go.mod h1:XZmZtknXPtHUZamlrGjk/pOYv3yvfdZiOkY7sgxI3KM=
 github.com/openstack-k8s-operators/keystone-operator/api v0.0.0-20230316144108-f5073e746f5b h1:HGE4a+40fDTMkBHUne2AtFUNIEYFdgKUdBGbAo4H5kM=

config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml

@@ -22268,6 +22268,32 @@ spec:
                       databases
                     type: object
                 type: object
+              memcached:
+                description: Memcached - Parameters related to the Memcached service
+                properties:
+                  enabled:
+                    default: false
+                    description: Enabled - Whether Memcached services should be deployed
+                      and managed
+                    type: boolean
+                  templates:
+                    additionalProperties:
+                      description: MemcachedSpec defines the desired state of Memcached
+                      properties:
+                        containerImage:
+                          default: quay.io/tripleozedcentos9/openstack-memcached:current-tripleo
+                          description: Name of the memcached container image to run
+                          type: string
+                        replicas:
+                          default: 1
+                          description: Size of the memcached cluster
+                          format: int32
+                          type: integer
+                      type: object
+                    description: Templates - Overrides to use when creating the Memcached
+                      databases
+                    type: object
+                type: object
               neutron:
                 description: Neutron - Overrides to use when creating the Neutron
                   Service

config/rbac/role.yaml

@@ -115,6 +115,18 @@ rules:
   - patch
   - update
   - watch
+- apiGroups:
+  - memcached.openstack.org
+  resources:
+  - memcacheds
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
 - apiGroups:
   - neutron.openstack.org
   resources:

config/samples/core_v1beta1_openstackcontrolplane.yaml

@@ -37,6 +37,12 @@ spec:
         #    memory: 1Gi
       rabbitmq-cell1:
         replicas: 1
+  memcached:
+    enabled: true
+    templates:
+      memcached:
+        containerImage: quay.io/tripleozedcentos9/openstack-memcached:current-tripleo
+        replicas: 1
   placement:
     template:
       databaseInstance: openstack

config/samples/core_v1beta1_openstackcontrolplane_collapsed_cell.yaml

@@ -25,6 +25,12 @@ spec:
         #  limits:
         #    cpu: 800m
         #    memory: 1Gi
+  memcached:
+    enabled: true
+    templates:
+      memcached:
+        containerImage: quay.io/tripleozedcentos9/openstack-memcached:current-tripleo
+        replicas: 1
   placement:
     template:
       databaseInstance: openstack

config/samples/core_v1beta1_openstackcontrolplane_galera.yaml

@@ -38,6 +38,12 @@ spec:
         #    memory: 1Gi
       rabbitmq-cell1:
         replicas: 1
+  memcached:
+    enabled: true
+    templates:
+      memcached:
+        containerImage: quay.io/tripleozedcentos9/openstack-memcached:current-tripleo
+        replicas: 1
   placement:
     template:
       databaseInstance: openstack

config/samples/core_v1beta1_openstackcontrolplane_network_isolation.yaml

@@ -60,6 +60,12 @@ spec:
       openstack:
         containerImage: quay.io/tripleozedcentos9/openstack-mariadb:current-tripleo
         storageRequest: 500M
+  memcached:
+    enabled: true
+    templates:
+      memcached:
+        containerImage: quay.io/tripleozedcentos9/openstack-memcached:current-tripleo
+        replicas: 1
   neutron:
     template:
       databaseInstance: openstack

config/samples/core_v1beta1_openstackcontrolplane_separate_cell_db.yaml

@@ -31,6 +31,12 @@ spec:
         #    memory: 1Gi
       rabbitmq-cell1:
         replicas: 1
+  memcached:
+    enabled: true
+    templates:
+      memcached:
+        containerImage: quay.io/tripleozedcentos9/openstack-memcached:current-tripleo
+        replicas: 1
   placement:
     template:
       databaseInstance: openstack

controllers/core/openstackcontrolplane_controller.go

@@ -23,6 +23,7 @@ import (
 	cinderv1 "github.com/openstack-k8s-operators/cinder-operator/api/v1beta1"
 	glancev1 "github.com/openstack-k8s-operators/glance-operator/api/v1beta1"
 	clientv1beta1 "github.com/openstack-k8s-operators/infra-operator/apis/client/v1beta1"
+	memcachedv1 "github.com/openstack-k8s-operators/infra-operator/apis/memcached/v1beta1"
 	ironicv1 "github.com/openstack-k8s-operators/ironic-operator/api/v1beta1"
 	keystonev1 "github.com/openstack-k8s-operators/keystone-operator/api/v1beta1"
 	condition "github.com/openstack-k8s-operators/lib-common/modules/common/condition"
@@ -68,6 +69,7 @@ type OpenStackControlPlaneReconciler struct {
 //+kubebuilder:rbac:groups=nova.openstack.org,resources=nova,verbs=get;list;watch;create;update;patch;delete
 //+kubebuilder:rbac:groups=mariadb.openstack.org,resources=mariadbs,verbs=get;list;watch;create;update;patch;delete
 //+kubebuilder:rbac:groups=mariadb.openstack.org,resources=galeras,verbs=get;list;watch;create;update;patch;delete
+//+kubebuilder:rbac:groups=memcached.openstack.org,resources=memcacheds,verbs=get;list;watch;create;update;patch;delete
 //+kubebuilder:rbac:groups=neutron.openstack.org,resources=neutronapis,verbs=get;list;watch;create;update;patch;delete
 //+kubebuilder:rbac:groups=ovn.openstack.org,resources=ovndbclusters,verbs=get;list;watch;create;update;patch;delete
 //+kubebuilder:rbac:groups=ovn.openstack.org,resources=ovnnorthds,verbs=get;list;watch;create;update;patch;delete
@@ -159,6 +161,13 @@ func (r *OpenStackControlPlaneReconciler) reconcileNormal(ctx context.Context, i
 		return ctrlResult, nil
 	}
 
+	ctrlResult, err = openstack.ReconcileMemcacheds(ctx, instance, helper)
+	if err != nil {
+		return ctrl.Result{}, err
+	} else if (ctrlResult != ctrl.Result{}) {
+		return ctrlResult, nil
+	}
+
 	ctrlResult, err = openstack.ReconcileKeystoneAPI(ctx, instance, helper)
 	if err != nil {
 		return ctrl.Result{}, err
@@ -238,6 +247,7 @@ func (r *OpenStackControlPlaneReconciler) SetupWithManager(mgr ctrl.Manager) err
 		For(&corev1beta1.OpenStackControlPlane{}).
 		Owns(&mariadbv1.MariaDB{}).
 		Owns(&mariadbv1.Galera{}).
+		Owns(&memcachedv1.Memcached{}).
 		Owns(&keystonev1.KeystoneAPI{}).
 		Owns(&placementv1.PlacementAPI{}).
 		Owns(&glancev1.Glance{}).

main.go

@@ -31,6 +31,7 @@ import (
 	dataplanev1beta1 "github.com/openstack-k8s-operators/dataplane-operator/api/v1beta1"
 	glancev1 "github.com/openstack-k8s-operators/glance-operator/api/v1beta1"
 	clientv1 "github.com/openstack-k8s-operators/infra-operator/apis/client/v1beta1"
+	memcachedv1 "github.com/openstack-k8s-operators/infra-operator/apis/memcached/v1beta1"
 	rabbitmqv1 "github.com/openstack-k8s-operators/infra-operator/apis/rabbitmq/v1beta1"
 	ironicv1 "github.com/openstack-k8s-operators/ironic-operator/api/v1beta1"
 	keystonev1 "github.com/openstack-k8s-operators/keystone-operator/api/v1beta1"
@@ -67,6 +68,7 @@ func init() {
 	utilruntime.Must(corev1beta1.AddToScheme(scheme))
 	utilruntime.Must(keystonev1.AddToScheme(scheme))
 	utilruntime.Must(mariadbv1.AddToScheme(scheme))
+	utilruntime.Must(memcachedv1.AddToScheme(scheme))
 	utilruntime.Must(rabbitmqclusterv1.AddToScheme(scheme))
 	utilruntime.Must(placementv1.AddToScheme(scheme))
 	utilruntime.Must(glancev1.AddToScheme(scheme))