Add support for memcached instance

Removing the existing memcached container will
be done in a follow up commit.

api/bases/swift.openstack.org_swiftproxies.yaml

@@ -54,6 +54,10 @@ spec:
               containerImageProxy:
                 description: Swift Proxy Container Image URL
                 type: string
+              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
@@ -269,6 +273,7 @@ spec:
             required:
             - containerImageMemcached
             - containerImageProxy
+            - memcachedInstance
             - replicas
             - secret
             - serviceUser

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
+                  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
@@ -296,6 +304,7 @@ spec:
                 required:
                 - containerImageMemcached
                 - containerImageProxy
+                - memcachedInstance
                 - replicas
                 - secret
                 - serviceUser
@@ -342,6 +351,10 @@ spec:
                   containerImageProxy:
                     description: Image URL for Swift proxy service
                     type: string
+                  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
@@ -371,12 +384,14 @@ spec:
                 - containerImageMemcached
                 - containerImageObject
                 - containerImageProxy
+                - memcachedInstance
                 - replicas
                 - storageClass
                 - storageRequest
                 - swiftConfSecret
                 type: object
             required:
+            - memcachedInstance
             - storageClass
             - swiftConfSecret
             - swiftProxy

api/bases/swift.openstack.org_swiftstorages.yaml

@@ -63,6 +63,10 @@ spec:
               containerImageProxy:
                 description: Image URL for Swift proxy service
                 type: string
+              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
@@ -92,6 +96,7 @@ spec:
             - containerImageMemcached
             - containerImageObject
             - containerImageProxy
+            - memcachedInstance
             - replicas
             - storageClass
             - storageRequest

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

api/v1beta1/swiftproxy_types.go

@@ -48,6 +48,9 @@ type SwiftProxySpec struct {
 	// +kubebuilder:validation:Required
 	// Image URL for Memcache servicd
 	ContainerImageMemcached string `json:"containerImageMemcached"`
+	// +kubebuilder:default=memcached
+	// Memcached instance name.
+	MemcachedInstance string `json:"memcachedInstance"`
 
 	// +kubebuilder:validation:Required
 	// +kubebuilder:default=swift
@@ -76,6 +79,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=memcached
+	// Memcached instance name.
+	MemcachedInstance string `json:"memcachedInstance"`
 }
 
 // ProxyOverrideSpec to override the generated manifest of several child resources.

api/v1beta1/swiftstorage_types.go

@@ -31,6 +31,11 @@ type SwiftStorageSpec struct {
 	// +kubebuilder:validation:Minimum=0
 	Replicas *int32 `json:"replicas"`
 
+	// +kubebuilder:validation:Required
+	// +kubebuilder:default=memcached
+	// Memcached instance name.
+	MemcachedInstance string `json:"memcachedInstance"`
+
 	// +kubebuilder:validation:Required
 	// Name of StorageClass to use for Swift PVs
 	// +kubebuilder:default=""
@@ -69,6 +74,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=memcached
+	// Memcached instance name.
+	MemcachedInstance string `json:"memcachedInstance"`
 }
 
 // SwiftStorageStatus defines the observed state of SwiftStorage

config/crd/bases/swift.openstack.org_swiftproxies.yaml

@@ -54,6 +54,10 @@ spec:
               containerImageProxy:
                 description: Swift Proxy Container Image URL
                 type: string
+              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
@@ -269,6 +273,7 @@ spec:
             required:
             - containerImageMemcached
             - containerImageProxy
+            - memcachedInstance
             - replicas
             - secret
             - serviceUser

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
+                  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
@@ -296,6 +304,7 @@ spec:
                 required:
                 - containerImageMemcached
                 - containerImageProxy
+                - memcachedInstance
                 - replicas
                 - secret
                 - serviceUser
@@ -342,6 +351,10 @@ spec:
                   containerImageProxy:
                     description: Image URL for Swift proxy service
                     type: string
+                  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
@@ -371,12 +384,14 @@ spec:
                 - containerImageMemcached
                 - containerImageObject
                 - containerImageProxy
+                - memcachedInstance
                 - replicas
                 - storageClass
                 - storageRequest
                 - swiftConfSecret
                 type: object
             required:
+            - memcachedInstance
             - storageClass
             - swiftConfSecret
             - swiftProxy

config/crd/bases/swift.openstack.org_swiftstorages.yaml

@@ -63,6 +63,10 @@ spec:
               containerImageProxy:
                 description: Image URL for Swift proxy service
                 type: string
+              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
@@ -92,6 +96,7 @@ spec:
             - containerImageMemcached
             - containerImageObject
             - containerImageProxy
+            - memcachedInstance
             - replicas
             - storageClass
             - storageRequest

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:

controllers/swift_controller.go

