Merge branch 'main' into merge_v10.0

Author: RafiaSabih

pkg/apis/acid.zalan.do/v1/crds.go

@@ -372,6 +372,7 @@ var PostgresCRDResourceValidation = apiextv1.CustomResourceValidation{
 										Ref:     ref("k8s.io/api/core/v1.TopologySpreadConstraint"),
 									},
 								},
+
 							},
 						},
 					},

pkg/apis/acid.zalan.do/v1/postgresql_type.go

@@ -302,3 +302,39 @@ type Configuration struct {
 type TDE struct {
 	Enable bool `json:"enable"`
 }
+
+type Backup struct {
+	Pgbackrest *Pgbackrest `json:"pgbackrest"`
+}
+
+type Pgbackrest struct {
+	Image         string            `json:"image"`
+	Global        map[string]string `json:"global"`
+	Repos         []Repo            `json:"repos"`
+	Restore       Restore           `json:"restore"`
+	Configuration Configuration     `json:"configuration"`
+	Resources     *Resources        `json:"resources,omitempty"`
+}
+
+type Repo struct {
+	Name     string            `json:"name"`
+	Storage  string            `json:"storage"`
+	Resource string            `json:"resource"`
+	Endpoint string            `json:"endpoint"`
+	Region   string            `json:"region"`
+	Schedule map[string]string `json:"schedule"`
+}
+
+type Restore struct {
+	ID      string   `json:"id"`
+	Repo    string   `json:"repo"`
+	Options []string `json:"options"`
+}
+
+type Configuration struct {
+	Secret string `json:"secret"`
+}
+
+type TDE struct {
+	Enable     bool   `json:"enable"`
+}

pkg/cluster/cluster.go

@@ -982,7 +982,6 @@ func (c *Cluster) Update(oldSpec, newSpec *acidv1.Postgresql) error {
 				c.Status.PgbackrestRestoreID = c.Postgresql.Spec.Backup.Pgbackrest.Restore.ID
 				c.logger.Info("a pgbackrest restore config has been successfully synced")
 			}
-
 		} else {
 
 			if err := c.deletePgbackrestConfig(); err != nil {

pkg/cluster/connection_pooler.go

@@ -380,6 +380,7 @@ func (c *Cluster) generateConnectionPoolerPodTemplate(role PostgresRole) (
 	poolerContainer.Env = envVars
 	poolerContainer.VolumeMounts = volumeMounts
 	tolerationsSpec := tolerations(&spec.Tolerations, c.OpConfig.PodToleration)
+
 	securityContext := v1.PodSecurityContext{}
 
 	// determine the User, Group and FSGroup for the pooler pod
@@ -393,6 +394,7 @@ func (c *Cluster) generateConnectionPoolerPodTemplate(role PostgresRole) (
 	if effectiveFSGroup != nil {
 		securityContext.FSGroup = effectiveFSGroup
 	}
+
 	topologySpreadConstraintsSpec := topologySpreadConstraints(&spec.TopologySpreadConstraints)
 
 	podTemplate := &v1.PodTemplateSpec{

pkg/cluster/k8sres.go

@@ -1543,6 +1543,7 @@ func (c *Cluster) generateStatefulSet(spec *acidv1.PostgresSpec) (*appsv1.Statef
 			}
 			resources = *resourceRequirements
 		}
+
 	if c.Postgresql.Spec.Backup != nil && c.Postgresql.Spec.Backup.Pgbackrest != nil {
 
 		pgbackrestRestoreEnvVars := appendEnvVars(
@@ -1625,6 +1626,7 @@ func (c *Cluster) generateStatefulSet(spec *acidv1.PostgresSpec) (*appsv1.Statef
 			}
 			resources = *resourceRequirements
 		}
+
 		initContainers = append(initContainers, v1.Container{
 			Name:         "pgbackrest-restore",
 			Image:        spec.Backup.Pgbackrest.Image,