Skip to content

Commit 1a8a666

Browse files
committed
log info messages for different config usage modes
1 parent bf49c18 commit 1a8a666

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

cmd/operator-sdk/olmcatalog/gen-csv.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,18 +90,23 @@ func genCSVFunc(cmd *cobra.Command, args []string) (err error) {
9090

9191
var csvCfgFile *catalog.CSVConfigFile
9292
if writeCSVConfig {
93+
log.Info("Writing new default CSV config.")
9394
csvCfg := &catalog.CSVConfig{
9495
Input: input.Input{Path: csvConfigPath},
9596
}
9697
if err = s.Execute(cfg, csvCfg); err != nil {
9798
return fmt.Errorf("error scaffolding CSV config: %v", err)
9899
}
99100
csvCfgFile = csvCfg.File
100-
} else {
101+
} else if _, err = os.Stat(csvConfigPath); err == nil {
102+
log.Info("Using custom CSV config.")
101103
csvCfgFile, err = catalog.GetCSVConfigFile(csvConfigPath)
102104
if err != nil {
103105
return err
104106
}
107+
} else {
108+
log.Info("Using default CSV config.")
109+
csvCfgFile = &catalog.CSVConfigFile{}
105110
}
106111

107112
log.Infof("Generating CSV manifest version %s", csvVersion)

internal/pkg/scaffold/olm-catalog/csv.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,9 @@ func (s *CSV) GetInput() (input.Input, error) {
9292
}
9393
if s.CSVConfigFile == nil {
9494
s.CSVConfigFile = &CSVConfigFile{}
95-
if err := s.CSVConfigFile.setFields(); err != nil {
96-
return input.Input{}, err
97-
}
95+
}
96+
if err := s.CSVConfigFile.setFields(); err != nil {
97+
return input.Input{}, err
9898
}
9999
return s.Input, nil
100100
}

0 commit comments

Comments
 (0)