Remove Pgpool pcp service

Signed-off-by: MobarakHsn <[email protected]>
kubedb · May 31, 2024 · e26fa91 · e26fa91
1 parent 063e5bd
commit e26fa91
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 15 deletions.
diff --git a/apis/kubedb/v1alpha2/constants.go b/apis/kubedb/v1alpha2/constants.go
@@ -579,7 +579,7 @@ const (
 	PgpoolContainerName                = "pgpool"
 	PgpoolDefaultServicePort           = 9999
 	PgpoolMonitoringDefaultServicePort = 9719
-	PgpoolPcpServicePort               = 9595
+	PgpoolPcpPort                      = 9595
 	PgpoolExporterDatabase             = "postgres"
 	EnvPgpoolExporterDatabase          = "POSTGRES_DATABASE"
 	EnvPgpoolService                   = "PGPOOL_SERVICE"
@@ -597,7 +597,7 @@ const (
 	PgpoolRootUser                     = "postgres"
 	PgpoolPrimaryServicePortName       = "primary"
 	PgpoolDatabasePortName             = "db"
-	PgpoolPcpServicePortName           = "pcp"
+	PgpoolPcpPortName                  = "pcp"
 	PgpoolCustomConfigFile             = "pgpool.conf"
 	// ========================================== ZooKeeper Constants =================================================//
 

diff --git a/apis/kubedb/v1alpha2/pgpool_helpers.go b/apis/kubedb/v1alpha2/pgpool_helpers.go
@@ -104,10 +104,6 @@ func (p *Pgpool) ServiceName() string {
 	return p.OffshootName()
 }
 
-func (p *Pgpool) PcpServiceName() string {
-	return meta_util.NameWithSuffix(p.ServiceName(), "pcp")
-}
-
 // Owner returns owner reference to resources
 func (p *Pgpool) Owner() *meta.OwnerReference {
 	return meta.NewControllerRef(p, SchemeGroupVersion.WithKind(p.ResourceKind()))

diff --git a/apis/kubedb/v1alpha2/types.go b/apis/kubedb/v1alpha2/types.go
@@ -131,7 +131,6 @@ const (
 	PrimaryServiceAlias ServiceAlias = "primary"
 	StandbyServiceAlias ServiceAlias = "standby"
 	StatsServiceAlias   ServiceAlias = "stats"
-	PcpServiceAlias     ServiceAlias = "pcp"
 )
 
 // +kubebuilder:validation:Enum=DNS;IP;IPv4;IPv6

diff --git a/apis/ops/v1alpha1/openapi_generated.go b/apis/ops/v1alpha1/openapi_generated.go
diff --git a/apis/ops/v1alpha1/pgpool_ops_types.go b/apis/ops/v1alpha1/pgpool_ops_types.go
@@ -77,10 +77,25 @@ type PgpoolVerticalScalingSpec struct {
 	Node *PodResources `json:"node,omitempty"`
 }
 
+// PgpoolCustomConfigurationSpec is the spec for Reconfiguring the Pgpool Settings
 type PgpoolCustomConfigurationSpec struct {
-	ConfigSecret       *core.LocalObjectReference `json:"configSecret,omitempty"`
-	ApplyConfig        map[string]string          `json:"applyConfig,omitempty"`
-	RemoveCustomConfig bool                       `json:"removeCustomConfig,omitempty"`
+	// ConfigSecret is an optional field to provide custom configuration file for Pgpool.
+	// +optional
+	ConfigSecret *core.LocalObjectReference `json:"configSecret,omitempty"`
+	// ApplyConfig is an optional field to provide Pgpool configuration.
+	// Provided configuration will be applied to config files stored in ConfigSecret.
+	// If the ConfigSecret is missing, the operator will create a new k8s secret by the
+	// following naming convention: {db-name}-config or use the previous init config if it exists.
+	// Expected input format:
+	// applyConfig:
+	//   pgpool.conf: |-
+	//     memory_cache_enabled = off
+	// +optional
+	ApplyConfig map[string]string `json:"applyConfig,omitempty"`
+	// If set to "true", the user provided configuration via custom config and init config will be removed.
+	// Then Pgpool will start with default configuration that is generated by the operator.
+	// +optional
+	RemoveCustomConfig bool `json:"removeCustomConfig,omitempty"`
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object