Merge pull request #217 from intelligentfu8/master

fdb use selectdb repo
apache · Aug 8, 2024 · 71e597d · 71e597d
2 parents 0872702 + 2168a36
commit 71e597d
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 107 deletions.
diff --git a/config/operator/disaggregated-operator.yaml b/config/operator/disaggregated-operator.yaml
@@ -846,40 +846,6 @@ spec:
         - mountPath: /usr/bin/fdb
           name: fdb-binaries
       initContainers:
-      - args:
-        - --copy-library
-        - "6.2"
-        - --copy-binary
-        - fdbcli
-        - --copy-binary
-        - fdbbackup
-        - --copy-binary
-        - fdbrestore
-        - --output-dir
-        - /var/output-files/6.2.30
-        - --init-mode
-        image: foundationdb/foundationdb-kubernetes-sidecar:6.2.30-1
-        name: foundationdb-kubernetes-init-6-2
-        volumeMounts:
-        - mountPath: /var/output-files
-          name: fdb-binaries
-      - args:
-        - --copy-library
-        - "6.3"
-        - --copy-binary
-        - fdbcli
-        - --copy-binary
-        - fdbbackup
-        - --copy-binary
-        - fdbrestore
-        - --output-dir
-        - /var/output-files/6.3.24
-        - --init-mode
-        image: foundationdb/foundationdb-kubernetes-sidecar:6.3.24-1
-        name: foundationdb-kubernetes-init-6-3
-        volumeMounts:
-        - mountPath: /var/output-files
-          name: fdb-binaries
       - args:
         - --copy-library
         - "7.1"

diff --git a/config/operator/fdb-operator.yaml b/config/operator/fdb-operator.yaml
@@ -219,40 +219,6 @@ spec:
         - mountPath: /usr/bin/fdb
           name: fdb-binaries
       initContainers:
-      - args:
-        - --copy-library
-        - "6.2"
-        - --copy-binary
-        - fdbcli
-        - --copy-binary
-        - fdbbackup
-        - --copy-binary
-        - fdbrestore
-        - --output-dir
-        - /var/output-files/6.2.30
-        - --init-mode
-        image: foundationdb/foundationdb-kubernetes-sidecar:6.2.30-1
-        name: foundationdb-kubernetes-init-6-2
-        volumeMounts:
-        - mountPath: /var/output-files
-          name: fdb-binaries
-      - args:
-        - --copy-library
-        - "6.3"
-        - --copy-binary
-        - fdbcli
-        - --copy-binary
-        - fdbbackup
-        - --copy-binary
-        - fdbrestore
-        - --output-dir
-        - /var/output-files/6.3.24
-        - --init-mode
-        image: foundationdb/foundationdb-kubernetes-sidecar:6.3.24-1
-        name: foundationdb-kubernetes-init-6-3
-        volumeMounts:
-        - mountPath: /var/output-files
-          name: fdb-binaries
       - args:
         - --copy-library
         - "7.1"

diff --git a/pkg/controller/sub_controller/disaggregated_metaservice/fdb/controller.go b/pkg/controller/sub_controller/disaggregated_metaservice/fdb/controller.go
@@ -125,52 +125,28 @@ func (fdbc *DisaggregatedFDBController) buildFDBClusterResource(ddm *mv1.DorisDi
 			SidecarContainer: v1beta2.ContainerOverrides{
 				EnableLivenessProbe:  pointer.Bool(true),
 				EnableReadinessProbe: pointer.Bool(false)},
+
 			Skip:                                false,
 			UseExplicitListenAddress:            pointer.Bool(true),
 			ReplaceInstancesWhenResourcesChange: pointer.Bool(true),
 		},
 	}
 
