Merge branch 'main' into hxu/backup-default-image-type

Author: johscheuer

Dockerfile

@@ -4,7 +4,7 @@ ARG FDB_VERSION=7.1.67
 ARG FDB_WEBSITE=https://github.com/apple/foundationdb/releases/download
 
 # Build the manager binary
-FROM docker.io/library/golang:1.24.6 AS builder
+FROM docker.io/library/golang:1.24.6-bookworm AS builder
 
 ARG FDB_VERSION
 ARG FDB_WEBSITE

api/v1beta2/foundationdb_process_class.go

@@ -27,6 +27,8 @@ import (
 // ProcessClass models the class of a pod
 type ProcessClass string
 
+// See https://github.com/apple/foundationdb/blob/release-7.1/fdbrpc/Locality.cpp for additional information regarding the
+// process classes and process roles.
 const (
 	// ProcessClassStorage model for FDB class storage
 	ProcessClassStorage ProcessClass = "storage"
@@ -50,6 +52,8 @@ const (
 	ProcessClassCommitProxy ProcessClass = "commit_proxy"
 	// ProcessClassGrvProxy model for FDB grv_proxy processes
 	ProcessClassGrvProxy ProcessClass = "grv_proxy"
+	// ProcessClassBackup model for FDB backup processes
+	ProcessClassBackup ProcessClass = "backup"
 )
 
 // IsStateful determines whether a process class should store data.

api/v1beta2/foundationdbbackup_types.go

@@ -30,7 +30,7 @@ import (
 // +kubebuilder:object:root=true
 // +kubebuilder:resource:shortName=fdbbackup
 // +kubebuilder:subresource:status
-// +kubebuilder:metadata:annotations="foundationdb.org/release=v2.11.0"
+// +kubebuilder:metadata:annotations="foundationdb.org/release=v2.12.0"
 // +kubebuilder:printcolumn:name="Generation",type="integer",JSONPath=".metadata.generation",description="Latest generation of the spec",priority=0
 // +kubebuilder:printcolumn:name="Reconciled",type="integer",JSONPath=".status.generations.reconciled",description="Last reconciled generation of the spec",priority=0
 // +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
@@ -117,8 +117,30 @@ type FoundationDBBackupSpec struct {
 	// +kubebuilder:validation:Enum=split;unified
 	// +kubebuilder:default:=split
 	ImageType *ImageType `json:"imageType,omitempty"`
+
+	// BackupType defines the backup type that should be used for the backup. When the BackupType is set to
+	// BackupTypePartitionedLog, it's expected that the FoundationDBCluster creates and manages the additional
+	// backup worker processes. A migration to a different backup type is not yet supported in the operator.
+	// Default: "backup_agent".
+	// +kubebuilder:validation:Optional
+	// +kubebuilder:validation:Enum=backup_agent;partitioned_log
+	// +kubebuilder:default:=backup_agent
+	BackupType *BackupType `json:"backupType,omitempty"`
 }
 
+// BackupType defines the backup type that should be used for the backup.
+// +kubebuilder:validation:MaxLength=64
+type BackupType string
+
+const (
+	// BackupTypeDefault refers to the current default backup type with additional backup agents.
+	BackupTypeDefault BackupType = "backup_agent"
+
+	// BackupTypePartitionedLog refers to the new partitioned log backup system, see
+	// https://github.com/apple/foundationdb/blob/main/design/backup_v2_partitioned_logs.md.
+	BackupTypePartitionedLog BackupType = "partitioned_log"
+)
+
 // FoundationDBBackupStatus describes the current status of the backup for a cluster.
 type FoundationDBBackupStatus struct {
 	// AgentCount provides the number of agents that are up-to-date, ready,
@@ -279,6 +301,18 @@ type FoundationDBLiveBackupStatus struct {
 type FoundationDBLiveBackupStatusState struct {
 	// Running determines whether the backup is currently running.
 	Running bool `json:"Running,omitempty"`
+
+	// Restorable if true, the backup can be restored
+	Restorable *bool `json:"Restorable,omitempty"`
+
+	// LatestRestorablePoint contains information about the latest restorable point if any exists.
+	LatestRestorablePoint *LatestRestorablePoint `json:"LatestRestorablePoint,omitempty"`
+}
+
+// LatestRestorablePoint contains information about the latest restorable point if any exists.
+type LatestRestorablePoint struct {
+	// Version is the version that can be restored to.
+	Version *uint64 `json:"Version,omitempty"`
 }
 
 // GetDesiredAgentCount determines how many backup agents we should run
@@ -331,11 +365,34 @@ func (backup *FoundationDBBackup) CheckReconciliation() (bool, error) {
 	return reconciled, nil
 }
 
+// GetBackupType returns the backup type for the backup.
+func (backup *FoundationDBBackup) GetBackupType() BackupType {
+	if backup.Spec.BackupType != nil {
+		return *backup.Spec.BackupType
+	}
+
+	return BackupTypeDefault
+}
+
 // GetAllowTagOverride returns the bool value for AllowTagOverride
 func (foundationDBBackupSpec *FoundationDBBackupSpec) GetAllowTagOverride() bool {
 	return ptr.Deref(foundationDBBackupSpec.AllowTagOverride, false)
 }
 
+// GetEncryptionKey returns the encryption key path if the current version supports encrypted backups.
+func (backup *FoundationDBBackup) GetEncryptionKey() (string, error) {
+	fdbVersion, err := ParseFdbVersion(backup.Spec.Version)
+	if err != nil {
+		return "", err
+	}
+
+	if !fdbVersion.SupportsBackupEncryption() {
+		return "", nil
+	}
+
+	return backup.Spec.EncryptionKeyPath, nil
+}
+
 // UseUnifiedImage returns true if the unified image should be used.
 func (backup *FoundationDBBackup) UseUnifiedImage() bool {
 	imageType := ImageTypeUnified

api/v1beta2/foundationdbcluster_types.go

@@ -39,7 +39,7 @@ import (
 // +kubebuilder:object:root=true
 // +kubebuilder:resource:shortName=fdb
 // +kubebuilder:subresource:status
-// +kubebuilder:metadata:annotations="foundationdb.org/release=v2.11.0"
+// +kubebuilder:metadata:annotations="foundationdb.org/release=v2.12.0"
 // +kubebuilder:printcolumn:name="Generation",type="integer",JSONPath=".metadata.generation",description="Latest generation of the spec",priority=0
 // +kubebuilder:printcolumn:name="Reconciled",type="integer",JSONPath=".status.generations.reconciled",description="Last reconciled generation of the spec",priority=0
 // +kubebuilder:printcolumn:name="Available",type="boolean",JSONPath=".status.health.available",description="Database available",priority=0

api/v1beta2/foundationdbrestore_types.go

@@ -23,7 +23,7 @@ import (
 // +kubebuilder:object:root=true
 // +kubebuilder:resource:shortName=fdbrestore
 // +kubebuilder:subresource:status
-// +kubebuilder:metadata:annotations="foundationdb.org/release=v2.11.0"
+// +kubebuilder:metadata:annotations="foundationdb.org/release=v2.12.0"
 // +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
 // +kubebuilder:printcolumn:name="State",type=string,JSONPath=`.status.state`
 // +kubebuilder:storageversion

api/v1beta2/zz_generated.deepcopy.go

@@ -18,6 +18,6 @@ type: application
 version: 0.2.0
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.
-appVersion: v2.11.0
+appVersion: v2.12.0
 maintainers:
   - name: "foundationdb-ci"

charts/fdb-operator/Chart.yaml

@@ -1,7 +1,7 @@
 ---
 image:
   repository: foundationdb/fdb-kubernetes-operator
-  tag: v2.11.0
+  tag: v2.12.0
   pullPolicy: IfNotPresent
 initContainers:
   7.1:

charts/fdb-operator/values.yaml

@@ -4,7 +4,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.18.0
-    foundationdb.org/release: v2.11.0
+    foundationdb.org/release: v2.12.0
   name: foundationdbbackups.apps.foundationdb.org
 spec:
   group: apps.foundationdb.org
@@ -71,6 +71,13 @@ spec:
                 - Stopped
                 - Paused
                 type: string
+              backupType:
+                default: backup_agent
+                enum:
+                - backup_agent
+                - partitioned_log
+                maxLength: 64
+                type: string
               blobStoreConfiguration:
                 properties:
                   accountName:

config/crd/bases/apps.foundationdb.org_foundationdbbackups.yaml

@@ -4,7 +4,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.18.0
-    foundationdb.org/release: v2.11.0
+    foundationdb.org/release: v2.12.0
   name: foundationdbclusters.apps.foundationdb.org
 spec:
   group: apps.foundationdb.org