@@ -353,6 +353,7 @@ func (r *SwiftReconciler) storageCreateOrUpdate(ctx context.Context, instance *s
 		ContainerImageMemcached: instance.Spec.SwiftStorage.ContainerImageMemcached,
 		SwiftConfSecret:         instance.Spec.SwiftConfSecret,
 		NetworkAttachments:      instance.Spec.SwiftStorage.NetworkAttachments,
+		MemcachedInstance:       instance.Spec.MemcachedInstance,
 	}
 
 	deployment := &swiftv1.SwiftStorage{
@@ -387,6 +388,7 @@ func (r *SwiftReconciler) proxyCreateOrUpdate(ctx context.Context, instance *swi
 		SwiftConfSecret:         instance.Spec.SwiftConfSecret,
 		Override:                instance.Spec.SwiftProxy.Override,
 		NetworkAttachments:      instance.Spec.SwiftStorage.NetworkAttachments,
+		MemcachedInstance:       instance.Spec.MemcachedInstance,
 	}
 
 	deployment := &swiftv1.SwiftProxy{

controllers/swiftproxy_controller.go

@@ -19,11 +19,13 @@ package controllers
 import (
 	"context"
 	"fmt"
+	"strings"
 	"time"
 
 	"github.com/go-logr/logr"
 
 	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/kubernetes"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
@@ -43,6 +45,7 @@ import (
 	service "github.com/openstack-k8s-operators/lib-common/modules/common/service"
 	"github.com/openstack-k8s-operators/lib-common/modules/common/util"
 
+	memcachedv1 "github.com/openstack-k8s-operators/infra-operator/apis/memcached/v1beta1"
 	keystonev1 "github.com/openstack-k8s-operators/keystone-operator/api/v1beta1"
 	swiftv1beta1 "github.com/openstack-k8s-operators/swift-operator/api/v1beta1"
 	"github.com/openstack-k8s-operators/swift-operator/pkg/swift"
@@ -66,6 +69,7 @@ type SwiftProxyReconciler struct {
 //+kubebuilder:rbac:groups=keystone.openstack.org,resources=keystoneservices,verbs=get;list;watch;create;update;patch;delete
 //+kubebuilder:rbac:groups=core,resources=secrets,verbs=get;list;watch;create;update;patch;delete;
 //+kubebuilder:rbac:groups=k8s.cni.cncf.io,resources=network-attachment-definitions,verbs=get;list;watch
+//+kubebuilder:rbac:groups=memcached.openstack.org,resources=memcacheds,verbs=get;list;watch;
 
 // Reconcile is part of the main kubernetes reconciliation loop which aims to
 // move the current state of the cluster closer to the desired state.
@@ -286,6 +290,44 @@ func (r *SwiftProxyReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 	}
 	password := string(sps.Data[instance.Spec.PasswordSelectors.Service])
 
+	//
+	// Check for required memcached used for caching
+	//
+	memcached, err := r.getSwiftMemcached(ctx, helper, instance)
+	if err != nil {
+		if apierrors.IsNotFound(err) {
+			instance.Status.Conditions.Set(condition.FalseCondition(
+				condition.MemcachedReadyCondition,
+				condition.RequestedReason,
+				condition.SeverityInfo,
+				condition.MemcachedReadyWaitingMessage))
+			return ctrl.Result{RequeueAfter: time.Duration(10) * time.Second}, fmt.Errorf("memcached %s not found", instance.Spec.MemcachedInstance)
+		}
+		instance.Status.Conditions.Set(condition.FalseCondition(
+			condition.MemcachedReadyCondition,
+			condition.ErrorReason,
+			condition.SeverityWarning,
+			condition.MemcachedReadyErrorMessage,
+			err.Error()))
+		return ctrl.Result{}, err
+	}
+
+	if !memcached.IsReady() {
+		instance.Status.Conditions.Set(condition.FalseCondition(
+			condition.MemcachedReadyCondition,
+			condition.RequestedReason,
+			condition.SeverityInfo,
+			condition.MemcachedReadyWaitingMessage))
+		return ctrl.Result{RequeueAfter: time.Duration(10) * time.Second}, fmt.Errorf("memcached %s is not ready", memcached.Name)
+	}
+	// Mark the Memcached Service as Ready if we get to this point with no errors
+	instance.Status.Conditions.MarkTrue(
+		condition.MemcachedReadyCondition, condition.MemcachedReadyMessage)
+	// run check memcached - end
+
+	// Get the memached server URLs
+	memcachedServers := strings.Join(memcached.Status.ServerList, ",")
+
 	// Create a Secret populated with content from templates/
 	envVars := make(map[string]env.Setter)
 	tpl := swiftproxy.SecretTemplates(
@@ -294,6 +336,7 @@ func (r *SwiftProxyReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 		keystonePublicURL,
 		keystoneInternalURL,
 		password,
+		memcachedServers,
 	)
 	err = secret.EnsureSecrets(ctx, helper, instance, tpl, &envVars)
 	if err != nil {
@@ -404,3 +447,23 @@ func (r *SwiftProxyReconciler) reconcileDelete(ctx context.Context, instance *sw
 
 	return ctrl.Result{}, nil
 }
+
+// getSwiftMemcached - gets the Memcached instance used for Swift cache backend
+func (r *SwiftProxyReconciler) getSwiftMemcached(
+	ctx context.Context,
+	h *helper.Helper,
+	instance *swiftv1beta1.SwiftProxy,
+) (*memcachedv1.Memcached, error) {
+	memcached := &memcachedv1.Memcached{}
+	err := h.GetClient().Get(
+		ctx,
+		types.NamespacedName{
+			Name:      instance.Spec.MemcachedInstance,
+			Namespace: instance.Namespace,
+		},
+		memcached)
+	if err != nil {
+		return nil, err
+	}
+	return memcached, err
+}