Merge branch 'main' into support/improve-backup-refactor

.github/workflows/cicd-pull-request.yml

@@ -156,7 +156,7 @@ jobs:
     if: contains(needs.trigger-mode.outputs.trigger-mode, '[docker]')
     uses: apecloud/apecloud-cd/.github/workflows/[email protected]
     with:
-      MAKE_OPS_PRE: "generate test-go-generate"
+      MAKE_OPS_PRE: "module generate test-go-generate"
       IMG: "apecloud/kubeblocks-tools"
       GO_VERSION: "1.21"
       BUILDX_PLATFORMS: "linux/amd64"

.github/workflows/cicd-push.yml

@@ -205,7 +205,7 @@ jobs:
     if: ${{ contains(needs.trigger-mode.outputs.trigger-mode, '[docker]') }}
     uses: apecloud/apecloud-cd/.github/workflows/[email protected]
     with:
-      MAKE_OPS_PRE: "generate test-go-generate"
+      MAKE_OPS_PRE: "module generate test-go-generate"
       IMG: "apecloud/kubeblocks-tools"
       GO_VERSION: "1.21"
       BUILDX_PLATFORMS: "linux/amd64"

.github/workflows/release-image.yml

@@ -54,7 +54,7 @@ jobs:
     needs: image-tag
     uses: apecloud/apecloud-cd/.github/workflows/[email protected]
     with:
-      MAKE_OPS_PRE: "generate test-go-generate"
+      MAKE_OPS_PRE: "module generate test-go-generate"
       IMG: "apecloud/kubeblocks-tools"
       VERSION: "${{ needs.image-tag.outputs.tag-name }}"
       GO_VERSION: "1.21"

apis/apps/v1alpha1/config.go

@@ -72,10 +72,11 @@ package v1alpha1
 
 // ConfigurationPhase defines the Configuration FSM phase
 // +enum
