(dubbo-kubernetes) branch master updated: [operator] Complementary generator logic

[zhongxjian]

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 750dbf9c [operator] Complementary generator logic
750dbf9c is described below

commit 750dbf9c9bc0c4f2efd2540ed62f79bcd98ef235
Author: mfordjody <11638...@qq.com>
AuthorDate: Fri Dec 13 18:44:19 2024 +0800

    [operator] Complementary generator logic
---
 operator/pkg/helm/helm.go       |  2 +-
 operator/pkg/render/manifest.go | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/operator/pkg/helm/helm.go b/operator/pkg/helm/helm.go
index f488c609..14f8fed4 100644
--- a/operator/pkg/helm/helm.go
+++ b/operator/pkg/helm/helm.go
@@ -86,7 +86,7 @@ func loadChart(f fs.FS, root string) (*chart.Chart, error) {
                }
                bfs = append(bfs, bf)
        }
-       return loader.LoadFile(bfs)
+       return loader.LoadFiles(bfs)
 }
 
 func stripPrefix(path, prefix string) string {
diff --git a/operator/pkg/render/manifest.go b/operator/pkg/render/manifest.go
index 5efd3114..4aa82411 100644
--- a/operator/pkg/render/manifest.go
+++ b/operator/pkg/render/manifest.go
@@ -3,6 +3,9 @@ package render
 import (
        "fmt"
        "github.com/apache/dubbo-kubernetes/operator/cmd/validation"
+       "github.com/apache/dubbo-kubernetes/operator/pkg/component"
+       "github.com/apache/dubbo-kubernetes/operator/pkg/manifest"
+       "github.com/apache/dubbo-kubernetes/operator/pkg/util"
        "github.com/apache/dubbo-kubernetes/operator/pkg/util/clog"
        "github.com/apache/dubbo-kubernetes/operator/pkg/values"
        "io"
@@ -45,10 +48,25 @@ func checkDops(s string) error {
        return nil
 }
 func GenerateManifest(files []string, setFlags []string, logger clog.Logger) 
([]manifest.ManifestSet, values.Map, error) {
+       var chartWarnings util.Errors
        merged, err := MergeInputs(files, setFlags)
        if err != nil {
                return nil, nil, fmt.Errorf("merge inputs: %v", err)
        }
+       if err := validateDubboOperator(merged, logger); err != nil {
+               return nil, nil, fmt.Errorf("validateDubboOperator err:%v", err)
+       }
+       allManifests := map[component.Name]manifest.ManifestSet{}
+       for _, comp := range component.AllComponents {
+               specs, err := comp.Get(merged)
+               if err != nil {
+                       return nil, nil, fmt.Errorf("get component %v: %v", 
comp.UserFacingName, err)
+               }
+               for _, spec := range specs {
+
+               }
+       }
+       return nil, nil, nil
 }
 
 func validateDubboOperator(dop values.Map, logger clog.Logger) error {