wip

armru · armru · commit bf8753f90d49 · 2024-11-08T16:04:58.000+01:00
Signed-off-by: Armando Ruocco &lt;armando.ruocco@enterprisedb.com&gt;
diff --git a/Makefile b/Makefile
@@ -45,11 +45,11 @@ help: ## Display this help.
 
 .PHONY: manifests
 manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects.
-	$(CONTROLLER_GEN) rbac:roleName=plugin-barman-cloud crd webhook paths="./..." output:crd:artifacts:config=config/crd/bases
+	$(CONTROLLER_GEN) rbac:roleName=plugin-barman-cloud crd webhook paths="./api/..." output:crd:artifacts:config=config/crd/bases
 
 .PHONY: generate
 generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
-	$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./..."
+	$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./api/..."
 
 .PHONY: fmt
 fmt: ## Run go fmt against code.
diff --git a/api/v1/objectstore_types.go b/api/v1/objectstore_types.go
@@ -21,13 +21,28 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-// EDIT THIS FILE!  THIS IS SCAFFOLDING FOR YOU TO OWN!
-// NOTE: json tags are required.  Any new fields you add must have json tags for the fields to be serialized.
+type InstanceSidecarConfiguration struct {
+	// The expiration time of the cache entries not managed by the informers. Expressed in seconds.
+	// +optional
+	// +kubebuilder:validation:Minimum=0
+	// +kubebuilder:validation:Maximum=3600
+	// +kubebuilder:default=180
+	CacheTTL *int `json:"cacheTTL,omitempty"`
+}
+
+func (i InstanceSidecarConfiguration) GetCacheTTL() int {
+	if i.CacheTTL == nil {
+		return 180
+	}
+	return *i.CacheTTL
+}
 
 // ObjectStoreSpec defines the desired state of ObjectStore.
 type ObjectStoreSpec struct {
 	Configuration barmanapi.BarmanObjectStoreConfiguration `json:"configuration"`
 
+	InstanceSidecarConfiguration InstanceSidecarConfiguration `json:"instanceSidecarConfiguration,omitempty"`
+
 	// TODO: we add here any exclusive fields for our plugin CRD
 }
 
diff --git a/api/v1/zz_generated.deepcopy.go b/api/v1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/barmancloud.cnpg.io_objectstores.yaml b/config/crd/bases/barmancloud.cnpg.io_objectstores.yaml
@@ -378,6 +378,16 @@ spec:
                 required:
                 - destinationPath
                 type: object
+              instanceSidecarConfiguration:
+                properties:
+                  cacheTTL:
+                    default: 180
+                    description: The expiration time of the cache entries not managed
+                      by the informers. Expressed in seconds.
+                    maximum: 3600
+                    minimum: 0
+                    type: integer
+                type: object
             required:
             - configuration
             type: object
diff --git a/internal/cmd/instance/main.go b/internal/cmd/instance/main.go
@@ -40,7 +40,6 @@ func NewCmd() *cobra.Command {
 	_ = viper.BindEnv("pod-name", "POD_NAME")
 	_ = viper.BindEnv("pgdata", "PGDATA")
 	_ = viper.BindEnv("spool-directory", "SPOOL_DIRECTORY")
-	_ = viper.BindEnv("secret-cache-ttl", "SECRET_CACHE_TTL")
 
 	return cmd
 }
