cleanup

Author: Schmaetz

pkg/cluster/cluster.go

@@ -352,12 +352,6 @@ func (c *Cluster) Create() (err error) {
 		}
 		c.logger.Info("a TDE secret was successfully created")
 	}
-	// if c.Postgresql.Spec.Monitoring != nil {
-	// 	if err := c.createMonitoringSecret(); err != nil {
-	// 		return fmt.Errorf("could not create the monitoring secret: %v", err)
-	// 	}
-	// 	c.logger.Info("a monitoring secret was successfully created")
-	// }
 
 	if specHasPgbackrestClone(&c.Postgresql.Spec) {
 		if err := c.createPgbackrestCloneConfig(); err != nil {
@@ -1012,12 +1006,6 @@ func (c *Cluster) Update(oldSpec, newSpec *cpov1.Postgresql) error {
 		syncStatefulSet = true
 	}
 
-	//sync monitoring container
-	if !reflect.DeepEqual(oldSpec.Spec.Monitoring, newSpec.Spec.Monitoring) {
-		syncStatefulSet = true
-		c.syncMonitoringSecret(oldSpec, newSpec)
-	}
-
 	//sync sts when there is a change in the pgbackrest secret, since we need to mount this
 	if newSpec.Spec.Backup != nil && oldSpec.Spec.Backup != nil &&
 		newSpec.Spec.Backup.Pgbackrest != nil && oldSpec.Spec.Backup.Pgbackrest != nil &&

pkg/cluster/database.go

@@ -89,51 +89,7 @@ const (
 			TO {{.pooler_user}};
 		GRANT USAGE ON SCHEMA {{.pooler_schema}} TO {{.pooler_user}};
 	`
-	// CPOmonitoring = `
-	// 	GRANT pg_monitor TO cpo_exporter;
-	// 	GRANT SELECT ON TABLE pg_authid TO cpo_exporter;
-
-	// 	CREATE SCHEMA IF NOT EXISTS exporter;
-	// 	ALTER SCHEMA exporter OWNER TO cpo_exporter;
-	// 	CREATE EXTENSION IF NOT EXISTS pgnodemx with SCHEMA exporter;
-	// 	alter extension pgnodemx UPDATE;
-	// 	CREATE TABLE IF NOT EXISTS exporter.pgbackrestbackupinfo (
-	// 		data jsonb NOT NULL,
-	// 		data_time timestamp with time zone DEFAULT now() NOT NULL
-	// 	)
-	// 	WITH (autovacuum_analyze_scale_factor='0', autovacuum_vacuum_scale_factor='0', autovacuum_vacuum_threshold='2', autovacuum_analyze_threshold='2');
-	// 	ALTER TABLE exporter.pgbackrestbackupinfo OWNER TO cpo_exporter;
-
-	// 	GRANT pg_execute_server_program TO cpo_exporter;
-
-	// 	CREATE OR REPLACE FUNCTION exporter.update_pgbackrest_info()
-	// 		RETURNS VOID AS $$
-	// 		DECLARE
-	// 			last_entry_timestamp TIMESTAMP;
-	// 			record_count INT;
-	// 		BEGIN
-	// 			SELECT COUNT(*) INTO record_count
-	// 			FROM exporter.pgbackrestbackupinfo;
-
-	// 			IF record_count > 0 THEN
-	// 				SELECT data_time INTO last_entry_timestamp
-	// 				FROM exporter.pgbackrestbackupinfo
-	// 				ORDER BY data_time DESC
-	// 				LIMIT 1;
-
-	// 				IF last_entry_timestamp < NOW() - INTERVAL '5 minutes' THEN
-	// 					DELETE FROM exporter.pgbackrestbackupinfo;
-	// 				ELSE
-	// 					RETURN;
-	// 				END IF;
-	// 			END IF;
-
-	// 			EXECUTE format(
-	// 				'COPY exporter.pgbackrestbackupinfo (data) FROM program ''pgbackrest info --output=json'' WITH (FORMAT text, DELIMITER ''|'')'
-	// 			);
-	// 		END;
-	// 		$$ LANGUAGE plpgsql;
-	// `
+
 	cpoMonitoring = `
 		GRANT pg_monitor TO cpo_exporter;
 		GRANT SELECT ON TABLE pg_authid TO cpo_exporter;

pkg/cluster/resources.go

@@ -15,7 +15,6 @@ import (
 
 	cpov1 "github.com/cybertec-postgresql/cybertec-pg-operator/pkg/apis/cpo.opensource.cybertec.at/v1"
 	"github.com/cybertec-postgresql/cybertec-pg-operator/pkg/util"
-	"github.com/cybertec-postgresql/cybertec-pg-operator/pkg/util/constants"
 	"github.com/cybertec-postgresql/cybertec-pg-operator/pkg/util/k8sutil"
 	"github.com/cybertec-postgresql/cybertec-pg-operator/pkg/util/retryutil"
 )
@@ -96,15 +95,15 @@ func (c *Cluster) createStatefulSet() (*appsv1.StatefulSet, error) {
 		}
 		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
-		}
+		// //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)

pkg/cluster/sync.go

@@ -192,11 +192,6 @@ func (c *Cluster) Sync(newSpec *cpov1.Postgresql) error {
 		return fmt.Errorf("error refreshing restore configmap: %v", err)
 	}
 
-	// sync monitoring
-	if err = c.syncMonitoringSecret(&oldSpec, newSpec); err != nil {
-		return fmt.Errorf("could not sync monitoring: %v", err)
-	}
-
 	if err = c.initUsers(); err != nil {
 		err = fmt.Errorf("could not init users: %v", err)
 		return err
@@ -1689,37 +1684,6 @@ func (c *Cluster) createTDESecret() error {
 	return nil
 }
 
-func (c *Cluster) createMonitoringSecret() error {
-	c.logger.Info("creating Monitoring secret")
-	c.setProcessName("creating Monitoring secret")
-	generatedKey := make([]byte, 16)
-	rand.Read(generatedKey)
-
-	generatedSecret := v1.Secret{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      c.getMonitoringSecretName(),
-			Namespace: c.Namespace,
-			Labels:    c.labelsSet(true),
-		},
-		Type: v1.SecretTypeOpaque,
-		Data: map[string][]byte{
-			"username": []byte(monitorUsername),
-			"password": []byte(fmt.Sprintf("%x", generatedKey)),
-		},
-	}
-	secret, err := c.KubeClient.Secrets(generatedSecret.Namespace).Create(context.TODO(), &generatedSecret, metav1.CreateOptions{})
-	if err == nil {
-		c.Secrets[secret.UID] = secret
-		c.logger.Debugf("created new secret %s, namespace: %s, uid: %s", util.NameFromMeta(secret.ObjectMeta), generatedSecret.Namespace, secret.UID)
-	} else {
-		if !k8sutil.ResourceAlreadyExists(err) {
-			return fmt.Errorf("could not create secret for Monitoring %s: in namespace %s: %v", util.NameFromMeta(secret.ObjectMeta), generatedSecret.Namespace, err)
-		}
-	}
-
-	return nil
-}
-
 // delete monitoring secret
 func (c *Cluster) deleteMonitoringSecret() (err error) {
 	// Repeat the same for the secret object
@@ -1739,47 +1703,6 @@ func (c *Cluster) deleteMonitoringSecret() (err error) {
 	return nil
 }
 
-// Sync monitoring
-// In case of monitoring is added/deleted, we need to
-// 1. Update sts to in/exclude the exporter contianer
-// 2. Add/Delete the respective user
-// 3. Add/Delete the respective secret
-func (c *Cluster) syncMonitoringSecret(oldSpec, newSpec *cpov1.Postgresql) error {
-	c.logger.Info("syncing Monitoring secret")
-	c.setProcessName("syncing Monitoring secret")
-
-	if newSpec.Spec.Monitoring != nil && oldSpec.Spec.Monitoring == nil {
-		// Create monitoring secret
-		if err := c.createMonitoringSecret(); err != nil {
-			return fmt.Errorf("could not create the monitoring secret: %v", err)
-		} else {
-			flags := []string{constants.RoleFlagLogin}
-			monitorUser := map[string]spec.PgUser{
-				monitorUsername: {
-					Origin:    spec.RoleOriginInfrastructure,
-					Name:      monitorUsername,
-					Namespace: c.Namespace,
-					Flags:     flags,
-				},
-			}
-			c.pgUsers[monitorUsername] = monitorUser[monitorUsername]
-		}
-		c.logger.Info("monitoring secret was successfully created")
-	} else if newSpec.Spec.Monitoring == nil && oldSpec.Spec.Monitoring != nil {
-		// Delete the monitoring secret
-		if err := c.deleteMonitoringSecret(); err != nil {
-			return fmt.Errorf("could not delete the monitoring secret: %v", err)
-		} else {
-			// Delete the monitoring user
-			monitorUser := c.pgUsers[monitorUsername]
-			monitorUser.Deleted = true
-			c.pgUsers[monitorUsername] = monitorUser
-		}
-		c.logger.Info("monitoring secret was successfully deleted")
-	}
-	return nil
-}
-
 func generateRootCertificate(
 	privateKey *ecdsa.PrivateKey, serialNumber *big.Int,
 ) (*x509.Certificate, error) {