remove config manager

Author: leon-inf

cmd/reloader/main.go

@@ -33,7 +33,6 @@ import (
 	"github.com/apecloud/kubeblocks/pkg/controller/component"
 	intctrlutil "github.com/apecloud/kubeblocks/pkg/controllerutil"
 	"github.com/apecloud/kubeblocks/pkg/parameters"
-	cfgcm "github.com/apecloud/kubeblocks/pkg/parameters/configmanager"
 	"github.com/apecloud/kubeblocks/pkg/parameters/core"
 )
 
@@ -74,7 +73,7 @@ func createConfigPatch(cfg *corev1.ConfigMap, configRender *parametersv1alpha1.P
 		return nil, false, err
 	}
 	if !restart {
-		restart = cfgcm.NeedRestart(paramsDefs, patch)
+		restart = parameters.NeedRestart(paramsDefs, patch)
 	}
 	return patch, restart, nil
 }

controllers/parameters/config_util.go

@@ -32,7 +32,6 @@ import (
 	"github.com/apecloud/kubeblocks/pkg/controller/instanceset"
 	intctrlutil "github.com/apecloud/kubeblocks/pkg/controllerutil"
 	"github.com/apecloud/kubeblocks/pkg/parameters"
-	cfgcm "github.com/apecloud/kubeblocks/pkg/parameters/configmanager"
 	"github.com/apecloud/kubeblocks/pkg/parameters/core"
 )
 
@@ -181,7 +180,7 @@ func resolveReloadActionPolicy(jsonPatch string,
 		policy = parametersv1alpha1.DynamicReloadAndRestartPolicy
 	case !dynamicUpdate: // static parameters update and only need to restart
 		policy = parametersv1alpha1.RestartPolicy
-	case cfgcm.IsAutoReload(pd.ReloadAction): // if core support hot update, don't need to do anything
+	case parameters.IsAutoReload(pd.ReloadAction): // if core support hot update, don't need to do anything
 		policy = parametersv1alpha1.AsyncDynamicReloadPolicy
 	case enableSyncTrigger(pd.ReloadAction): // sync config-manager exec hot update
 		policy = parametersv1alpha1.SyncDynamicReloadPolicy

controllers/parameters/policy_util.go

@@ -33,25 +33,10 @@ 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
-
-# Copy the go source
-#COPY pkg/ pkg/
-#COPY controllers/ controllers/
-#COPY cmd/reloader/ cmd/reloader/
-#COPY externalapis/ externalapis/
-#COPY version/ version/
-#COPY cmd/cli/ cmd/cli/
-#COPY apis/ apis/
-#COPY test/testdata/testdata.go test/testdata/testdata.go
 RUN --mount=type=cache,target=/go/pkg/mod \
     go mod download
 
 # Build
-RUN --mount=type=bind,target=. \
-    --mount=type=cache,target=/root/.cache/go-build \
-    --mount=type=cache,target=/go/pkg/mod \
-    CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -ldflags="${LD_FLAGS}" -a -o /out/reloader cmd/reloader/main.go
-
 RUN --mount=type=bind,target=. \
     --mount=type=cache,target=/root/.cache/go-build \
     --mount=type=cache,target=/go/pkg/mod \
@@ -69,7 +54,6 @@ RUN apk add --no-cache kubectl helm jq --allow-untrusted \
 
 # copy kubeblocks tools
 COPY config/crd/bases /kubeblocks/crd
-COPY --from=builder /out/reloader /bin
 COPY --from=builder /out/kbagent /bin
 
 # mkdir kbcli config dir and helm cache dir.

docker/Dockerfile-tools

@@ -438,3 +438,27 @@ func ResolveShardingReference(ctx context.Context, reader client.Reader, comp *a
 	}
 	return nil, nil
 }
+
+func NeedRestart(paramsDefs map[string]*parametersv1alpha1.ParametersDefinition, patch *core.ConfigPatchInfo) bool {
+	if patch == nil {
+		return false
+	}
+	for key := range patch.UpdateConfig {
+		if paramsDef, ok := paramsDefs[key]; !ok || !isSupportReload(paramsDef.Spec.ReloadAction) {
+			return true
+		}
+	}
+	return false
+}
+
+func isSupportReload(reload *parametersv1alpha1.ReloadAction) bool {
+	return reload != nil && isValidReloadPolicy(*reload)
+}
+
+func isValidReloadPolicy(reload parametersv1alpha1.ReloadAction) bool {
+	return reload.AutoTrigger != nil || reload.ShellTrigger != nil
+}
+
+func IsAutoReload(reload *parametersv1alpha1.ReloadAction) bool {
+	return reload != nil && reload.AutoTrigger != nil
+}