Skip to content

Commit b12ae4e

Browse files
committed
fix publishing to hashrelease VM (projectcalico#10636)
1 parent 09f0bf9 commit b12ae4e

File tree

1 file changed

+12
-6
lines changed

1 file changed

+12
-6
lines changed

release/internal/hashreleaseserver/server.go

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,9 @@ func (h *Hashrelease) URL() string {
8787
//
8888
// 3. It sets it as the latest for its product stream if specified.
8989
func Publish(productCode string, h *Hashrelease, cfg *Config) error {
90-
srcDir := strings.TrimSuffix(h.Source, "/") + "/"
9190
logrus.WithFields(logrus.Fields{
9291
"hashrelease": h.Name,
93-
"srcDir": srcDir,
92+
"srcDir": h.Source,
9493
"latest": h.Latest,
9594
}).Info("Publishing hashrelease")
9695

@@ -119,14 +118,18 @@ func publishFiles(h *Hashrelease, cfg *Config) error {
119118
logrus.WithFields(logrus.Fields{
120119
"hashrelease": h.Name,
121120
"srcDir": h.Source,
122-
}).Info("Publishing hashrelease")
121+
}).Info("Publishing hashrelease files")
123122
var allErr error
124123
// publish to the server via SSH
125-
logrus.WithField("hashrelease", h.Name).Debug("Publishing hashrelease via SSH")
124+
srcDir := strings.TrimSuffix(h.Source, "/") + "/"
125+
logrus.WithFields(logrus.Fields{
126+
"hashrelease": h.Name,
127+
"srcDir": srcDir,
128+
}).Debug("Publishing hashrelease via SSH")
126129
if _, err := command.Run("rsync",
127130
[]string{
128131
"--stats", "-az", "--delete",
129-
fmt.Sprintf("--rsh=%s", cfg.RSHCommand()), h.Source,
132+
fmt.Sprintf("--rsh=%s", cfg.RSHCommand()), srcDir,
130133
fmt.Sprintf("%s:%s/%s", cfg.HostString(), RemoteDocsPath(cfg.User), h.Name),
131134
}); err != nil {
132135
logrus.WithError(err).Error("Failed to publish hashrelease via SSH")
@@ -138,7 +141,10 @@ func publishFiles(h *Hashrelease, cfg *Config) error {
138141
logrus.WithError(err).Error("Failed to get credentials email for hashrelease server")
139142
return errors.Join(allErr, fmt.Errorf("failed to get credentials email for hashrelease server: %w", err))
140143
}
141-
logrus.WithField("hashrelease", h.Name).Debug("Publishing hashrelease to cloud storage")
144+
logrus.WithFields(logrus.Fields{
145+
"hashrelease": h.Name,
146+
"srcDir": h.Source,
147+
}).Debug("Publishing hashrelease to cloud storage")
142148
args := []string{
143149
"storage", "rsync",
144150
h.Source, fmt.Sprintf("gs://%s/%s", cfg.BucketName, h.Name),

0 commit comments

Comments
 (0)