You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by zh...@apache.org on 2024/12/13 11:22:06 UTC

(dubbo-kubernetes) branch master updated: fix typo error

This is an automated email from the ASF dual-hosted git repository.

zhongxjian pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-kubernetes.git


The following commit(s) were added to refs/heads/master by this push:
     new 2c3524df fix typo error
2c3524df is described below

commit 2c3524df51235dddc2d8ab4b7a80cbc22dffb58e
Author: mfordjody <11...@qq.com>
AuthorDate: Fri Dec 13 19:21:55 2024 +0800

    fix typo error
---
 operator/pkg/render/manifest.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/operator/pkg/render/manifest.go b/operator/pkg/render/manifest.go
index 36122c3f..ee0c2d18 100644
--- a/operator/pkg/render/manifest.go
+++ b/operator/pkg/render/manifest.go
@@ -15,7 +15,7 @@ import (
 	"strings"
 )
 
-func MergeInputs(filenames []string, flags []string) ([]values.Map, error) {
+func MergeInputs(filenames []string, flags []string) (values.Map, error) {
 	ConfigBase, err := values.MapFromJSON([]byte(`{
 	  "apiVersion": "install.dubbo.io/v1alpha1",
 	  "kind": "DubboOperator",
@@ -122,7 +122,7 @@ func GenerateManifest(files []string, setFlags []string, logger clog.Logger) ([]
 			compVals := applyComponentValuesToHelmValues(comp, spec, merged)
 		}
 	}
-	return nil, nil, nil
+	return nil, merged, nil
 }
 
 func validateDubboOperator(dop values.Map, logger clog.Logger) error {