more cleanup

Author: Schmaetz

pkg/apis/cpo.opensource.cybertec.at/v1/util.go

@@ -2,7 +2,6 @@ package v1
 
 import (
 	"fmt"
-	"github.com/cybertec-postgresql/cybertec-pg-operator/pkg/util/constants"
 	"regexp"
 	"strings"
 	"time"
@@ -121,10 +120,3 @@ func (b *Backup) GetRestoreID() string {
 	}
 	return b.Pgbackrest.Restore.ID
 }
-
-func (p *Postgresql) AddMonitoringUser(monitorUsername string) {
-	if p.Spec.Users == nil {
-		p.Spec.Users = make(map[string]UserFlags)
-	}
-	p.Spec.Users[monitorUsername] = UserFlags{constants.RoleFlagLogin}
-}

pkg/cluster/cluster.go

@@ -127,9 +127,7 @@ func New(cfg Config, kubeClient k8sutil.KubernetesClient, pgSpec cpov1.Postgresq
 	if !ok {
 		passwordEncryption = "scram-sha-256"
 	}
-	// if pgSpec.Spec.Monitoring != nil {
-	// 	pgSpec.AddMonitoringUser(monitorUsername)
-	// }
+
 	cluster := &Cluster{
 		Config:         cfg,
 		Postgresql:     pgSpec,
@@ -431,29 +429,6 @@ func (c *Cluster) Create() (err error) {
 		c.addMonitoringPermissions()
 	}
 
-	//Setup cpo monitoring related sql statements
-	// if c.Spec.Monitoring != nil {
-	// 	c.logger.Info("setting up CPO monitoring")
-
-	// 	// Open a new connection to the postgres db tp setup monitoring struc and permissions
-	// 	if err := c.initDbConnWithName("postgres"); err != nil {
-	// 		return fmt.Errorf("could not init database connection")
-	// 	}
-	// 	defer func() {
-	// 		if c.connectionIsClosed() {
-	// 			return
-	// 		}
-
-	// 		if err := c.closeDbConn(); err != nil {
-	// 			c.logger.Errorf("could not close database connection: %v", err)
-	// 		}
-	// 	}()
-	// 	_, err := c.pgDb.Exec(CPOmonitoring)
-	// 	if err != nil {
-	// 		return fmt.Errorf("CPO monitoring could not be setup: %v", err)
-	// 	}
-	// }
-
 	// remember slots to detect deletion from manifest
 	for slotName, desiredSlot := range c.Spec.Patroni.Slots {
 		c.replicationSlots[slotName] = desiredSlot

pkg/cluster/resources.go

@@ -94,16 +94,6 @@ func (c *Cluster) createStatefulSet() (*appsv1.StatefulSet, error) {
 			Env: c.generateMonitoringEnvVars(),
 		}
 		c.Spec.Sidecars = append(c.Spec.Sidecars, *sidecar) //populate the sidecar spec so that the sidecar is automatically created
-
-		// //Add monitoring user
-		// flg := cpov1.UserFlags{constants.RoleFlagLogin}
-		// if c.Spec.Users != nil {
-		// 	c.Spec.Users[monitorUsername] = flg
-		// } else {
-		// 	users := make(map[string]cpov1.UserFlags)
-		// 	c.Spec.Users = users
-		// 	c.Spec.Users[monitorUsername] = flg
-		// }
 	}
 
 	statefulSetSpec, err := c.generateStatefulSet(&c.Spec)