diff --git a/internal/cnpgi/instance/internal/client/client.go b/internal/cnpgi/instance/internal/client/client.go
@@ -2,10 +2,12 @@ package client
 
 import (
 	"context"
+	"fmt"
 	"sync"
 	"time"
 
 	"github.com/cloudnative-pg/machinery/pkg/log"
+	v1 "github.com/cloudnative-pg/plugin-barman-cloud/api/v1"
 	corev1 "k8s.io/api/core/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
@@ -15,23 +17,38 @@ type cachedSecret struct {
 	fetchUnixTime int64
 }
 
-// ExtendedClient is an extended client that is capable of caching multiple secrets without relying on 'list and watch'
+// ExtendedClient is an extended client that is capable of caching multiple secrets without relying on informers
 type ExtendedClient struct {
 	client.Client
-	cachedSecrets []*cachedSecret
-	mux           *sync.Mutex
-	ttl           int64
+	barmanObjectKey client.ObjectKey
+	cachedSecrets   []*cachedSecret
+	mux             *sync.Mutex
+	ttl             int
 }
 
 // NewExtendedClient returns an extended client capable of caching secrets on the 'Get' operation
-func NewExtendedClient(baseClient client.Client, ttl int64) client.Client {
+func NewExtendedClient(
+	baseClient client.Client,
+	objectStoreKey client.ObjectKey,
+) client.Client {
 	return &ExtendedClient{
-		Client: baseClient,
-		ttl:    ttl,
-		mux:    &sync.Mutex{},
+		Client:          baseClient,
+		barmanObjectKey: objectStoreKey,
+		mux:             &sync.Mutex{},
 	}
 }
 
+func (e *ExtendedClient) refreshTTL(ctx context.Context) error {
+	var object v1.ObjectStore
+	if err := e.Get(ctx, e.barmanObjectKey, &object); err != nil {
+		return fmt.Errorf("failed to get the object store while refreshing the TTL parameter: %w", err)
+	}
+
+	e.ttl = object.Spec.InstanceSidecarConfiguration.GetCacheTTL()
+
+	return nil
+}
+
 func (e *ExtendedClient) Get(
 	ctx context.Context,
 	key client.ObjectKey,
@@ -43,13 +60,20 @@ func (e *ExtendedClient) Get(
 		WithValues("name", key.Name, "namespace", key.Namespace)
 
 	if e.isCacheDisabled() {
+		contextLogger.Trace("cache is disabled")
 		return e.Client.Get(ctx, key, obj, opts...)
 	}
 
 	if _, ok := obj.(*corev1.Secret); !ok {
+		contextLogger.Trace("not a secret, skipping")
 		return e.Client.Get(ctx, key, obj, opts...)
 	}
 
+	if err := e.refreshTTL(ctx); err != nil {
+		return err
+	}
+
+	contextLogger.Trace("locking the cache")
 	e.mux.Lock()
 	defer e.mux.Unlock()
 
@@ -64,7 +88,7 @@ func (e *ExtendedClient) Get(
 			expiredSecretIndex = idx
 			break
 		}
-		contextLogger.Trace("secret found, loading it from cache")
+		contextLogger.Debug("secret found, loading it from cache")
 		cache.secret.DeepCopyInto(obj.(*corev1.Secret))
 		return nil
 	}
@@ -78,6 +102,7 @@ func (e *ExtendedClient) Get(
 		fetchUnixTime: time.Now().Unix(),
 	}
 
+	contextLogger.Debug("setting secret in the cache")
 	if expiredSecretIndex != -1 {
 		e.cachedSecrets[expiredSecretIndex] = cs
 	} else {
@@ -88,7 +113,7 @@ func (e *ExtendedClient) Get(
 }
 
 func (e *ExtendedClient) isExpired(unixTime int64) bool {
-	return time.Now().Unix()-unixTime > e.ttl
+	return time.Now().Unix()-unixTime > int64(e.ttl)
 }
 
 func (e *ExtendedClient) isCacheDisabled() bool {
diff --git a/internal/cnpgi/instance/internal/client/client_test.go b/internal/cnpgi/instance/internal/client/client_test.go
diff --git a/internal/cnpgi/instance/internal/client/doc.go b/internal/cnpgi/instance/internal/client/doc.go
@@ -1,3 +1,3 @@
 // Package client provides an extended  client that is capable of caching multiple secrets without relying on
-// 'list and watch'
+// informers
 package client
diff --git a/internal/cnpgi/instance/internal/client/suite_test.go b/internal/cnpgi/instance/internal/client/suite_test.go
diff --git a/internal/cnpgi/instance/manager.go b/internal/cnpgi/instance/manager.go
@@ -2,6 +2,7 @@ package instance
 
 import (
 	"context"
+	extendedclient "github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/instance/internal/client"
 	"os"
 	"path"
 
@@ -18,7 +19,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log"
 
 	barmancloudv1 "github.com/cloudnative-pg/plugin-barman-cloud/api/v1"
-	extendedclient "github.com/cloudnative-pg/plugin-barman-cloud/internal/client"
 )
 
 var scheme = runtime.NewScheme()
@@ -37,7 +37,6 @@ func Start(ctx context.Context) error {
 	boName := viper.GetString("barman-object-name")
 	clusterName := viper.GetString("cluster-name")
 	podName := viper.GetString("pod-name")
-	secretCacheTTL := viper.GetInt64("secret-cache-ttl")
 
 	mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
 		Scheme: scheme,
@@ -70,17 +69,19 @@ func Start(ctx context.Context) error {
 		os.Exit(1)
 	}
 
+	barmanObjectKey := client.ObjectKey{
+		Namespace: namespace,
+		Name:      boName,
+	}
+
 	if err := mgr.Add(&CNPGI{
-		Client: extendedclient.NewExtendedClient(mgr.GetClient(), secretCacheTTL),
+		Client: extendedclient.NewExtendedClient(mgr.GetClient(), barmanObjectKey),
 		ClusterObjectKey: client.ObjectKey{
 			Namespace: namespace,
 			Name:      clusterName,
 		},
-		BarmanObjectKey: client.ObjectKey{
-			Namespace: namespace,
-			Name:      boName,
-		},
-		InstanceName: podName,
+		BarmanObjectKey: barmanObjectKey,
+		InstanceName:    podName,
 		// TODO: improve
 		PGDataPath:     viper.GetString("pgdata"),
 		PGWALPath:      path.Join(viper.GetString("pgdata"), "pg_wal"),
diff --git a/internal/cnpgi/instance/wal.go b/internal/cnpgi/instance/wal.go
@@ -65,6 +65,9 @@ func (w WALServiceImplementation) Archive(
 	ctx context.Context,
 	request *wal.WALArchiveRequest,
 ) (*wal.WALArchiveResult, error) {
+	contextLogger := log.FromContext(ctx)
+	contextLogger.Debug("starting wal archive")
+
 	var cluster cnpgv1.Cluster
 	if err := w.Client.Get(ctx, w.ClusterObjectKey, &cluster); err != nil {
 		return nil, err
diff --git a/internal/cnpgi/operator/config/config.go b/internal/cnpgi/operator/config/config.go
@@ -62,8 +62,8 @@ func NewFromCluster(cluster *cnpgv1.Cluster) *PluginConfiguration {
 	return result
 }
 
-// ValidateBarmanObjectName checks if the barmanObjectName is set
-func (p *PluginConfiguration) ValidateBarmanObjectName() error {
+// Validate checks if the barmanObjectName is set
+func (p *PluginConfiguration) Validate() error {
 	err := NewConfigurationError()
 	if len(p.BarmanObjectName) != 0 {
 		return nil
diff --git a/internal/cnpgi/operator/lifecycle.go b/internal/cnpgi/operator/lifecycle.go
@@ -85,6 +85,12 @@ func (impl LifecycleImplementation) LifecycleHook(
 
 	pluginConfiguration := config.NewFromCluster(&cluster)
 
+	// barman object is required for both the archive and restore process
+	if err := pluginConfiguration.Validate(); err != nil {
+		contextLogger.Info("pluginConfiguration invalid, skipping lifecycle", "error", err)
+		return nil, nil
+	}
+
 	switch kind {
 	case "Pod":
 		contextLogger.Info("Reconciling pod")
@@ -160,10 +166,6 @@ func reconcilePod(
 	pluginConfiguration *config.PluginConfiguration,
 ) (*lifecycle.OperatorLifecycleResponse, error) {
 	contextLogger := log.FromContext(ctx).WithName("lifecycle")
-	if err := pluginConfiguration.ValidateBarmanObjectName(); err != nil {
-		contextLogger.Info("no barman object name set, skipping pod sidecar injection")
-		return nil, nil
-	}
 
 	pod, err := decoder.DecodePodJSON(request.GetObjectDefinition())
 	if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,6 @@ func NewCmd() *cobra.Command {`
`40`	`40`	`_ = viper.BindEnv("pod-name", "POD_NAME")`
`41`	`41`	`_ = viper.BindEnv("pgdata", "PGDATA")`
`42`	`42`	`_ = viper.BindEnv("spool-directory", "SPOOL_DIRECTORY")`
`43`		`- _ = viper.BindEnv("secret-cache-ttl", "SECRET_CACHE_TTL")`
`44`	`43`
`45`	`44`	`return cmd`
`46`	`45`	`}`