fix file read bug (koderover#339)

* fix file read bug Signed-off-by: allenshen <[email protected]> * remove debug code Signed-off-by: allenshen <[email protected]>
chuanyi-zjc · Sep 27, 2021 · 08b0c45 · 08b0c45
1 parent cc7c0da
commit 08b0c45
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/pkg/microservice/aslan/core/service/service/helm.go b/pkg/microservice/aslan/core/service/service/helm.go
@@ -341,7 +341,6 @@ func CreateOrUpdateHelmServiceFromGitRepo(projectName string, args *HelmServiceC
 				func(chartTree afero.Fs) (string, error) {
 					chartName, _, err := readChartYAML(afero.NewIOFS(chartTree), filepath.Base(filePath), log)
 					serviceName = chartName
-
 					return chartName, err
 				})
 			if err != nil {
@@ -429,13 +428,13 @@ func readValuesYAML(chartTree fs.FS, base string, logger *zap.SugaredLogger) ([]
 }
 
 func createOrUpdateHelmService(fsTree fs.FS, args *helmServiceCreationArgs, logger *zap.SugaredLogger) (*models.Service, error) {
-	chartName, chartVersion, err := readChartYAML(fsTree, filepath.Base(args.FilePath), logger)
+	chartName, chartVersion, err := readChartYAML(fsTree, filepath.Base(args.ServiceName), logger)
 	if err != nil {
 		logger.Errorf("Failed to read chart.yaml, err %s", err)
 		return nil, err
 	}
 
-	values, valuesMap, err := readValuesYAML(fsTree, filepath.Base(args.FilePath), logger)
+	values, valuesMap, err := readValuesYAML(fsTree, filepath.Base(args.ServiceName), logger)
 	if err != nil {
 		logger.Errorf("Failed to read values.yaml, err %s", err)
 		return nil, err