-	if ddm.Spec.FDB.Image != "" {
-		bi, v, err := imageSplit(ddm.Spec.FDB.Image)
-		if err != nil {
-			klog.Infof("disaggregatedFDBController split config image error, err=%s", err.Error())
-			fdbc.k8sRecorder.Event(ddm, "Warning", string(sc.ImageFormatError), ddm.Spec.FDB.Image+" format not provided, please reference docker definition.")
-			return fdb
-
-		}
-
-		co := v1beta2.ContainerOverrides{
-			ImageConfigs: []v1beta2.ImageConfig{
-				v1beta2.ImageConfig{
-					Version:   v,
-					BaseImage: bi,
-				},
-			},
-		}
-
-		fdb.Spec.MainContainer = co
+	mainContainer, err := fdbImageOverride(ddm.Spec.FDB.Image)
+	if err != nil {
+		klog.Infof("disaggregatedFDBController split config Image error, err=%s", err.Error())
+		fdbc.k8sRecorder.Event(ddm, "Warning", string(sc.ImageFormatError), ddm.Spec.FDB.Image+" format not provided, please reference docker definition.")
+		return fdb
 	}
+	fdb.Spec.MainContainer = mainContainer
 
-	if ddm.Spec.FDB.SidecarImage != "" {
-		sidecarImage, sidecarImageVersion, err := imageSplit(ddm.Spec.FDB.SidecarImage)
-		if err != nil {
-			klog.Infof("disaggregatedFDBController split config SidecarImage error, err=%s", err.Error())
-			fdbc.k8sRecorder.Event(ddm, "Warning", string(sc.ImageFormatError), ddm.Spec.FDB.SidecarImage+" format not provided, please reference docker definition.")
-			return fdb
-
-		}
-		sidecarContainer := v1beta2.ContainerOverrides{
-			ImageConfigs: []v1beta2.ImageConfig{
-				v1beta2.ImageConfig{
-					Version:   sidecarImageVersion,
-					BaseImage: sidecarImage,
-				},
-			},
-		}
-		fdb.Spec.SidecarContainer = sidecarContainer
+	sidecarContainer, err := fdbSidecarImageOverride(ddm.Spec.FDB.SidecarImage)
+	if err != nil {
+		klog.Infof("disaggregatedFDBController split config SidecarImage error, err=%s", err.Error())
+		fdbc.k8sRecorder.Event(ddm, "Warning", string(sc.ImageFormatError), ddm.Spec.FDB.SidecarImage+" format not provided, please reference docker definition.")
+		return fdb
 	}
-
+	fdb.Spec.SidecarContainer = sidecarContainer
 	return fdb
 }
 

diff --git a/pkg/controller/sub_controller/disaggregated_metaservice/fdb/util.go b/pkg/controller/sub_controller/disaggregated_metaservice/fdb/util.go
@@ -20,18 +20,63 @@ package fdb
 import (
 	"errors"
 	"fmt"
+	"github.com/FoundationDB/fdb-kubernetes-operator/api/v1beta2"
+	"k8s.io/klog/v2"
 	"strings"
 )
 
+const (
+	DefaultFDBImage        = "selectdb/foundationdb:7.1.38"
+	DefaultFDBSidecarImage = "selectdb/foundationdb-kubernetes-sidecar:7.1.36-1"
+)
+
 // use ":" as IPS to split image as baseimage and version.
-func imageSplit(image string) (baseImage, version string, err error) {
+func imageSplit(image string) (baseImage, tag string, err error) {
 	isa := strings.Split(image, ":")
 	if len(isa) == 0 {
 		err = errors.New(fmt.Sprintf("the image = %s format is not provided. please reference docker format.", image))
 		return
 	}
 
 	baseImage = isa[0]
-	version = isa[1]
+	tag = isa[1]
 	return
 }
+
+func fdbImageOverride(image string) (v1beta2.ContainerOverrides, error) {
+	if image == "" {
+		image = DefaultFDBImage
+	}
+
+	return newContainerOverride(image)
+}
+
+func newContainerOverride(image string) (v1beta2.ContainerOverrides, error) {
+	if image == "" {
+		return v1beta2.ContainerOverrides{}, errors.New("image is empty")
+	}
+
+	bi, tag, err := imageSplit(image)
+	if err != nil {
+		klog.Infof("disaggregatedFDBController split config image error, err=%s", err.Error())
+		return v1beta2.ContainerOverrides{}, err
+
+	}
+
+	return v1beta2.ContainerOverrides{
+		ImageConfigs: []v1beta2.ImageConfig{
+			v1beta2.ImageConfig{
+				BaseImage: bi,
+				Tag:       tag,
+			},
+		},
+	}, nil
+}
+
+func fdbSidecarImageOverride(image string) (v1beta2.ContainerOverrides, error) {
+	if image == "" {
+		image = DefaultFDBSidecarImage
+	}
+
+	return newContainerOverride(image)
+}