From a9e268f8067213272f0d55e9d124c1c22a0bb142 Mon Sep 17 00:00:00 2001 From: Han Xu Date: Thu, 14 Aug 2025 23:00:41 +0800 Subject: [PATCH 1/5] update default image --- api/v1beta2/foundationdbbackup_types.go | 2 +- controllers/backup_controller_test.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/api/v1beta2/foundationdbbackup_types.go b/api/v1beta2/foundationdbbackup_types.go index d6a452490..1054b46dc 100644 --- a/api/v1beta2/foundationdbbackup_types.go +++ b/api/v1beta2/foundationdbbackup_types.go @@ -338,7 +338,7 @@ func (foundationDBBackupSpec *FoundationDBBackupSpec) GetAllowTagOverride() bool // UseUnifiedImage returns true if the unified image should be used. func (backup *FoundationDBBackup) UseUnifiedImage() bool { - imageType := ImageTypeSplit + imageType := ImageTypeUnified if backup.Spec.ImageType != nil { imageType = *backup.Spec.ImageType } diff --git a/controllers/backup_controller_test.go b/controllers/backup_controller_test.go index 5b4d98ce7..15dbfbade 100644 --- a/controllers/backup_controller_test.go +++ b/controllers/backup_controller_test.go @@ -151,7 +151,7 @@ var _ = Describe("backup_controller", func() { Expect(*deployment.Spec.Replicas).To(Equal(int32(3))) Expect( deployment.Spec.Template.Spec.Containers[0].Image, - ).To(Equal(fmt.Sprintf("foundationdb/foundationdb:%s", cluster.Spec.Version))) + ).To(Equal(fmt.Sprintf("foundationdb/fdb-kubernetes-monitor:%s", cluster.Spec.Version))) }) It("should update the status on the resource", func() { @@ -319,7 +319,7 @@ var _ = Describe("backup_controller", func() { Expect(deployments.Items[0].ObjectMeta.Annotations).To(Equal(map[string]string{ "fdb-test-1": "test-value-1", "fdb-test-2": "test-value-2", - "foundationdb.org/last-applied-spec": "8d2e3abf517313fabdf4e19e50b46f9d5b63e5c5d587a01565008945a2dec87f", + "foundationdb.org/last-applied-spec": "946b41ecc6985d5f56d9749e9366132ba4e8cb250eb3bcfe73b037ad1f47c7f4", })) }) }) From bc584f6236fa03a03812d6a4adddb0df27795e72 Mon Sep 17 00:00:00 2001 From: Han Xu Date: Tue, 2 Sep 2025 09:39:13 +0800 Subject: [PATCH 2/5] Update tests --- internal/pod_models_test.go | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/internal/pod_models_test.go b/internal/pod_models_test.go index 4873d2600..b3413b220 100644 --- a/internal/pod_models_test.go +++ b/internal/pod_models_test.go @@ -3576,7 +3576,7 @@ var _ = Describe("pod_models", func() { fdbv1beta2.BackupDeploymentLabel: string(cluster.ObjectMeta.UID), })) Expect(deployment.ObjectMeta.Annotations).To(Equal(map[string]string{ - "foundationdb.org/last-applied-spec": "8d2e3abf517313fabdf4e19e50b46f9d5b63e5c5d587a01565008945a2dec87f", + "foundationdb.org/last-applied-spec": "946b41ecc6985d5f56d9749e9366132ba4e8cb250eb3bcfe73b037ad1f47c7f4", })) }) @@ -3639,7 +3639,7 @@ var _ = Describe("pod_models", func() { It("should set the image and command for the backup agent", func() { Expect( container.Image, - ).To(Equal(fmt.Sprintf("foundationdb/foundationdb:%s", cluster.Spec.Version))) + ).To(Equal(fmt.Sprintf("foundationdb/fdb-kubernetes-monitor:%s", cluster.Spec.Version))) Expect(container.Command).To(Equal([]string{"backup_agent"})) Expect(container.Args).To(Equal([]string{ "--log", @@ -3690,7 +3690,7 @@ var _ = Describe("pod_models", func() { It("should set the image and command for the container", func() { Expect( container.Image, - ).To(Equal(fmt.Sprintf("foundationdb/foundationdb-kubernetes-sidecar:%s-1", cluster.Spec.Version))) + ).To(Equal(fmt.Sprintf("foundationdb/fdb-kubernetes-monitor:%s", cluster.Spec.Version))) Expect(container.Args).To(Equal([]string{ "--copy-file", "fdb.cluster", @@ -3897,7 +3897,7 @@ var _ = Describe("pod_models", func() { "foundationdb.org/backup-for": string(cluster.ObjectMeta.UID), })) Expect(deployment.ObjectMeta.Annotations).To(Equal(map[string]string{ - "foundationdb.org/last-applied-spec": "879780b88956de7a05e245cdbf16c565b95fe5c956e3a89e7ea259cd9b209d97", + "foundationdb.org/last-applied-spec": "23b6a2501f83a4cfcf760f639b1d841203ef4f44d496da072ebd1542870ad53f", })) Expect( @@ -3925,7 +3925,7 @@ var _ = Describe("pod_models", func() { ).To(Equal("foundationdb/foundationdb:dev")) Expect( deployment.Spec.Template.Spec.InitContainers[0].Image, - ).To(Equal("foundationdb/foundationdb-kubernetes-sidecar:dev-1")) + ).To(Equal("foundationdb/foundationdb:dev")) }) }) @@ -3963,22 +3963,22 @@ var _ = Describe("pod_models", func() { }) }) - When("using the unified image", func() { + When("using the split image", func() { BeforeEach(func() { - imageType := fdbv1beta2.ImageTypeUnified + imageType := fdbv1beta2.ImageTypeSplit backup.Spec.ImageType = &imageType deployment, err = GetBackupDeployment(backup) Expect(err).NotTo(HaveOccurred()) Expect(deployment).NotTo(BeNil()) }) - It("should use the unified image as main and init container", func() { + It("should use the split image as main container and the sidecar image as the init container", func() { Expect(deployment.Spec.Template.Spec.InitContainers).To(HaveLen(1)) Expect(deployment.Spec.Template.Spec.Containers).To(HaveLen(1)) Expect( deployment.Spec.Template.Spec.InitContainers[0].Image, - ).To(HavePrefix(fdbv1beta2.FoundationDBKubernetesBaseImage)) + ).To(HavePrefix(fdbv1beta2.FoundationDBSidecarBaseImage)) Expect(deployment.Spec.Template.Spec.InitContainers[0].Args).To(ConsistOf( "--copy-file", "fdb.cluster", @@ -3992,7 +3992,7 @@ var _ = Describe("pod_models", func() { "/var/input-files")) Expect( deployment.Spec.Template.Spec.Containers[0].Image, - ).To(HavePrefix(fdbv1beta2.FoundationDBKubernetesBaseImage)) + ).To(HavePrefix(fdbv1beta2.FoundationDBBaseImage)) }) }) }) From 2c721a593dd3e0f1e32b1426c27a90a9485d89e5 Mon Sep 17 00:00:00 2001 From: Han Xu Date: Tue, 2 Sep 2025 09:46:07 +0800 Subject: [PATCH 3/5] fix test --- internal/pod_models_test.go | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/internal/pod_models_test.go b/internal/pod_models_test.go index b3413b220..a04f8be6e 100644 --- a/internal/pod_models_test.go +++ b/internal/pod_models_test.go @@ -2958,23 +2958,23 @@ var _ = Describe("pod_models", func() { Expect(sidecarContainer.Env).To(Equal([]corev1.EnvVar{ { Name: fdbv1beta2.EnvNamePublicIP, ValueFrom: &corev1.EnvVarSource{ - FieldRef: &corev1.ObjectFieldSelector{FieldPath: "status.podIP"}, - }, + FieldRef: &corev1.ObjectFieldSelector{FieldPath: "status.podIP"}, + }, }, { Name: fdbv1beta2.EnvNamePodIP, ValueFrom: &corev1.EnvVarSource{ - FieldRef: &corev1.ObjectFieldSelector{FieldPath: "status.podIP"}, - }, + FieldRef: &corev1.ObjectFieldSelector{FieldPath: "status.podIP"}, + }, }, { Name: fdbv1beta2.EnvNameMachineID, ValueFrom: &corev1.EnvVarSource{ - FieldRef: &corev1.ObjectFieldSelector{FieldPath: "metadata.name"}, - }, + FieldRef: &corev1.ObjectFieldSelector{FieldPath: "metadata.name"}, + }, }, { Name: fdbv1beta2.EnvNameZoneID, ValueFrom: &corev1.EnvVarSource{ - FieldRef: &corev1.ObjectFieldSelector{FieldPath: "metadata.name"}, - }, + FieldRef: &corev1.ObjectFieldSelector{FieldPath: "metadata.name"}, + }, }, { Name: fdbv1beta2.EnvNameInstanceID, @@ -3696,7 +3696,12 @@ var _ = Describe("pod_models", func() { "fdb.cluster", "--require-not-empty", "fdb.cluster", - "--init-mode", + "--mode", + "init", + "--output-dir", + "/var/output-files", + "--input-dir", + "/var/input-files", })) }) @@ -3984,12 +3989,8 @@ var _ = Describe("pod_models", func() { "fdb.cluster", "--require-not-empty", "fdb.cluster", - "--mode", - "init", - "--output-dir", - "/var/output-files", - "--input-dir", - "/var/input-files")) + "--init-mode", + )) Expect( deployment.Spec.Template.Spec.Containers[0].Image, ).To(HavePrefix(fdbv1beta2.FoundationDBBaseImage)) From e30ea1c257603b228e07dffcc2f2e7b240118520 Mon Sep 17 00:00:00 2001 From: Han Xu Date: Tue, 2 Sep 2025 09:56:01 +0800 Subject: [PATCH 4/5] Revert formatting changes --- internal/pod_models_test.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/internal/pod_models_test.go b/internal/pod_models_test.go index a04f8be6e..7258a9f50 100644 --- a/internal/pod_models_test.go +++ b/internal/pod_models_test.go @@ -2958,23 +2958,23 @@ var _ = Describe("pod_models", func() { Expect(sidecarContainer.Env).To(Equal([]corev1.EnvVar{ { Name: fdbv1beta2.EnvNamePublicIP, ValueFrom: &corev1.EnvVarSource{ - FieldRef: &corev1.ObjectFieldSelector{FieldPath: "status.podIP"}, - }, + FieldRef: &corev1.ObjectFieldSelector{FieldPath: "status.podIP"}, + }, }, { Name: fdbv1beta2.EnvNamePodIP, ValueFrom: &corev1.EnvVarSource{ - FieldRef: &corev1.ObjectFieldSelector{FieldPath: "status.podIP"}, - }, + FieldRef: &corev1.ObjectFieldSelector{FieldPath: "status.podIP"}, + }, }, { Name: fdbv1beta2.EnvNameMachineID, ValueFrom: &corev1.EnvVarSource{ - FieldRef: &corev1.ObjectFieldSelector{FieldPath: "metadata.name"}, - }, + FieldRef: &corev1.ObjectFieldSelector{FieldPath: "metadata.name"}, + }, }, { Name: fdbv1beta2.EnvNameZoneID, ValueFrom: &corev1.EnvVarSource{ - FieldRef: &corev1.ObjectFieldSelector{FieldPath: "metadata.name"}, - }, + FieldRef: &corev1.ObjectFieldSelector{FieldPath: "metadata.name"}, + }, }, { Name: fdbv1beta2.EnvNameInstanceID, From bfb1b379683ac47d6e44275a5ee6607d88b89eaa Mon Sep 17 00:00:00 2001 From: Han Xu Date: Tue, 2 Sep 2025 19:37:13 +0800 Subject: [PATCH 5/5] format --- internal/pod_models_test.go | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/internal/pod_models_test.go b/internal/pod_models_test.go index 7258a9f50..e7f3599e6 100644 --- a/internal/pod_models_test.go +++ b/internal/pod_models_test.go @@ -3977,24 +3977,27 @@ var _ = Describe("pod_models", func() { Expect(deployment).NotTo(BeNil()) }) - It("should use the split image as main container and the sidecar image as the init container", func() { - Expect(deployment.Spec.Template.Spec.InitContainers).To(HaveLen(1)) - Expect(deployment.Spec.Template.Spec.Containers).To(HaveLen(1)) + It( + "should use the split image as main container and the sidecar image as the init container", + func() { + Expect(deployment.Spec.Template.Spec.InitContainers).To(HaveLen(1)) + Expect(deployment.Spec.Template.Spec.Containers).To(HaveLen(1)) - Expect( - deployment.Spec.Template.Spec.InitContainers[0].Image, - ).To(HavePrefix(fdbv1beta2.FoundationDBSidecarBaseImage)) - Expect(deployment.Spec.Template.Spec.InitContainers[0].Args).To(ConsistOf( - "--copy-file", - "fdb.cluster", - "--require-not-empty", - "fdb.cluster", - "--init-mode", - )) - Expect( - deployment.Spec.Template.Spec.Containers[0].Image, - ).To(HavePrefix(fdbv1beta2.FoundationDBBaseImage)) - }) + Expect( + deployment.Spec.Template.Spec.InitContainers[0].Image, + ).To(HavePrefix(fdbv1beta2.FoundationDBSidecarBaseImage)) + Expect(deployment.Spec.Template.Spec.InitContainers[0].Args).To(ConsistOf( + "--copy-file", + "fdb.cluster", + "--require-not-empty", + "fdb.cluster", + "--init-mode", + )) + Expect( + deployment.Spec.Template.Spec.Containers[0].Image, + ).To(HavePrefix(fdbv1beta2.FoundationDBBaseImage)) + }, + ) }) })