chore: sync API

Author: CloudNativePG Automated Updates

pkg/api/v1/imagecatalog_types.go

@@ -30,6 +30,26 @@ type ImageCatalogSpec struct {
 	// +kubebuilder:validation:MaxItems=8
 	// +kubebuilder:validation:XValidation:rule="self.all(e, self.filter(f, f.major==e.major).size() == 1)",message=Images must have unique major versions
 	Images []CatalogImage `json:"images"`
+
+	// ComponentImages is a list of named images for components other than PostgreSQL
+	// (e.g. pgbouncer). Keys must be unique within a catalog.
+	// +optional
+	// +listType=map
+	// +listMapKey=key
+	// +kubebuilder:validation:MaxItems=32
+	// +kubebuilder:validation:XValidation:rule="self.all(e, self.filter(f, f.key==e.key).size() == 1)",message="Component image keys must be unique"
+	ComponentImages []CatalogComponentImage `json:"componentImages,omitempty"`
+}
+
+// CatalogComponentImage is a named image entry for a non-PostgreSQL component.
+type CatalogComponentImage struct {
+	// Key is the unique identifier for this image within the catalog.
+	// +kubebuilder:validation:Pattern=`^[a-z0-9]([-a-z0-9]*[a-z0-9])?$`
+	// +kubebuilder:validation:MaxLength=63
+	Key string `json:"key"`
+
+	// Image is the container image reference.
+	Image string `json:"image"`
 }
 
 // CatalogImage defines the image and major version

pkg/api/v1/pooler_types.go

@@ -26,6 +26,30 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
+// PoolerPhase represents the lifecycle phase of a Pooler.
+// +kubebuilder:validation:Enum=active;paused;inactive;failed
+type PoolerPhase string
+
+const (
+	// PoolerPhaseActive means the pooler is running normally and serving traffic.
+	PoolerPhaseActive PoolerPhase = "active"
+
+	// PoolerPhasePaused means PgBouncer is up and running but holding new client
+	// connections in the queue because spec.pgbouncer.paused is true. The Deployment
+	// keeps reconciling; lifting the pause transitions back to Active.
+	PoolerPhasePaused PoolerPhase = "paused"
+
+	// PoolerPhaseInactive means the pooler cannot make progress because a
+	// prerequisite resource is missing (cluster, secret, certificate). The
+	// controller retries periodically until the prerequisite shows up. Check
+	// status.phaseReason for the specific cause.
+	PoolerPhaseInactive PoolerPhase = "inactive"
+
+	// PoolerPhaseFailed means the pooler cannot be reconciled due to a
+	// configuration error. Check status.phaseReason for details.
+	PoolerPhaseFailed PoolerPhase = "failed"
+)
+
 // PoolerType is the type of the connection pool, meaning the service
 // we are targeting. Allowed values are `rw` and `ro`.
 // +kubebuilder:validation:Enum=rw;ro;r
@@ -188,7 +212,21 @@ type ServiceTemplateSpec struct {
 	Spec corev1.ServiceSpec `json:"spec,omitempty"`
 }
 
+// ImageCatalogComponentRef identifies a named image within the componentImages list of an
+// ImageCatalog or ClusterImageCatalog.
+type ImageCatalogComponentRef struct {
+	// +kubebuilder:validation:XValidation:rule="self.kind == 'ImageCatalog' || self.kind == 'ClusterImageCatalog'",message="Only ImageCatalog and ClusterImageCatalog are supported"
+	// +kubebuilder:validation:XValidation:rule="self.apiGroup == 'postgresql.cnpg.io'",message="apiGroup must be postgresql.cnpg.io"
+	corev1.TypedLocalObjectReference `json:",inline"`
+
+	// Key identifies the entry within the catalog's componentImages list.
+	// +kubebuilder:validation:Pattern=`^[a-z0-9]([-a-z0-9]*[a-z0-9])?$`
+	// +kubebuilder:validation:MaxLength=63
+	Key string `json:"key"`
+}
+
 // PgBouncerSpec defines how to configure PgBouncer
+// +kubebuilder:validation:XValidation:rule="!(has(self.image) && has(self.imageCatalogRef))",message="image and imageCatalogRef are mutually exclusive"
 type PgBouncerSpec struct {
 	// The pool mode. Default: `session`.
 	// +kubebuilder:default:=session
@@ -250,16 +288,45 @@ type PgBouncerSpec struct {
 	// +kubebuilder:default:=false
 	// +optional
 	Paused *bool `json:"paused,omitempty"`
+
+	// Image is the pgbouncer container image to use. When set, it takes
+	// precedence over ImageCatalogRef and the operator default, but is
+	// overridden by an explicit image set in the pod template.
+	// +optional
+	Image string `json:"image,omitempty"`
+
+	// ImageCatalogRef points to an entry in an ImageCatalog or ClusterImageCatalog.
+	// Mutually exclusive with Image.
+	// +optional
+	ImageCatalogRef *ImageCatalogComponentRef `json:"imageCatalogRef,omitempty"`
 }
 
 // PoolerStatus defines the observed state of Pooler
 type PoolerStatus struct {
 	// The resource version of the config object
 	// +optional
 	Secrets *PoolerSecrets `json:"secrets,omitempty"`
+
 	// The number of pods trying to be scheduled
 	// +optional
 	Instances int32 `json:"instances,omitempty"`
+
+	// Phase summarizes the overall lifecycle state of the Pooler.
+	// +optional
+	Phase PoolerPhase `json:"phase,omitempty"`
+
+	// PhaseReason is a human-readable explanation of the current Phase.
+	// +optional
+	PhaseReason string `json:"phaseReason,omitempty"`
+
+	// Image is the resolved pgbouncer container image that the operator is
+	// using for this Pooler, including any override coming from spec.template.
+	// While Phase is Active or Paused this field reflects what the Deployment
+	// actually runs; while Phase is Inactive or Failed it may carry the last
+	// successfully resolved value (or be empty if the Pooler has never reconciled
+	// successfully).
+	// +optional
+	Image string `json:"image,omitempty"`
 }
 
 // PoolerSecrets contains the versions of all the secrets used
@@ -310,6 +377,7 @@ type SecretVersion struct {
 // +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
 // +kubebuilder:printcolumn:name="Cluster",type="string",JSONPath=".spec.cluster.name"
 // +kubebuilder:printcolumn:name="Type",type="string",JSONPath=".spec.type"
+// +kubebuilder:printcolumn:name="Phase",type="string",JSONPath=".status.phase"
 // +kubebuilder:subresource:scale:specpath=.spec.instances,statuspath=.status.instances
 
 // Pooler is the Schema for the poolers API