use status instead of annotations

Author: nmarukovich

build/crd/percona/generated/pgv2.percona.com_perconapgclusters.yaml

@@ -17384,6 +17384,10 @@ spec:
             properties:
               host:
                 type: string
+              installedCustomExtensions:
+                items:
+                  type: string
+                type: array
               pgbouncer:
                 properties:
                   ready:

config/crd/bases/pgv2.percona.com_perconapgclusters.yaml

@@ -17790,6 +17790,10 @@ spec:
             properties:
               host:
                 type: string
+              installedCustomExtensions:
+                items:
+                  type: string
+                type: array
               pgbouncer:
                 properties:
                   ready:

deploy/bundle.yaml

@@ -18083,6 +18083,10 @@ spec:
             properties:
               host:
                 type: string
+              installedCustomExtensions:
+                items:
+                  type: string
+                type: array
               pgbouncer:
                 properties:
                   ready:

deploy/crd.yaml

@@ -18083,6 +18083,10 @@ spec:
             properties:
               host:
                 type: string
+              installedCustomExtensions:
+                items:
+                  type: string
+                type: array
               pgbouncer:
                 properties:
                   ready:

deploy/cw-bundle.yaml

@@ -18083,6 +18083,10 @@ spec:
             properties:
               host:
                 type: string
+              installedCustomExtensions:
+                items:
+                  type: string
+                type: array
               pgbouncer:
                 properties:
                   ready:

percona/controller/pgcluster/controller.go

@@ -529,61 +529,49 @@ func (r *PGClusterReconciler) handleMonitorUserPassChange(ctx context.Context, c
 }
 
 func (r *PGClusterReconciler) reconcileCustomExtensions(ctx context.Context, cr *v2.PerconaPGCluster) error {
-	log := logging.FromContext(ctx).WithValues("cluster", cr.Name, "namespace", cr.Namespace)
 	if cr.Spec.Extensions.Storage.Secret == nil {
 		return nil
 	}
 
 	extensionKeys := make([]string, 0)
+	extensionNames := make([]string, 0)
+
 	for _, extension := range cr.Spec.Extensions.Custom {
 		key := extensions.GetExtensionKey(cr.Spec.PostgresVersion, extension.Name, extension.Version)
 		extensionKeys = append(extensionKeys, key)
+		extensionNames = append(extensionNames, extension.Name)
 	}
-	log.Info("List of extension keys", "extensionKeys", extensionKeys)
+
 	if cr.CompareVersion("2.6.0") >= 0 {
 		// custom extensions to be removed
 		var removedExtension []string
 		// list of installed custom extensions
 		var installedExtensions []string
-		if cr.Spec.Metadata != nil && cr.Spec.Metadata.Annotations != nil {
-			if val, ok := cr.Spec.Metadata.Annotations[pNaming.AnnotationClusterCustomExtensions]; ok && val != "" {
-				installedExtensions = strings.Split(val, ",")
-			}
-			crExtensions := make(map[string]struct{})
-			for _, ext := range extensionKeys {
-				crExtensions[ext] = struct{}{}
+		installedExtensions = cr.Status.InstalledCustomExtensions
+		crExtensions := make(map[string]struct{})
+		for _, ext := range extensionNames {
+			crExtensions[ext] = struct{}{}
+		}
+		// Check for missing entries in crExtensions
+		for _, ext := range installedExtensions {
+			// If an object exists in installedExtensions but not in crExtensions, the extension should be deleted.
+			if _, exists := crExtensions[ext]; !exists {
+				removedExtension = append(removedExtension, ext)
 			}
+		}
 
-			// Check for missing entries in crExtensions
-			for _, ext := range installedExtensions {
-				log.Info("Test extensions installedExt")
-				// If an object exists in installedExtensions but not in crExtensions, the extension should be deleted.
-				if _, exists := crExtensions[ext]; !exists {
-					removedExtension = append(removedExtension, strings.Split(ext, "-")[0])
-				}
+		if len(removedExtension) > 0 {
+			var exec postgres.Executor
+			if exec == nil {
+				return errors.New("executor is nil")
 			}
-			log.Info("Test extensions installedExt", "removedExtension", removedExtension)
-
-			if len(removedExtension) > 0 {
-				var exec postgres.Executor
-				if exec == nil {
-					return errors.New("executor is nil")
-				}
-				err := DisableCustomExtensionsInPostgreSQL(ctx, removedExtension, exec)
-				if err != nil {
-					return errors.Wrap(err, "custom extension deletion")
-				}
+			err := DisableCustomExtensionsInPostgreSQL(ctx, removedExtension, exec)
+			if err != nil {
+				return errors.Wrap(err, "custom extension deletion")
 			}
 		}
-		if cr.Spec.Metadata == nil {
-			cr.Spec.Metadata = new(v1beta1.Metadata)
-		}
-
-		if cr.Spec.Metadata.Annotations == nil {
-			cr.Spec.Metadata.Annotations = make(map[string]string)
-		}
-		cr.Spec.Metadata.Annotations[pNaming.AnnotationClusterCustomExtensions] = strings.Join(extensionKeys, ",")
 	}
+
 	for i := 0; i < len(cr.Spec.InstanceSets); i++ {
 		set := &cr.Spec.InstanceSets[i]
 		set.InitContainers = append(set.InitContainers, extensions.ExtensionRelocatorContainer(

percona/controller/pgcluster/status.go

@@ -2,7 +2,6 @@ package pgcluster
 
 import (
 	"context"
-
 	"github.com/pkg/errors"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
@@ -78,6 +77,11 @@ func (r *PGClusterReconciler) updateStatus(ctx context.Context, cr *v2.PerconaPG
 		return errors.Wrap(err, "get app host")
 	}
 
+	installedCustomExtensions := make([]string, 0)
+	for _, extension := range cr.Spec.Extensions.Custom {
+		installedCustomExtensions = append(installedCustomExtensions, extension.Name)
+	}
+
 	var size, ready int32
 	ss := make([]v2.PostgresInstanceSetStatus, 0, len(status.InstanceSets))
 	for _, is := range status.InstanceSets {
@@ -111,6 +115,8 @@ func (r *PGClusterReconciler) updateStatus(ctx context.Context, cr *v2.PerconaPG
 				Ready: status.Proxy.PGBouncer.ReadyReplicas,
 			},
 			Host: host,
+
+			InstalledCustomExtensions: installedCustomExtensions,
 		}
 
 		cluster.Status.State = r.getState(cr, &cluster.Status, status)

percona/naming/annotations.go

@@ -46,9 +46,6 @@ const (
 	// AnnotationClusterBootstrapRestore is the annotation that is added to PerconaPGRestore to
 	// indicate that it is a cluster bootstrap restore.
 	AnnotationClusterBootstrapRestore = AnnotationPrefix + "cluster-bootstrap-restore"
-
-	//AnnotationClusterCustomExtension is annotation that added to pg cluster to handle the list of custom extensions.
-	AnnotationClusterCustomExtensions = AnnotationPrefix + "custom_extensions"
 )
 
 func ToCrunchyAnnotation(annotation string) string {

pkg/apis/pgv2.percona.com/v2/perconapgcluster_types.go

@@ -393,6 +393,10 @@ type PerconaPGClusterStatus struct {
 	// +optional
 	// +operator-sdk:csv:customresourcedefinitions:type=status
 	Host string `json:"host"`
+
+	// +optional
+	// +operator-sdk:csv:customresourcedefinitions:type=status
+	InstalledCustomExtensions []string `json:"installedCustomExtensions"`
 }
 
 type Backups struct {