Skip to content

Commit ba2ccb5

Browse files
kizuna-lekapecloud-bot
authored andcommitted
fix: do not build component parameter when externalManaged is false (#9808)
(cherry picked from commit 167280f)
1 parent 1593e3a commit ba2ccb5

File tree

6 files changed

+15
-10
lines changed

6 files changed

+15
-10
lines changed

controllers/parameters/componentdrivenparameter_controller_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ var _ = Describe("ComponentParameterGenerator Controller", func() {
6565
compDefObj := testapps.NewComponentDefinitionFactory(compDefName).
6666
WithRandomName().
6767
SetDefaultSpec().
68-
AddConfigTemplate(configSpecName, configmap.Name, testCtx.DefaultNamespace, configVolumeName).
68+
AddConfigTemplate(configSpecName, configmap.Name, testCtx.DefaultNamespace, configVolumeName, true).
6969
Create(&testCtx).
7070
GetObject()
7171
Expect(testapps.GetAndChangeObjStatus(&testCtx, client.ObjectKeyFromObject(compDefObj), func(obj *appsv1.ComponentDefinition) {
@@ -153,7 +153,7 @@ var _ = Describe("ComponentParameterGenerator Controller", func() {
153153
compDefObj := testapps.NewComponentDefinitionFactory(key.Name).
154154
WithRandomName().
155155
SetDefaultSpec().
156-
AddConfigTemplate(configSpecName, configSpecName, testCtx.DefaultNamespace, configVolumeName).
156+
AddConfigTemplate(configSpecName, configSpecName, testCtx.DefaultNamespace, configVolumeName, true).
157157
Create(&testCtx).
158158
GetObject()
159159
Expect(testapps.GetAndChangeObjStatus(&testCtx, client.ObjectKeyFromObject(compDefObj), func(obj *appsv1.ComponentDefinition) {

controllers/parameters/configuration_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ func mockReconcileResource() (*corev1.ConfigMap, *parametersv1alpha1.ParametersD
100100
compDefObj := testapps.NewComponentDefinitionFactory(compDefName).
101101
WithRandomName().
102102
SetDefaultSpec().
103-
AddConfigTemplate(configSpecName, configmap.Name, testCtx.DefaultNamespace, configVolumeName).
103+
AddConfigTemplate(configSpecName, configmap.Name, testCtx.DefaultNamespace, configVolumeName, true).
104104
Create(&testCtx).
105105
GetObject()
106106
Expect(testapps.GetAndChangeObjStatus(&testCtx, client.ObjectKeyFromObject(compDefObj), func(obj *appsv1.ComponentDefinition) {

controllers/parameters/paramconfigrenderer_controller_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ var _ = Describe("ParamConfigRenderer Controller", func() {
5555
By("Create a component definition obj and mock to available")
5656
compDefObj := testapps.NewComponentDefinitionFactory(compDefName).
5757
SetDefaultSpec().
58-
AddConfigTemplate(configSpecName, configmap.Name, testCtx.DefaultNamespace, configVolumeName).
58+
AddConfigTemplate(configSpecName, configmap.Name, testCtx.DefaultNamespace, configVolumeName, true).
5959
Create(&testCtx).
6060
GetObject()
6161
Expect(testapps.GetAndChangeObjStatus(&testCtx, client.ObjectKeyFromObject(compDefObj), func(obj *appsv1.ComponentDefinition) {

pkg/controller/configuration/configuration_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ const (
4848
func allFieldsCompDefObj(create bool) *appsv1.ComponentDefinition {
4949
compDef := testapps.NewComponentDefinitionFactory(compDefName).
5050
SetDefaultSpec().
51-
AddConfigTemplate(configTemplateName, mysqlConfigName, testCtx.DefaultNamespace, testapps.ConfVolumeName).
51+
AddConfigTemplate(configTemplateName, mysqlConfigName, testCtx.DefaultNamespace, testapps.ConfVolumeName, true).
5252
AddScriptTemplate(scriptTemplateName, mysqlScriptsTemplateName, testCtx.DefaultNamespace, testapps.ScriptsVolumeName, nil).
5353
GetObject()
5454
if create {

pkg/controller/configuration/parameter_utils.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,10 @@ func ResolveParameterTemplate(cmpd appsv1.ComponentDefinitionSpec, pcr parameter
6262
})
6363

6464
for _, config := range cmpd.Configs {
65+
if config.ExternalManaged == nil || !*config.ExternalManaged {
66+
continue
67+
}
68+
6569
if slices.Contains(tpls, config.Name) {
6670
templates = append(templates, config)
6771
}

pkg/testutil/apps/componentdefinition_factory.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -171,12 +171,13 @@ func (f *MockComponentDefinitionFactory) AddServiceExt(name, serviceName string,
171171
return f
172172
}
173173

174-
func (f *MockComponentDefinitionFactory) AddConfigTemplate(name, configTemplate, namespace, volumeName string) *MockComponentDefinitionFactory {
174+
func (f *MockComponentDefinitionFactory) AddConfigTemplate(name, configTemplate, namespace, volumeName string, externalManage bool) *MockComponentDefinitionFactory {
175175
config := kbappsv1.ComponentFileTemplate{
176-
Name: name,
177-
Template: configTemplate,
178-
Namespace: namespace,
179-
VolumeName: volumeName,
176+
Name: name,
177+
Template: configTemplate,
178+
Namespace: namespace,
179+
VolumeName: volumeName,
180+
ExternalManaged: &externalManage,
180181
}
181182
if f.Get().Spec.Configs == nil {
182183
f.Get().Spec.Configs = make([]kbappsv1.ComponentFileTemplate, 0)

0 commit comments

Comments
 (0)