TerminationPolicyType defines termination policy types.
diff --git a/pkg/controller/builder/builder_component.go b/pkg/controller/builder/builder_component.go
index ce41b00d655..3b67c7a382d 100644
--- a/pkg/controller/builder/builder_component.go
+++ b/pkg/controller/builder/builder_component.go
@@ -41,6 +41,11 @@ func NewComponentBuilder(namespace, name, compDef string) *ComponentBuilder {
return builder
}
+func (builder *ComponentBuilder) SetTerminationPolicy(terminationPolicy appsv1.TerminationPolicyType) *ComponentBuilder {
+ builder.get().Spec.TerminationPolicy = terminationPolicy
+ return builder
+}
+
func (builder *ComponentBuilder) SetServiceVersion(serviceVersion string) *ComponentBuilder {
builder.get().Spec.ServiceVersion = serviceVersion
return builder
diff --git a/pkg/controller/component/component.go b/pkg/controller/component/component.go
index 9678d516481..a16d619aafa 100644
--- a/pkg/controller/component/component.go
+++ b/pkg/controller/component/component.go
@@ -67,6 +67,7 @@ func BuildComponent(cluster *appsv1.Cluster, compSpec *appsv1.ClusterComponentSp
AddAnnotationsInMap(inheritedAnnotations(cluster)).
AddAnnotationsInMap(annotations). // annotations added by the cluster controller
AddLabelsInMap(constant.GetCompLabelsWithDef(cluster.Name, compSpec.Name, compSpec.ComponentDef, labels)).
+ SetTerminationPolicy(cluster.Spec.TerminationPolicy).
SetServiceVersion(compSpec.ServiceVersion).
SetLabels(compSpec.Labels).
SetAnnotations(compSpec.Annotations).
@@ -168,11 +169,3 @@ func GetComponentNameFromObj(obj client.Object) string {
}
return obj.GetLabels()[constant.KBAppComponentLabelKey]
}
-
-// GetComponentNameLabelKey gets the component name label key.
-func GetComponentNameLabelKey(cluster *appsv1.Cluster, componentName string) string {
- if cluster.Spec.GetShardingByName(componentName) != nil {
- return constant.KBAppShardingNameLabelKey
- }
- return constant.KBAppComponentLabelKey
-}
diff --git a/pkg/controller/component/component_test.go b/pkg/controller/component/component_test.go
index 7a119d62c22..a375f62ac1e 100644
--- a/pkg/controller/component/component_test.go
+++ b/pkg/controller/component/component_test.go
@@ -87,7 +87,7 @@ var _ = Describe("Component", func() {
testapps.NginxImage: serviceDescriptor,
}
By("call build")
- synthesizeComp, err := BuildSynthesizedComponent(ctx, testCtx.Cli, compDef, compObj(), cluster)
+ synthesizeComp, err := BuildSynthesizedComponent(ctx, testCtx.Cli, compDef, compObj())
Expect(err).Should(Succeed())
Expect(synthesizeComp).ShouldNot(BeNil())
Expect(synthesizeComp.ServiceReferences).ShouldNot(BeNil())
@@ -150,7 +150,7 @@ var _ = Describe("Component", func() {
}
cluster.Spec.ComponentSpecs[0].Resources.Requests[corev1.ResourceMemory] = _512m
cluster.Spec.ComponentSpecs[0].Resources.Limits[corev1.ResourceMemory] = _1024m
- comp, err := BuildSynthesizedComponent(ctx, testCtx.Cli, compDef.DeepCopy(), compObj(), cluster)
+ comp, err := BuildSynthesizedComponent(ctx, testCtx.Cli, compDef.DeepCopy(), compObj())
Expect(err).Should(Succeed())
Expect(comp).ShouldNot(BeNil())
for _, vol := range comp.PodSpec.Volumes {
@@ -171,7 +171,7 @@ var _ = Describe("Component", func() {
By("without memory resource set")
delete(cluster.Spec.ComponentSpecs[0].Resources.Requests, corev1.ResourceMemory)
delete(cluster.Spec.ComponentSpecs[0].Resources.Limits, corev1.ResourceMemory)
- comp, err = BuildSynthesizedComponent(ctx, testCtx.Cli, compDef.DeepCopy(), compObj(), cluster)
+ comp, err = BuildSynthesizedComponent(ctx, testCtx.Cli, compDef.DeepCopy(), compObj())
Expect(err).Should(Succeed())
Expect(comp).ShouldNot(BeNil())
for _, vol := range comp.PodSpec.Volumes {
diff --git a/pkg/controller/component/suite_test.go b/pkg/controller/component/suite_test.go
index 98b3b7a2e91..266ac2ecb36 100644
--- a/pkg/controller/component/suite_test.go
+++ b/pkg/controller/component/suite_test.go
@@ -56,7 +56,6 @@ import (
var cfg *rest.Config
var k8sClient client.Client
-var graphCli model.GraphClient
var testEnv *envtest.Environment
var ctx context.Context
var cancel context.CancelFunc
@@ -128,8 +127,6 @@ var _ = BeforeSuite(func() {
Expect(err).NotTo(HaveOccurred())
Expect(k8sClient).NotTo(BeNil())
- graphCli = model.NewGraphClient(k8sClient)
-
// run reconcile
k8sManager, err := ctrl.NewManager(cfg, ctrl.Options{
Scheme: scheme.Scheme,
diff --git a/pkg/controller/component/synthesize_component.go b/pkg/controller/component/synthesize_component.go
index df12f8ab2a3..7c8ae3429bf 100644
--- a/pkg/controller/component/synthesize_component.go
+++ b/pkg/controller/component/synthesize_component.go
@@ -27,6 +27,7 @@ import (
"github.com/pkg/errors"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
+ "k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/utils/ptr"
"sigs.k8s.io/controller-runtime/pkg/client"
@@ -34,6 +35,7 @@ import (
appsv1 "github.com/apecloud/kubeblocks/apis/apps/v1"
"github.com/apecloud/kubeblocks/pkg/constant"
intctrlutil "github.com/apecloud/kubeblocks/pkg/controllerutil"
+ "github.com/apecloud/kubeblocks/pkg/generics"
viper "github.com/apecloud/kubeblocks/pkg/viperx"
)
@@ -44,7 +46,7 @@ var (
// BuildSynthesizedComponent builds a new SynthesizedComponent object, which is a mixture of component-related configs from ComponentDefinition and Component.
// TODO: remove @ctx & @cli
func BuildSynthesizedComponent(ctx context.Context, cli client.Reader,
- compDef *appsv1.ComponentDefinition, comp *appsv1.Component, cluster *appsv1.Cluster) (*SynthesizedComponent, error) {
+ compDef *appsv1.ComponentDefinition, comp *appsv1.Component) (*SynthesizedComponent, error) {
if compDef == nil || comp == nil {
return nil, nil
}
@@ -61,7 +63,11 @@ func BuildSynthesizedComponent(ctx context.Context, cli client.Reader,
if err != nil {
return nil, err
}
- comp2CompDef, err := buildComp2CompDefs(ctx, cli, cluster)
+ comp2CompDef, err := buildComp2CompDefs(ctx, cli, comp.Namespace, clusterName)
+ if err != nil {
+ return nil, err
+ }
+ compDef2CompCnt, err := buildCompDef2CompCount(ctx, cli, comp.Namespace, clusterName)
if err != nil {
return nil, err
}
@@ -71,7 +77,7 @@ func BuildSynthesizedComponent(ctx context.Context, cli client.Reader,
ClusterName: clusterName,
ClusterUID: clusterUID,
Comp2CompDefs: comp2CompDef,
- CompDef2CompCnt: buildCompDef2CompCount(cluster),
+ CompDef2CompCnt: compDef2CompCnt,
Name: compName,
FullCompName: comp.Name,
Generation: strconv.FormatInt(comp.Generation, 10),
@@ -155,42 +161,43 @@ func BuildSynthesizedComponent(ctx context.Context, cli client.Reader,
return synthesizeComp, nil
}
-func buildComp2CompDefs(ctx context.Context, cli client.Reader, cluster *appsv1.Cluster) (map[string]string, error) {
- if cluster == nil {
- return nil, nil
+func buildComp2CompDefs(ctx context.Context, cli client.Reader, namespace, clusterName string) (map[string]string, error) {
+ if cli == nil {
+ return nil, nil // for test
}
- mapping := make(map[string]string)
-
- // build from componentSpecs
- for _, comp := range cluster.Spec.ComponentSpecs {
- if len(comp.ComponentDef) > 0 {
- mapping[comp.Name] = comp.ComponentDef
- }
+ labels := constant.GetClusterLabels(clusterName)
+ comps, err := listObjWithLabelsInNamespace(ctx, cli, generics.ComponentSignature, namespace, labels)
+ if err != nil {
+ return nil, err
}
- // build from shardings
- for _, spec := range cluster.Spec.Shardings {
- shardingComps, err := intctrlutil.ListShardingComponents(ctx, cli, cluster, spec.Name)
- if err != nil {
- return nil, err
+ mapping := make(map[string]string)
+ for _, comp := range comps {
+ if len(comp.Spec.CompDef) == 0 {
+ continue
}
- for _, shardingComp := range shardingComps {
- if len(shardingComp.Spec.CompDef) > 0 {
- compShortName, err := ShortName(cluster.Name, shardingComp.Name)
- if err != nil {
- return nil, err
- }
- mapping[compShortName] = shardingComp.Spec.CompDef
- }
+ compName, err1 := ShortName(clusterName, comp.Name)
+ if err1 != nil {
+ return nil, err1
}
+ mapping[compName] = comp.Spec.CompDef
}
return mapping, nil
}
-func buildCompDef2CompCount(cluster *appsv1.Cluster) map[string]int32 {
- if cluster == nil {
- return nil
+func buildCompDef2CompCount(ctx context.Context, cli client.Reader, namespace, clusterName string) (map[string]int32, error) {
+ if cli == nil {
+ return nil, nil // for test
+ }
+
+ clusterKey := types.NamespacedName{
+ Namespace: namespace,
+ Name: clusterName,
+ }
+ cluster := &appsv1.Cluster{}
+ if err := cli.Get(ctx, clusterKey, cluster); err != nil {
+ return nil, client.IgnoreNotFound(err)
}
result := make(map[string]int32)
@@ -211,7 +218,7 @@ func buildCompDef2CompCount(cluster *appsv1.Cluster) map[string]int32 {
for _, spec := range cluster.Spec.Shardings {
add(spec.Template.ComponentDef, spec.Shards)
}
- return result
+ return result, nil
}
func mergeUserDefinedEnv(synthesizedComp *SynthesizedComponent, comp *appsv1.Component) error {
diff --git a/pkg/controller/component/synthesize_component_test.go b/pkg/controller/component/synthesize_component_test.go
index 5cd56686253..3e4dee56732 100644
--- a/pkg/controller/component/synthesize_component_test.go
+++ b/pkg/controller/component/synthesize_component_test.go
@@ -44,15 +44,6 @@ var _ = Describe("synthesized component", func() {
// in race conditions, it will find the existence of old objects, resulting failure to
// create the new objects.
By("clean resources")
-
- // inNS := client.InNamespace(testCtx.DefaultNamespace)
- // ml := client.HasLabels{testCtx.TestObjLabelKey}
-
- // non-namespaced
- // testapps.ClearResourcesWithRemoveFinalizerOption(&testCtx, generics.ClusterDefinitionSignature, true, ml)
-
- // namespaced
- // testapps.ClearResourcesWithRemoveFinalizerOption(&testCtx, generics.ConfigMapSignature, true, inNS, ml)
}
BeforeEach(func() {
@@ -89,7 +80,8 @@ var _ = Describe("synthesized component", func() {
}
comp = &appsv1.Component{
ObjectMeta: metav1.ObjectMeta{
- Name: "test-cluster-comp",
+ Namespace: testCtx.DefaultNamespace,
+ Name: "test-cluster-comp",
Labels: map[string]string{
constant.AppInstanceLabelKey: "test-cluster",
},
@@ -105,7 +97,7 @@ var _ = Describe("synthesized component", func() {
})
It("comp def", func() {
- synthesizedComp, err := BuildSynthesizedComponent(ctx, cli, compDef, comp, nil)
+ synthesizedComp, err := BuildSynthesizedComponent(ctx, cli, compDef, comp)
Expect(err).Should(BeNil())
Expect(synthesizedComp).ShouldNot(BeNil())
@@ -123,7 +115,7 @@ var _ = Describe("synthesized component", func() {
},
},
})
- synthesizedComp, err := BuildSynthesizedComponent(ctx, cli, compDef, comp, nil)
+ synthesizedComp, err := BuildSynthesizedComponent(ctx, cli, compDef, comp)
Expect(err).Should(BeNil())
Expect(synthesizedComp).ShouldNot(BeNil())
@@ -145,7 +137,7 @@ var _ = Describe("synthesized component", func() {
},
},
})
- _, err := BuildSynthesizedComponent(ctx, cli, compDef, comp, nil)
+ _, err := BuildSynthesizedComponent(ctx, cli, compDef, comp)
Expect(err).ShouldNot(BeNil())
Expect(err.Error()).Should(ContainSubstring("not defined in definition"))
})
@@ -162,7 +154,7 @@ var _ = Describe("synthesized component", func() {
},
},
})
- _, err := BuildSynthesizedComponent(ctx, cli, compDef, comp, nil)
+ _, err := BuildSynthesizedComponent(ctx, cli, compDef, comp)
Expect(err).ShouldNot(BeNil())
Expect(err.Error()).Should(ContainSubstring("partial overriding is not supported"))
})
@@ -172,7 +164,7 @@ var _ = Describe("synthesized component", func() {
Name: func() *string { name := "external"; return &name }(),
ClusterComponentConfigSource: appsv1.ClusterComponentConfigSource{},
})
- _, err := BuildSynthesizedComponent(ctx, cli, compDef, comp, nil)
+ _, err := BuildSynthesizedComponent(ctx, cli, compDef, comp)
Expect(err).ShouldNot(BeNil())
Expect(err.Error()).Should(ContainSubstring("there is no content provided for config template"))
})
@@ -202,7 +194,8 @@ var _ = Describe("synthesized component", func() {
}
comp = &appsv1.Component{
ObjectMeta: metav1.ObjectMeta{
- Name: "test-cluster-comp",
+ Namespace: testCtx.DefaultNamespace,
+ Name: "test-cluster-comp",
Labels: map[string]string{
constant.AppInstanceLabelKey: "test-cluster",
},
@@ -225,13 +218,13 @@ var _ = Describe("synthesized component", func() {
It("duplicated", func() {
comp.Spec.Env = append(comp.Spec.Env, comp.Spec.Env[0])
- _, err := BuildSynthesizedComponent(ctx, cli, compDef, comp, nil)
+ _, err := BuildSynthesizedComponent(ctx, cli, compDef, comp)
Expect(err).ShouldNot(BeNil())
Expect(err.Error()).Should(ContainSubstring("duplicated user-defined env var"))
})
It("ok", func() {
- synthesizedComp, err := BuildSynthesizedComponent(ctx, cli, compDef, comp, nil)
+ synthesizedComp, err := BuildSynthesizedComponent(ctx, cli, compDef, comp)
Expect(err).Should(BeNil())
Expect(synthesizedComp).ShouldNot(BeNil())
Expect(synthesizedComp.PodSpec.Containers[0].Env).Should(HaveLen(2))
@@ -276,7 +269,8 @@ var _ = Describe("synthesized component", func() {
}
comp = &appsv1.Component{
ObjectMeta: metav1.ObjectMeta{
- Name: "test-cluster-comp",
+ Namespace: testCtx.DefaultNamespace,
+ Name: "test-cluster-comp",
Labels: map[string]string{
constant.AppInstanceLabelKey: "test-cluster",
},
@@ -304,7 +298,7 @@ var _ = Describe("synthesized component", func() {
It("duplicated", func() {
comp.Spec.Volumes = append(comp.Spec.Volumes, comp.Spec.Volumes[0])
- _, err := BuildSynthesizedComponent(ctx, cli, compDef, comp, nil)
+ _, err := BuildSynthesizedComponent(ctx, cli, compDef, comp)
Expect(err).ShouldNot(BeNil())
Expect(err.Error()).Should(ContainSubstring("duplicated volume"))
})
@@ -312,13 +306,13 @@ var _ = Describe("synthesized component", func() {
It("duplicated with definition", func() {
comp.Spec.Volumes = append(comp.Spec.Volumes, compDef.Spec.Runtime.Volumes[0])
- _, err := BuildSynthesizedComponent(ctx, cli, compDef, comp, nil)
+ _, err := BuildSynthesizedComponent(ctx, cli, compDef, comp)
Expect(err).ShouldNot(BeNil())
Expect(err.Error()).Should(ContainSubstring("duplicated volume"))
})
It("ok", func() {
- synthesizedComp, err := BuildSynthesizedComponent(ctx, cli, compDef, comp, nil)
+ synthesizedComp, err := BuildSynthesizedComponent(ctx, cli, compDef, comp)
Expect(err).Should(BeNil())
Expect(synthesizedComp).ShouldNot(BeNil())
Expect(synthesizedComp.PodSpec.Volumes).Should(HaveLen(4))
@@ -331,9 +325,10 @@ var _ = Describe("synthesized component", func() {
Context("components and definitions", func() {
var (
- reader *mockReader
- cluster *appsv1.Cluster
- shardComp *appsv1.Component
+ reader *mockReader
+ cluster *appsv1.Cluster
+ comp1, comp2 *appsv1.Component
+ shardComp1 *appsv1.Component
)
BeforeEach(func() {
@@ -354,7 +349,8 @@ var _ = Describe("synthesized component", func() {
}
cluster = &appsv1.Cluster{
ObjectMeta: metav1.ObjectMeta{
- Name: "test-cluster",
+ Namespace: testCtx.DefaultNamespace,
+ Name: "test-cluster",
},
Spec: appsv1.ClusterSpec{
ComponentSpecs: []appsv1.ClusterComponentSpec{
@@ -385,12 +381,11 @@ var _ = Describe("synthesized component", func() {
},
},
}
- comp = &appsv1.Component{
+ comp1 = &appsv1.Component{
ObjectMeta: metav1.ObjectMeta{
- Name: "test-cluster-comp1",
- Labels: map[string]string{
- constant.AppInstanceLabelKey: "test-cluster",
- },
+ Namespace: testCtx.DefaultNamespace,
+ Name: "test-cluster-comp1",
+ Labels: constant.GetClusterLabels("test-cluster"),
Annotations: map[string]string{
constant.KBAppClusterUIDKey: "uuid",
constant.KubeBlocksGenerationKey: "1",
@@ -401,13 +396,27 @@ var _ = Describe("synthesized component", func() {
ServiceVersion: "8.0.30",
},
}
- shardComp = &appsv1.Component{
+ comp2 = &appsv1.Component{
ObjectMeta: metav1.ObjectMeta{
- Name: "test-cluster-sharding1-a",
- Labels: map[string]string{
- constant.AppInstanceLabelKey: "test-cluster",
- constant.KBAppShardingNameLabelKey: "sharding1",
+ Namespace: testCtx.DefaultNamespace,
+ Name: "test-cluster-comp2",
+ Labels: constant.GetClusterLabels("test-cluster"),
+ Annotations: map[string]string{
+ constant.KBAppClusterUIDKey: "uuid",
+ constant.KubeBlocksGenerationKey: "1",
},
+ },
+ Spec: appsv1.ComponentSpec{
+ CompDef: "test-compdef-b",
+ ServiceVersion: "8.0.30",
+ },
+ }
+ shardComp1 = &appsv1.Component{
+ ObjectMeta: metav1.ObjectMeta{
+ Namespace: testCtx.DefaultNamespace,
+ Name: "test-cluster-sharding1-a",
+ Labels: constant.GetClusterLabels("test-cluster",
+ map[string]string{constant.KBAppShardingNameLabelKey: "sharding1"}),
Annotations: map[string]string{
constant.KBAppClusterUIDKey: "uuid",
constant.KubeBlocksGenerationKey: "1",
@@ -424,7 +433,9 @@ var _ = Describe("synthesized component", func() {
})
It("buildComp2CompDefs", func() {
- synthesizedComp, err := BuildSynthesizedComponent(ctx, reader, compDef, comp, cluster)
+ reader.objs = []client.Object{comp1, comp2}
+
+ synthesizedComp, err := BuildSynthesizedComponent(ctx, reader, compDef, comp1)
Expect(err).Should(BeNil())
Expect(synthesizedComp).ShouldNot(BeNil())
Expect(synthesizedComp.Comp2CompDefs).Should(HaveLen(2))
@@ -433,9 +444,9 @@ var _ = Describe("synthesized component", func() {
})
It("buildComp2CompDefs - with sharding comp", func() {
- reader.objs = []client.Object{shardComp}
+ reader.objs = []client.Object{comp1, comp2, shardComp1}
- synthesizedComp, err := BuildSynthesizedComponent(ctx, reader, compDef, comp, cluster)
+ synthesizedComp, err := BuildSynthesizedComponent(ctx, reader, compDef, comp1)
Expect(err).Should(BeNil())
Expect(synthesizedComp).ShouldNot(BeNil())
Expect(synthesizedComp.Comp2CompDefs).Should(HaveLen(3))
@@ -445,7 +456,9 @@ var _ = Describe("synthesized component", func() {
})
It("buildCompDef2CompCount", func() {
- synthesizedComp, err := BuildSynthesizedComponent(ctx, reader, compDef, comp, cluster)
+ reader.objs = []client.Object{cluster, comp1}
+
+ synthesizedComp, err := BuildSynthesizedComponent(ctx, reader, compDef, comp1)
Expect(err).Should(BeNil())
Expect(synthesizedComp).ShouldNot(BeNil())
Expect(synthesizedComp.CompDef2CompCnt).Should(HaveLen(3))
diff --git a/pkg/controller/configuration/configuration_test.go b/pkg/controller/configuration/configuration_test.go
index 1c05206f803..f8c13a1b01e 100644
--- a/pkg/controller/configuration/configuration_test.go
+++ b/pkg/controller/configuration/configuration_test.go
@@ -82,7 +82,7 @@ func newAllFieldsSynthesizedComponent(compDef *appsv1.ComponentDefinition, clust
if err != nil {
panic(fmt.Sprintf("build component object error: %v", err))
}
- synthesizeComp, err := component.BuildSynthesizedComponent(testCtx.Ctx, testCtx.Cli, compDef, comp, cluster)
+ synthesizeComp, err := component.BuildSynthesizedComponent(testCtx.Ctx, testCtx.Cli, compDef, comp)
Expect(err).Should(Succeed())
Expect(synthesizeComp).ShouldNot(BeNil())
addTestVolumeMount(synthesizeComp.PodSpec, mysqlCompName)
diff --git a/pkg/controller/configuration/envfrom_utils_test.go b/pkg/controller/configuration/envfrom_utils_test.go
index 4c51f1b322d..e5a35fbb3ab 100644
--- a/pkg/controller/configuration/envfrom_utils_test.go
+++ b/pkg/controller/configuration/envfrom_utils_test.go
@@ -84,7 +84,7 @@ var _ = Describe("ConfigEnvFrom test", func() {
comp, err := component.BuildComponent(cluster, &cluster.Spec.ComponentSpecs[0], nil, nil)
Expect(err).Should(Succeed())
- synthesizeComp, err := component.BuildSynthesizedComponent(ctx, testCtx.Cli, compDef, comp, cluster)
+ synthesizeComp, err := component.BuildSynthesizedComponent(ctx, testCtx.Cli, compDef, comp)
Expect(err).Should(Succeed())
podSpec := &corev1.PodSpec{
@@ -116,7 +116,7 @@ var _ = Describe("ConfigEnvFrom test", func() {
comp, err := component.BuildComponent(cluster, &cluster.Spec.ComponentSpecs[0], nil, nil)
Expect(err).Should(Succeed())
- synthesizeComp, err := component.BuildSynthesizedComponent(ctx, testCtx.Cli, compDef, comp, cluster)
+ synthesizeComp, err := component.BuildSynthesizedComponent(ctx, testCtx.Cli, compDef, comp)
Expect(err).Should(Succeed())
cmObj := origCMObject.DeepCopy()
@@ -136,7 +136,7 @@ var _ = Describe("ConfigEnvFrom test", func() {
comp, err := component.BuildComponent(cluster, &cluster.Spec.ComponentSpecs[0], nil, nil)
Expect(err).Should(Succeed())
- synthesizeComp, err := component.BuildSynthesizedComponent(ctx, testCtx.Cli, compDef, comp, cluster)
+ synthesizeComp, err := component.BuildSynthesizedComponent(ctx, testCtx.Cli, compDef, comp)
Expect(err).Should(Succeed())
configSpec := compDef.Spec.Configs[0]
diff --git a/pkg/controller/factory/builder_test.go b/pkg/controller/factory/builder_test.go
index dbb19fd46fc..4b7ba0e884d 100644
--- a/pkg/controller/factory/builder_test.go
+++ b/pkg/controller/factory/builder_test.go
@@ -80,7 +80,7 @@ var _ = Describe("builder", func() {
By("assign every available fields")
comp, err := component.BuildComponent(cluster, &cluster.Spec.ComponentSpecs[0], nil, nil)
Expect(err).Should(Succeed())
- synthesizeComp, err := component.BuildSynthesizedComponent(testCtx.Ctx, testCtx.Cli, compDef, comp, cluster)
+ synthesizeComp, err := component.BuildSynthesizedComponent(testCtx.Ctx, testCtx.Cli, compDef, comp)
Expect(err).Should(Succeed())
Expect(synthesizeComp).ShouldNot(BeNil())
// to resolve and inject env vars
diff --git a/pkg/controller/plan/prepare_test.go b/pkg/controller/plan/prepare_test.go
index 1b5d02c07f6..398f05687ef 100644
--- a/pkg/controller/plan/prepare_test.go
+++ b/pkg/controller/plan/prepare_test.go
@@ -109,7 +109,7 @@ var _ = Describe("Prepare Test", func() {
})
It("render configuration should success", func() {
- synthesizeComp, err := component.BuildSynthesizedComponent(ctx, testCtx.Cli, compDefObj, comp, cluster)
+ synthesizeComp, err := component.BuildSynthesizedComponent(ctx, testCtx.Cli, compDefObj, comp)
Expect(err).Should(Succeed())
Expect(synthesizeComp.PodSpec).ShouldNot(BeNil())
resCtx := &configuration.ResourceCtx{
diff --git a/pkg/controller/plan/restore.go b/pkg/controller/plan/restore.go
index fad8405a851..88dc9073c82 100644
--- a/pkg/controller/plan/restore.go
+++ b/pkg/controller/plan/restore.go
@@ -325,7 +325,7 @@ func (r *RestoreManager) GetRestoreObjectMeta(comp *component.SynthesizedCompone
}
}
-func (r *RestoreManager) initFromAnnotation(synthesizedComponent *component.SynthesizedComponent, compObj *appsv1.Component) (*dpv1alpha1.Backup, error) {
+func (r *RestoreManager) initFromAnnotation(comp *component.SynthesizedComponent, compObj *appsv1.Component) (*dpv1alpha1.Backup, error) {
valueString := r.Cluster.Annotations[constant.RestoreFromBackupAnnotationKey]
if len(valueString) == 0 {
return nil, nil
@@ -337,7 +337,7 @@ func (r *RestoreManager) initFromAnnotation(synthesizedComponent *component.Synt
}
compName := compObj.Labels[constant.KBAppShardingNameLabelKey]
if len(compName) == 0 {
- compName = synthesizedComponent.Name
+ compName = comp.Name
}
backupSource, ok := backupMap[compName]
if !ok {
@@ -364,7 +364,7 @@ func (r *RestoreManager) initFromAnnotation(synthesizedComponent *component.Synt
return nil, err
}
}
- return GetBackupFromClusterAnnotation(r.Ctx, r.Client, backupSource, synthesizedComponent.Name, r.Cluster.Namespace)
+ return GetBackupFromClusterAnnotation(r.Ctx, r.Client, backupSource, comp.Name, r.Cluster.Namespace)
}
// createRestoreAndWait create the restore CR and wait for completion.
diff --git a/pkg/controller/plan/restore_test.go b/pkg/controller/plan/restore_test.go
index 3581c4a1d02..2198000128e 100644
--- a/pkg/controller/plan/restore_test.go
+++ b/pkg/controller/plan/restore_test.go
@@ -152,7 +152,7 @@ var _ = Describe("Restore", func() {
synthesizedComponent = &component.SynthesizedComponent{
PodSpec: &compDef.Spec.Runtime,
- VolumeClaimTemplates: cluster.Spec.ComponentSpecs[0].ToVolumeClaimTemplates(),
+ VolumeClaimTemplates: intctrlutil.ToCoreV1PVCTs(cluster.Spec.ComponentSpecs[0].VolumeClaimTemplates),
Name: defaultCompName,
Replicas: 1,
Roles: []appsv1.ReplicaRole{
diff --git a/pkg/operations/rebuild_instance.go b/pkg/operations/rebuild_instance.go
index cd301e94854..dc17f8fe6ba 100644
--- a/pkg/operations/rebuild_instance.go
+++ b/pkg/operations/rebuild_instance.go
@@ -540,12 +540,12 @@ func (r rebuildInstanceOpsHandler) getScalingOutPodNameFromMessage(progressMsg s
func (r rebuildInstanceOpsHandler) buildSynthesizedComponent(ctx context.Context,
cli client.Client,
cluster *appsv1.Cluster,
- componentName string) (*component.SynthesizedComponent, error) {
- comp, compDef, err := component.GetCompNCompDefByName(ctx, cli, cluster.Namespace, constant.GenerateClusterComponentName(cluster.Name, componentName))
+ compName string) (*component.SynthesizedComponent, error) {
+ comp, compDef, err := component.GetCompNCompDefByName(ctx, cli, cluster.Namespace, constant.GenerateClusterComponentName(cluster.Name, compName))
if err != nil {
return nil, err
}
- return component.BuildSynthesizedComponent(ctx, cli, compDef, comp, cluster)
+ return component.BuildSynthesizedComponent(ctx, cli, compDef, comp)
}
func (r rebuildInstanceOpsHandler) prepareInplaceRebuildHelper(reqCtx intctrlutil.RequestCtx,
diff --git a/pkg/operations/switchover.go b/pkg/operations/switchover.go
index 01dea62c438..281ecea5588 100644
--- a/pkg/operations/switchover.go
+++ b/pkg/operations/switchover.go
@@ -328,7 +328,7 @@ func buildSynthesizedComp(ctx context.Context, cli client.Client, opsRes *OpsRes
return nil, err
}
// build synthesized component for the component
- return component.BuildSynthesizedComponent(ctx, cli, compDefObj, compObj, opsRes.Cluster)
+ return component.BuildSynthesizedComponent(ctx, cli, compDefObj, compObj)
}
func handleError(reqCtx intctrlutil.RequestCtx,
diff --git a/pkg/operations/volume_expansion_test.go b/pkg/operations/volume_expansion_test.go
index 9dbee67d83e..7d4efb868c1 100644
--- a/pkg/operations/volume_expansion_test.go
+++ b/pkg/operations/volume_expansion_test.go
@@ -20,6 +20,7 @@ along with this program. If not, see
.
package operations
import (
+ "fmt"
"time"
. "github.com/onsi/ginkgo/v2"
@@ -87,8 +88,60 @@ var _ = Describe("OpsRequest Controller Volume Expansion Handler", func() {
constant.KBAppComponentLabelKey, consensusCompName).SetStorage("2Gi").SetStorageClass(storageClassName).CheckedCreate(&testCtx)
}
+ // getVolumeClaimNames gets all PVC names of component compName.
+ //
+ // cluster.Spec.GetComponentByName(compName).VolumeClaimTemplates[*].Name will be used if no claimNames provided
+ //
+ // nil return if:
+ // 1. component compName not found or
+ // 2. len(VolumeClaimTemplates)==0 or
+ // 3. any claimNames not found
+ getVolumeClaimNames := func(cluster *appsv1.Cluster, compName string, claimNames ...string) []string {
+ if cluster == nil {
+ return nil
+ }
+ comp := cluster.Spec.GetComponentByName(compName)
+ if comp == nil {
+ return nil
+ }
+ if len(comp.VolumeClaimTemplates) == 0 {
+ return nil
+ }
+ if len(claimNames) == 0 {
+ for _, template := range comp.VolumeClaimTemplates {
+ claimNames = append(claimNames, template.Name)
+ }
+ }
+ allExist := true
+ for _, name := range claimNames {
+ found := false
+ for _, template := range comp.VolumeClaimTemplates {
+ if template.Name == name {
+ found = true
+ break
+ }
+ }
+ if !found {
+ allExist = false
+ break
+ }
+ }
+ if !allExist {
+ return nil
+ }
+
+ pvcNames := make([]string, 0)
+ for _, claimName := range claimNames {
+ for i := 0; i < int(comp.Replicas); i++ {
+ pvcName := fmt.Sprintf("%s-%s-%s-%d", claimName, cluster.Name, compName, i)
+ pvcNames = append(pvcNames, pvcName)
+ }
+ }
+ return pvcNames
+ }
+
initResourcesForVolumeExpansion := func(clusterObject *appsv1.Cluster, opsRes *OpsResource, storage string, replicas int) (*opsv1alpha1.OpsRequest, []string) {
- pvcNames := opsRes.Cluster.GetVolumeClaimNames(consensusCompName)
+ pvcNames := getVolumeClaimNames(opsRes.Cluster, consensusCompName)
for _, pvcName := range pvcNames {
createPVC(clusterObject.Name, storageClassName, vctName, pvcName)
// mock pvc is Bound
diff --git a/pkg/testutil/apps/cluster_factory.go b/pkg/testutil/apps/cluster_factory.go
index d9c31b53543..3611974135c 100644
--- a/pkg/testutil/apps/cluster_factory.go
+++ b/pkg/testutil/apps/cluster_factory.go
@@ -227,9 +227,3 @@ func (factory *MockClusterFactory) SetServiceRefs(serviceRefs []appsv1.ServiceRe
comp.ServiceRefs = serviceRefs
})
}
-
-func (factory *MockClusterFactory) SetStop(stop *bool) *MockClusterFactory {
- return factory.lastComponentRef(func(comp *appsv1.ClusterComponentSpec) {
- comp.Stop = stop
- })
-}
diff --git a/pkg/testutil/apps/cluster_instance_set_test_util.go b/pkg/testutil/apps/cluster_instance_set_test_util.go
index 5382306e8b0..8090aa5b320 100644
--- a/pkg/testutil/apps/cluster_instance_set_test_util.go
+++ b/pkg/testutil/apps/cluster_instance_set_test_util.go
@@ -151,6 +151,67 @@ func MockInstanceSetPods(
return podList
}
+// MockInstanceSetPods2 mocks the InstanceSet pods, just using in envTest
+func MockInstanceSetPods2(
+ testCtx *testutil.TestContext,
+ its *workloads.InstanceSet,
+ clusterName, compName string, comp *appsv1.Component) []*corev1.Pod {
+ getReplicas := func() int {
+ if its == nil || its.Spec.Replicas == nil {
+ return replicas
+ }
+ return int(*its.Spec.Replicas)
+ }
+ leaderRole := func() *workloads.ReplicaRole {
+ if its == nil {
+ return nil
+ }
+ highestPriority := 0
+ var role *workloads.ReplicaRole
+ for i, r := range its.Spec.Roles {
+ if its.Spec.Roles[i].UpdatePriority > highestPriority {
+ highestPriority = r.UpdatePriority
+ role = &r
+ }
+ }
+ return role
+ }()
+ noneLeaderRole := func() *workloads.ReplicaRole {
+ if its == nil {
+ return nil
+ }
+ lowestPriority := math.MaxInt
+ var role *workloads.ReplicaRole
+ for i, r := range its.Spec.Roles {
+ if its.Spec.Roles[i].UpdatePriority < lowestPriority {
+ lowestPriority = r.UpdatePriority
+ role = &r
+ }
+ }
+ return role
+ }()
+ podList := make([]*corev1.Pod, getReplicas())
+ podNames := generatePodNames2(clusterName, compName, comp)
+ for i, pName := range podNames {
+ var podRole string
+ if its != nil && len(its.Spec.Roles) > 0 {
+ if i == 0 {
+ podRole = leaderRole.Name
+ } else {
+ podRole = noneLeaderRole.Name
+ }
+ }
+ pod := MockInstanceSetPod(testCtx, its, clusterName, compName, pName, podRole)
+ annotations := pod.Annotations
+ if annotations == nil {
+ annotations = make(map[string]string)
+ }
+ pod.Annotations = annotations
+ podList[i] = pod
+ }
+ return podList
+}
+
// MockInstanceSetPod mocks to create the pod of the InstanceSet, just using in envTest
func MockInstanceSetPod(
testCtx *testutil.TestContext,
@@ -273,6 +334,22 @@ func generatePodNames(cluster *appsv1.Cluster, compName string) []string {
return podNames
}
+func generatePodNames2(clusterName, compName string, comp *appsv1.Component) []string {
+ podNames := make([]string, 0)
+ insTPLReplicasCnt := int32(0)
+ workloadName := constant.GenerateWorkloadNamePattern(clusterName, compName)
+ for _, insTpl := range comp.Spec.Instances {
+ insReplicas := *insTpl.Replicas
+ insTPLReplicasCnt += insReplicas
+ podNames = append(podNames, generateInstanceNames(workloadName, insTpl.Name, insReplicas, comp.Spec.OfflineInstances)...)
+ }
+ if insTPLReplicasCnt < comp.Spec.Replicas {
+ podNames = append(podNames, generateInstanceNames(workloadName, "",
+ comp.Spec.Replicas-insTPLReplicasCnt, comp.Spec.OfflineInstances)...)
+ }
+ return podNames
+}
+
func podIsReady(pod *corev1.Pod) bool {
if !pod.DeletionTimestamp.IsZero() {
return false
@@ -285,11 +362,11 @@ func podIsReady(pod *corev1.Pod) bool {
return false
}
-func MockInstanceSetStatus(testCtx testutil.TestContext, cluster *appsv1.Cluster, fullCompName string) {
- itsName := constant.GenerateClusterComponentName(cluster.Name, fullCompName)
+func MockInstanceSetStatus(testCtx testutil.TestContext, cluster *appsv1.Cluster, compName string) {
+ itsName := constant.GenerateClusterComponentName(cluster.Name, compName)
its := &workloads.InstanceSet{}
gomega.Expect(testCtx.Cli.Get(testCtx.Ctx, client.ObjectKey{Name: itsName, Namespace: cluster.Namespace}, its)).Should(gomega.Succeed())
- currentPodNames := generatePodNames(cluster, fullCompName)
+ currentPodNames := generatePodNames(cluster, compName)
updateRevisions := map[string]string{}
for _, podName := range currentPodNames {
updateRevisions[podName] = "revision"
@@ -297,7 +374,7 @@ func MockInstanceSetStatus(testCtx testutil.TestContext, cluster *appsv1.Cluster
podList := &corev1.PodList{}
gomega.Expect(testCtx.Cli.List(testCtx.Ctx, podList, client.MatchingLabels{
constant.AppInstanceLabelKey: cluster.Name,
- constant.KBAppComponentLabelKey: fullCompName,
+ constant.KBAppComponentLabelKey: compName,
})).Should(gomega.Succeed())
currRevisions := map[string]string{}
newMembersStatus := make([]workloads.MemberStatus, 0)
@@ -325,7 +402,7 @@ func MockInstanceSetStatus(testCtx testutil.TestContext, cluster *appsv1.Cluster
}
newMembersStatus = append(newMembersStatus, memberStatus)
}
- compSpec := cluster.Spec.GetComponentByName(fullCompName)
+ compSpec := cluster.Spec.GetComponentByName(compName)
gomega.Eventually(GetAndChangeObjStatus(&testCtx, client.ObjectKey{Name: itsName, Namespace: cluster.Namespace}, func(its *workloads.InstanceSet) {
its.Status.CurrentRevisions = currRevisions
its.Status.UpdateRevisions = updateRevisions
diff --git a/pkg/testutil/apps/common_util.go b/pkg/testutil/apps/common_util.go
index fa050abbdc1..3502a8dae51 100644
--- a/pkg/testutil/apps/common_util.go
+++ b/pkg/testutil/apps/common_util.go
@@ -372,3 +372,12 @@ func ClearClusterResourcesWithRemoveFinalizerOption(testCtx *testutil.TestContex
ClearResourcesWithRemoveFinalizerOption(testCtx, intctrlutil.ComponentDefinitionSignature, true, hasLabels)
ClearResourcesWithRemoveFinalizerOption(testCtx, intctrlutil.ComponentVersionSignature, true, hasLabels)
}
+
+// ClearComponentResourcesWithRemoveFinalizerOption clears all dependent resources belonging to existing components.
+func ClearComponentResourcesWithRemoveFinalizerOption(testCtx *testutil.TestContext) {
+ inNs := client.InNamespace(testCtx.DefaultNamespace)
+ hasLabels := client.HasLabels{testCtx.TestObjLabelKey}
+ ClearResourcesWithRemoveFinalizerOption(testCtx, intctrlutil.ComponentSignature, true, inNs, hasLabels)
+ ClearResourcesWithRemoveFinalizerOption(testCtx, intctrlutil.ComponentDefinitionSignature, true, hasLabels)
+ ClearResourcesWithRemoveFinalizerOption(testCtx, intctrlutil.ComponentVersionSignature, true, hasLabels)
+}
diff --git a/pkg/testutil/apps/component_factory.go b/pkg/testutil/apps/component_factory.go
index 3810764c677..44a1b13f91a 100644
--- a/pkg/testutil/apps/component_factory.go
+++ b/pkg/testutil/apps/component_factory.go
@@ -28,12 +28,13 @@ type MockComponentFactory struct {
BaseFactory[appsv1.Component, *appsv1.Component, MockComponentFactory]
}
-func NewComponentFactory(namespace, name, componentDefinition string) *MockComponentFactory {
+func NewComponentFactory(namespace, name, compDef string) *MockComponentFactory {
f := &MockComponentFactory{}
f.Init(namespace, name,
&appsv1.Component{
Spec: appsv1.ComponentSpec{
- CompDef: componentDefinition,
+ TerminationPolicy: appsv1.WipeOut,
+ CompDef: compDef,
},
}, f)
return f
@@ -59,11 +60,6 @@ func (factory *MockComponentFactory) SetResources(resources corev1.ResourceRequi
return factory
}
-// func (factory *MockComponentFactory) SetMonitor(monitor bool) *MockComponentFactory {
-// factory.Get().Spec.Monitor = monitor
-// return factory
-// }
-
func (factory *MockComponentFactory) SetTLSConfig(enable bool, issuer *appsv1.Issuer) *MockComponentFactory {
if enable {
factory.Get().Spec.TLSConfig = &appsv1.TLSConfig{
@@ -82,3 +78,29 @@ func (factory *MockComponentFactory) AddVolumeClaimTemplate(volumeName string,
})
return factory
}
+
+func (factory *MockComponentFactory) AddSystemAccount(name string, passwordConfig *appsv1.PasswordConfig, secretRef *appsv1.ProvisionSecretRef) *MockComponentFactory {
+ if factory.Get().Spec.SystemAccounts == nil {
+ factory.Get().Spec.SystemAccounts = make([]appsv1.ComponentSystemAccount, 0)
+ }
+ factory.Get().Spec.SystemAccounts = append(factory.Get().Spec.SystemAccounts,
+ appsv1.ComponentSystemAccount{
+ Name: name,
+ PasswordConfig: passwordConfig,
+ SecretRef: secretRef,
+ })
+ return factory
+}
+
+func (factory *MockComponentFactory) SetStop(stop *bool) *MockComponentFactory {
+ factory.Get().Spec.Stop = stop
+ return factory
+}
+
+func (factory *MockComponentFactory) AddInstances(instance appsv1.InstanceTemplate) *MockComponentFactory {
+ if factory.Get().Spec.Instances == nil {
+ factory.Get().Spec.Instances = make([]appsv1.InstanceTemplate, 0)
+ }
+ factory.Get().Spec.Instances = append(factory.Get().Spec.Instances, instance)
+ return factory
+}
diff --git a/pkg/testutil/apps/pvc_factoy.go b/pkg/testutil/apps/pvc_factoy.go
index 13dbcd3b467..1892359f097 100644
--- a/pkg/testutil/apps/pvc_factoy.go
+++ b/pkg/testutil/apps/pvc_factoy.go
@@ -32,7 +32,7 @@ type MockPersistentVolumeClaimFactory struct {
BaseFactory[corev1.PersistentVolumeClaim, *corev1.PersistentVolumeClaim, MockPersistentVolumeClaimFactory]
}
-func NewPersistentVolumeClaimFactory(namespace, name, clusterName, componentName, vctName string) *MockPersistentVolumeClaimFactory {
+func NewPersistentVolumeClaimFactory(namespace, name, clusterName, compName, vctName string) *MockPersistentVolumeClaimFactory {
f := &MockPersistentVolumeClaimFactory{}
volumeMode := corev1.PersistentVolumeFilesystem
f.Init(namespace, name,
@@ -40,7 +40,7 @@ func NewPersistentVolumeClaimFactory(namespace, name, clusterName, componentName
ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{
constant.AppInstanceLabelKey: clusterName,
- constant.KBAppComponentLabelKey: componentName,
+ constant.KBAppComponentLabelKey: compName,
constant.AppManagedByLabelKey: constant.AppName,
constant.VolumeClaimTemplateNameLabelKey: vctName,
},
diff --git a/pkg/testutil/k8s/instance_set_util.go b/pkg/testutil/k8s/instance_set_util.go
index 5f9e819c2c3..c026ee2b5ed 100644
--- a/pkg/testutil/k8s/instance_set_util.go
+++ b/pkg/testutil/k8s/instance_set_util.go
@@ -79,23 +79,12 @@ func ListAndCheckInstanceSet(testCtx *testutil.TestContext, key types.Namespaced
return itsList
}
-func ListAndCheckInstanceSetItemsCount(testCtx *testutil.TestContext, key types.NamespacedName, cnt int) *workloads.InstanceSetList {
- itsList := &workloads.InstanceSetList{}
- gomega.Eventually(func(g gomega.Gomega) {
- g.Expect(testCtx.Cli.List(testCtx.Ctx, itsList, client.MatchingLabels{
- constant.AppInstanceLabelKey: key.Name,
- }, client.InNamespace(key.Namespace))).Should(gomega.Succeed())
- g.Expect(len(itsList.Items)).Should(gomega.Equal(cnt))
- }).Should(gomega.Succeed())
- return itsList
-}
-
-func ListAndCheckInstanceSetWithComponent(testCtx *testutil.TestContext, key types.NamespacedName, componentName string) *workloads.InstanceSetList {
+func ListAndCheckInstanceSetWithComponent(testCtx *testutil.TestContext, key types.NamespacedName, compName string) *workloads.InstanceSetList {
itsList := &workloads.InstanceSetList{}
gomega.Eventually(func(g gomega.Gomega) {
g.Expect(testCtx.Cli.List(testCtx.Ctx, itsList, client.MatchingLabels{
constant.AppInstanceLabelKey: key.Name,
- constant.KBAppComponentLabelKey: componentName,
+ constant.KBAppComponentLabelKey: compName,
}, client.InNamespace(key.Namespace))).Should(gomega.Succeed())
g.Expect(itsList.Items).ShouldNot(gomega.BeNil())
g.Expect(itsList.Items).ShouldNot(gomega.BeEmpty())