-// +kubebuilder:validation:Enum={Init,Running,Pending,Merged,MergeFailed,FailedAndPause,Upgrading,Deleting,FailedAndRetry,Finished}
+// +kubebuilder:validation:Enum={Creating,Init,Running,Pending,Merged,MergeFailed,FailedAndPause,Upgrading,Deleting,FailedAndRetry,Finished}
 type ConfigurationPhase string
 
 const (
+	CCreatingPhase       ConfigurationPhase = "Creating"
 	CInitPhase           ConfigurationPhase = "Init"
 	CRunningPhase        ConfigurationPhase = "Running"
 	CPendingPhase        ConfigurationPhase = "Pending"

config/crd/bases/apps.kubeblocks.io_configurations.yaml

@@ -310,6 +310,7 @@ spec:
                     phase:
                       description: phase is status of configurationItem.
                       enum:
+                      - Creating
                       - Init
                       - Running
                       - Pending

controllers/apps/configuration/configuration_controller.go

@@ -107,7 +107,7 @@ func (r *ConfigurationReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 		return r.failWithInvalidComponent(configuration, reqCtx)
 	}
 
-	if err := r.runTasks(reqCtx, configuration, fetcherTask, tasks); err != nil {
+	if err := r.runTasks(TaskContext{configuration, reqCtx, fetcherTask}, tasks); err != nil {
 		return intctrlutil.CheckedRequeueWithError(err, reqCtx.Log, "failed to run configuration reconcile task.")
 	}
 	if !isAllReady(configuration) {
@@ -130,55 +130,52 @@ func (r *ConfigurationReconciler) failWithInvalidComponent(configuration *appsv1
 func isAllReady(configuration *appsv1alpha1.Configuration) bool {
 	for _, item := range configuration.Spec.ConfigItemDetails {
 		itemStatus := configuration.Status.GetItemStatus(item.Name)
-		if itemStatus == nil || itemStatus.Phase != appsv1alpha1.CFinishedPhase {
+		if itemStatus != nil && !isFinishStatus(itemStatus.Phase) {
 			return false
 		}
 	}
 	return true
 }
 
-func (r *ConfigurationReconciler) runTasks(
-	reqCtx intctrlutil.RequestCtx,
-	configuration *appsv1alpha1.Configuration,
-	fetcher *Task,
-	tasks []Task) (err error) {
-	var errs []error
-	var synthesizedComp *component.SynthesizedComponent
-
-	synthesizedComp, err = component.BuildComponent(reqCtx, nil,
-		fetcher.ClusterObj,
-		fetcher.ClusterDefObj,
-		fetcher.ClusterDefComObj,
-		fetcher.ClusterComObj,
+func (r *ConfigurationReconciler) runTasks(taskCtx TaskContext, tasks []Task) (err error) {
+	var (
+		errs            []error
+		synthesizedComp *component.SynthesizedComponent
+
+		ctx           = taskCtx.reqCtx.Ctx
+		configuration = taskCtx.configuration
+	)
+
+	synthesizedComp, err = component.BuildComponent(taskCtx.reqCtx,
+		nil,
+		taskCtx.fetcher.ClusterObj,
+		taskCtx.fetcher.ClusterDefObj,
+		taskCtx.fetcher.ClusterDefComObj,
+		taskCtx.fetcher.ClusterComObj,
 		nil,
-		fetcher.ClusterVerComObj)
+		taskCtx.fetcher.ClusterVerComObj)
 	if err != nil {
 		return err
 	}
 
+	// TODO manager multiple version
 	patch := client.MergeFrom(configuration.DeepCopy())
 	revision := strconv.FormatInt(configuration.GetGeneration(), 10)
 	for _, task := range tasks {
-		if err := task.Do(fetcher, synthesizedComp, revision); err != nil {
+		task.Status.UpdateRevision = revision
+		if err := task.Do(taskCtx.fetcher, synthesizedComp, revision); err != nil {
 			task.Status.Phase = appsv1alpha1.CMergeFailedPhase
 			task.Status.Message = cfgutil.ToPointer(err.Error())
 			errs = append(errs, err)
 			continue
 		}
-		task.Status.UpdateRevision = revision
-		task.Status.Phase = appsv1alpha1.CMergedPhase
-		if err := task.SyncStatus(fetcher, task.Status); err != nil {
-			task.Status.Phase = appsv1alpha1.CFailedPhase
-			task.Status.Message = cfgutil.ToPointer(err.Error())
-			errs = append(errs, err)
-		}
 	}
 
 	configuration.Status.Message = ""
 	if len(errs) > 0 {
 		configuration.Status.Message = utilerrors.NewAggregate(errs).Error()
 	}
-	if err := r.Client.Status().Patch(reqCtx.Ctx, configuration, patch); err != nil {
+	if err := r.Client.Status().Patch(ctx, configuration, patch); err != nil {
 		errs = append(errs, err)
 	}
 	if len(errs) == 0 {
@@ -216,12 +213,11 @@ func fromItemStatus(ctx intctrlutil.RequestCtx, status *appsv1alpha1.Configurati
 }
 
 func isReconcileStatus(phase appsv1alpha1.ConfigurationPhase) bool {
-	return phase == appsv1alpha1.CRunningPhase ||
-		phase == appsv1alpha1.CInitPhase ||
-		phase == appsv1alpha1.CPendingPhase ||
-		phase == appsv1alpha1.CFailedPhase ||
-		phase == appsv1alpha1.CMergedPhase ||
-		phase == appsv1alpha1.CMergeFailedPhase ||
-		phase == appsv1alpha1.CUpgradingPhase ||
-		phase == appsv1alpha1.CFinishedPhase
+	return phase != "" &&
+		phase != appsv1alpha1.CCreatingPhase &&
+		phase != appsv1alpha1.CDeletingPhase
+}
+
+func isFinishStatus(phase appsv1alpha1.ConfigurationPhase) bool {
+	return phase == appsv1alpha1.CFinishedPhase || phase == appsv1alpha1.CFailedAndPausePhase
 }

controllers/apps/configuration/reconcile_task.go

@@ -22,6 +22,8 @@ package configuration
 import (
 	"strconv"
 
+	corev1 "k8s.io/api/core/v1"
+
 	appsv1alpha1 "github.com/apecloud/kubeblocks/apis/apps/v1alpha1"
 	"github.com/apecloud/kubeblocks/internal/configuration/core"
 	"github.com/apecloud/kubeblocks/internal/controller/component"
@@ -35,46 +37,73 @@ type Task struct {
 	Status *appsv1alpha1.ConfigurationItemDetailStatus
 	Name   string
 
-	Do         func(fetcher *Task, component *component.SynthesizedComponent, revision string) error
-	SyncStatus func(fetcher *Task, status *appsv1alpha1.ConfigurationItemDetailStatus) error
+	Do func(fetcher *Task, component *component.SynthesizedComponent, revision string) error
+}
+
+type TaskContext struct {
+	configuration *appsv1alpha1.Configuration
+	reqCtx        intctrlutil.RequestCtx
+	fetcher       *Task
 }
 
 func NewTask(item appsv1alpha1.ConfigurationItemDetail, status *appsv1alpha1.ConfigurationItemDetailStatus) Task {
 	return Task{
-		Name:   item.Name,
-		Status: status,
+		Name: item.Name,
 		Do: func(fetcher *Task, synComponent *component.SynthesizedComponent, revision string) error {
 			configSpec := item.ConfigSpec
 			if configSpec == nil {
 				return core.MakeError("not found config spec: %s", item.Name)
 			}
-			reconcileTask := configuration.NewReconcilePipeline(configuration.ReconcileCtx{
-				ResourceCtx: fetcher.ResourceCtx,
-				Cluster:     fetcher.ClusterObj,
-				ClusterVer:  fetcher.ClusterVerObj,
-				Component:   synComponent,
-				PodSpec:     synComponent.PodSpec,
-			}, item, status, configSpec)
-			return reconcileTask.ConfigMap(item.Name).
-				ConfigConstraints(configSpec.ConfigConstraintRef).
-				PrepareForTemplate().
-				RerenderTemplate().
-				ApplyParameters().
-				UpdateConfigVersion(revision).
-				Sync().
-				Complete()
+			if err := fetcher.ConfigMap(item.Name).Complete(); err != nil {
+				return err
+			}
+			// Do reconcile for config template
+			configMap := fetcher.ConfigMapObj
+			switch intctrlutil.GetConfigSpecReconcilePhase(configMap, item, status) {
+			default:
+				return syncStatus(configMap, status)
+			case appsv1alpha1.CPendingPhase,
+				appsv1alpha1.CMergeFailedPhase:
+				return syncImpl(fetcher, item, status, synComponent, revision, configSpec)
+			case appsv1alpha1.CCreatingPhase:
+				return nil
+			}
 		},
-		SyncStatus: syncStatus,
+		Status: status,
 	}
 }
 
-func syncStatus(fetcher *Task, status *appsv1alpha1.ConfigurationItemDetailStatus) (err error) {
-	err = fetcher.ConfigMap(status.Name).Complete()
+func syncImpl(fetcher *Task,
+	item appsv1alpha1.ConfigurationItemDetail,
+	status *appsv1alpha1.ConfigurationItemDetailStatus,
+	component *component.SynthesizedComponent,
+	revision string,
+	configSpec *appsv1alpha1.ComponentConfigSpec) (err error) {
+	err = configuration.NewReconcilePipeline(configuration.ReconcileCtx{
+		ResourceCtx: fetcher.ResourceCtx,
+		Cluster:     fetcher.ClusterObj,
+		ClusterVer:  fetcher.ClusterVerObj,
+		Component:   component,
+		PodSpec:     component.PodSpec,
+	}, item, status, configSpec).
+		ConfigMap(item.Name).
+		ConfigConstraints(configSpec.ConfigConstraintRef).
+		PrepareForTemplate().
+		RerenderTemplate().
+		ApplyParameters().
+		UpdateConfigVersion(revision).
+		Sync().
+		Complete()
 	if err != nil {
-		return
+		status.Phase = appsv1alpha1.CMergeFailedPhase
+	} else {
+		status.Phase = appsv1alpha1.CMergedPhase
 	}
+	return
+}
 
-	annotations := fetcher.ConfigMapObj.GetAnnotations()
+func syncStatus(configMap *corev1.ConfigMap, status *appsv1alpha1.ConfigurationItemDetailStatus) (err error) {
+	annotations := configMap.GetAnnotations()
 	// status.CurrentRevision = GetCurrentRevision(annotations)
 	revisions := RetrieveRevision(annotations)
 	if len(revisions) == 0 {

controllers/apps/operations/reconfigure.go

@@ -28,7 +28,6 @@ import (
 
 	appsv1alpha1 "github.com/apecloud/kubeblocks/apis/apps/v1alpha1"
 	"github.com/apecloud/kubeblocks/internal/configuration/core"
-	"github.com/apecloud/kubeblocks/internal/controller/configuration"
 	intctrlutil "github.com/apecloud/kubeblocks/internal/controllerutil"
 )
 
@@ -216,15 +215,11 @@ func (r *reconfigureAction) syncReconfigureOperatorStatus(ctx intctrlutil.Reques
 	}
 
 	item := fetcher.ConfigurationObj.Spec.GetConfigurationItem(configSpec.Name)
-	status := fetcher.ConfigurationObj.Status.GetItemStatus(configSpec.Name)
-	if status == nil || item == nil {
+	if item == nil {
 		return appsv1alpha1.OpsRunningPhase, nil
 	}
 
-	if !configuration.IsApplyConfigChanged(fetcher.ConfigMapObj, *item) {
-		return appsv1alpha1.OpsRunningPhase, nil
-	}
-	switch status.Phase {
+	switch intctrlutil.GetConfigSpecReconcilePhase(fetcher.ConfigMapObj, *item, fetcher.ConfigurationObj.Status.GetItemStatus(configSpec.Name)) {
 	default:
 		return appsv1alpha1.OpsRunningPhase, nil
 	case appsv1alpha1.CFailedAndPausePhase:

deploy/helm/crds/apps.kubeblocks.io_configurations.yaml

@@ -310,6 +310,7 @@ spec:
                     phase:
                       description: phase is status of configurationItem.
                       enum:
+                      - Creating
                       - Init
                       - Running
                       - Pending

docker/Dockerfile

@@ -26,12 +26,11 @@ ENV GOPROXY=${GOPROXY}
 
 WORKDIR /src
 # Copy the Go Modules manifests
-#COPY go.mod go.mod
-#COPY go.sum go.sum
+COPY go.mod go.mod
+COPY go.sum go.sum
 # cache deps before building and copying source so that we don't need to re-download as much
 # and so that source changes don't invalidate our downloaded layer
-RUN --mount=type=bind,target=. \
-    --mount=type=cache,target=/go/pkg/mod \
+RUN --mount=type=cache,target=/go/pkg/mod \
     go mod download
 
 # Copy the go source

docker/Dockerfile-dataprotection

@@ -26,12 +26,11 @@ ENV GOPROXY=${GOPROXY}
 
 WORKDIR /src
 # Copy the Go Modules manifests
-#COPY go.mod go.mod
-#COPY go.sum go.sum
+COPY go.mod go.mod
+COPY go.sum go.sum
 # cache deps before building and copying source so that we don't need to re-download as much
 # and so that source changes don't invalidate our downloaded layer
-RUN --mount=type=bind,target=. \
-    --mount=type=cache,target=/go/pkg/mod \
+RUN --mount=type=cache,target=/go/pkg/mod \
     go mod download
 
 # Copy the go source

docker/Dockerfile-tools

@@ -28,8 +28,8 @@ ENV GOPROXY=${GOPROXY}
 WORKDIR /src
 
 # Copy the Go Modules manifests
-#COPY go.mod go.mod
-#COPY go.sum go.sum
+COPY go.mod go.mod
+COPY go.sum go.sum
 # cache deps before building and copying source so that we don't need to re-download as much
 # and so that source changes don't invalidate our downloaded layer
 # RUN go mod download
@@ -44,8 +44,7 @@ WORKDIR /src
 #COPY cmd/cli/ cmd/cli/
 #COPY apis/ apis/
 #COPY test/testdata/testdata.go test/testdata/testdata.go
-RUN --mount=type=bind,target=. \
-    --mount=type=cache,target=/go/pkg/mod \
+RUN --mount=type=cache,target=/go/pkg/mod \
     go mod download
 
 # Build

internal/cli/cmd/plugin/types.go

@@ -67,6 +67,9 @@ func (p *Paths) IndexPluginsPath(name string) []string {
 	if _, err := os.Stat(filepath.Join(p.IndexPath(name), "krew-plugins")); err == nil {
 		result = append(result, filepath.Join(p.IndexPath(name), "krew-plugins"))
 	}
+	if _, err := os.Stat(filepath.Join(p.IndexPath(name), "cli-plugins")); err == nil {
+		result = append(result, filepath.Join(p.IndexPath(name), "cli-plugins"))
+	}
 	return result
 }
 

internal/cli/util/version.go

@@ -20,6 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 package util
 
 import (
+	"bytes"
 	"context"
 	"fmt"
 	"os/exec"
@@ -128,9 +129,15 @@ func GetKubeBlocksDeploy(client kubernetes.Interface) (*appsv1.Deployment, error
 func GetDockerVersion() (*gv.Version, error) {
 	// exec cmd to get output from docker info --format '{{.ServerVersion}}'
 	cmd := exec.Command("docker", "info", "--format", "{{.ServerVersion}}")
+	var stderr bytes.Buffer
+	cmd.Stderr = &stderr
 	out, err := cmd.Output()
-	if err != nil {
-		return nil, err
+	if err != nil || stderr.String() != "" {
+		errMsg := stderr.String()
+		if errMsg == "" {
+			errMsg = err.Error()
+		}
+		return nil, fmt.Errorf("failed to get the docker version by executing \"docker info --format {{.ServerVersion}}\": %s", errMsg)
 	}
 	return gv.NewVersion(strings.TrimSpace(string(out)))
 }