Skip to content

Commit 5c36fe0

Browse files
committed
[FIX] 修改outdir,避免invalid cross-device link
1 parent 1601809 commit 5c36fe0

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

pkg/syncer/index.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,6 @@ func (s *Syncer) loadCharts(charts ...string) error {
121121

122122
klog.V(5).Infof("Found %d versions for %q chart: %v", len(versions), name, versions)
123123
klog.V(3).Infof("Indexing %q charts...", name)
124-
// TODO 在这里添加版本的正则过滤
125124
if s.latestVersionOnly {
126125
vs := make([]*semver.Version, len(versions))
127126
for i, r := range versions {
@@ -223,8 +222,10 @@ func (s *Syncer) loadChart(name string, version string) error {
223222
return errors.Trace(err)
224223
}
225224

226-
if err = modifyChartImageTag(tgz); err != nil {
227-
return errors.Trace(err)
225+
if s.relocateContainerImages {
226+
if err = modifyChartImageTag(tgz); err != nil {
227+
return errors.Trace(err)
228+
}
228229
}
229230

230231
ch := &Chart{

pkg/syncer/sync.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package syncer
22

33
import (
44
"fmt"
5-
"io/ioutil"
65
"os"
76
"path"
87
"path/filepath"
@@ -55,7 +54,8 @@ func (s *Syncer) SyncPendingCharts(names ...string) error {
5554
klog.Infof("Syncing %q chart...", id)
5655

5756
klog.V(3).Infof("Processing %q chart...", id)
58-
outdir, err := ioutil.TempDir("", "charts-syncer")
57+
cwd, _ := os.Getwd()
58+
outdir, err := os.MkdirTemp(cwd, "charts-syncer")
5959
if err != nil {
6060
klog.Errorf("unable to create output directory for %q chart: %+v", id, err)
6161
errs = multierror.Append(errs, errors.Trace(err))
@@ -65,7 +65,7 @@ func (s *Syncer) SyncPendingCharts(names ...string) error {
6565

6666
hasDeps := len(ch.Dependencies) > 0
6767

68-
workdir, err := ioutil.TempDir("", "charts-syncer")
68+
workdir, err := os.MkdirTemp("", "charts-syncer")
6969
if err != nil {
7070
klog.Errorf("unable to create work directory for %q chart: %+v", id, err)
7171
errs = multierror.Append(errs, errors.Trace(err))
@@ -156,7 +156,7 @@ func (s *Syncer) SyncWithChartsSyncer(ch *Chart, id, workdir, outdir string, has
156156

157157
// Read final chart metadata
158158
configFilePath := fmt.Sprintf("%s/Chart.yaml", chartPath)
159-
chartConfig, err := ioutil.ReadFile(configFilePath)
159+
chartConfig, err := os.ReadFile(configFilePath)
160160
if err != nil {
161161
klog.Errorf("unable to read %q metadata: %+v", id, err)
162162
return "", errors.Trace(err)

0 commit comments

Comments
 (0)