Correct version that supports encrypted backups

Author: johscheuer

api/v1beta2/foundationdb_version.go

@@ -165,5 +165,5 @@ var Versions = struct {
 	SupportsRecoveryState:             Version{api.Version{Major: 7, Minor: 1, Patch: 22}},
 	SupportsLocalityBasedExclusions71: Version{api.Version{Major: 7, Minor: 1, Patch: 42}},
 	SupportsLocalityBasedExclusions:   Version{api.Version{Major: 7, Minor: 3, Patch: 26}},
-	SupportsBackupEncryption:          Version{api.Version{Major: 7, Minor: 3, Patch: 0}},
+	SupportsBackupEncryption:          Version{api.Version{Major: 7, Minor: 4, Patch: 6}},
 }

api/v1beta2/foundationdbbackup_types.go

@@ -99,7 +99,8 @@ type FoundationDBBackupSpec struct {
 	// This is the configuration of the target blobstore for this backup.
 	BlobStoreConfiguration *BlobStoreConfiguration `json:"blobStoreConfiguration,omitempty"`
 
-	// The path to the encryption key used to encrypt the backup.
+	// The path to the encryption key used to encrypt the backup. This feature is only supported in FDB versions 7.4.6
+	// or newer. Older versions will not use this flag.
 	// +kubebuilder:validation:MaxLength=4096
 	EncryptionKeyPath string `json:"encryptionKeyPath,omitempty"`
 

docs/backup_spec.md

@@ -108,7 +108,7 @@ FoundationDBBackupSpec describes the desired state of the backup for a cluster.
 | customParameters | CustomParameters defines additional parameters to pass to the backup agents. | FoundationDBCustomParameters | false |
 | allowTagOverride | This setting defines if a user provided image can have it's own tag rather than getting the provided version appended. You have to ensure that the specified version in the Spec is compatible with the given version in your custom image. **Deprecated: use ImageConfigs instead.** | *bool | false |
 | blobStoreConfiguration | This is the configuration of the target blobstore for this backup. | *[BlobStoreConfiguration](#blobstoreconfiguration) | false |
-| encryptionKeyPath | The path to the encryption key used to encrypt the backup. | string | false |
+| encryptionKeyPath | The path to the encryption key used to encrypt the backup. This feature is only supported in FDB versions 7.4.6 or newer. Older versions will not use this flag. | string | false |
 | mainContainer | MainContainer defines customization for the foundationdb container. Note: The enableTls setting is ignored for backup agents - use TLS environment variables instead. | ContainerOverrides | false |
 | sidecarContainer | SidecarContainer defines customization for the foundationdb-kubernetes-sidecar container. | ContainerOverrides | false |
 | imageType | ImageType defines the image type that should be used for the FoundationDBCluster deployment. When the type is set to \"unified\" the deployment will use the new fdb-kubernetes-monitor. Otherwise the main container and the sidecar container will use different images. Default: split | *ImageType | false |

fdbclient/admin_client_test.go

@@ -1209,15 +1209,15 @@ protocol fdb00b071010000`,
 		),
 		Entry(
 			"version that supports backup encryption without key",
-			"7.3.1",
+			fdbv1beta2.Versions.SupportsBackupEncryption.String(),
 			"",
 			nil,
 			false,
 			false,
 		),
 		Entry(
 			"version that supports backup encryption with key",
-			"7.3.1",
+			fdbv1beta2.Versions.SupportsBackupEncryption.String(),
 			"/path/to/key",
 			nil,
 			true,