File tree 2 files changed +9
-4
lines changed
cmd/operator-sdk/olmcatalog
internal/pkg/scaffold/olm-catalog 2 files changed +9
-4
lines changed Original file line number Diff line number Diff line change @@ -90,18 +90,23 @@ func genCSVFunc(cmd *cobra.Command, args []string) (err error) {
90
90
91
91
var csvCfgFile * catalog.CSVConfigFile
92
92
if writeCSVConfig {
93
+ log .Info ("Writing new default CSV config." )
93
94
csvCfg := & catalog.CSVConfig {
94
95
Input : input.Input {Path : csvConfigPath },
95
96
}
96
97
if err = s .Execute (cfg , csvCfg ); err != nil {
97
98
return fmt .Errorf ("error scaffolding CSV config: %v" , err )
98
99
}
99
100
csvCfgFile = csvCfg .File
100
- } else {
101
+ } else if _ , err = os .Stat (csvConfigPath ); err == nil {
102
+ log .Info ("Using custom CSV config." )
101
103
csvCfgFile , err = catalog .GetCSVConfigFile (csvConfigPath )
102
104
if err != nil {
103
105
return err
104
106
}
107
+ } else {
108
+ log .Info ("Using default CSV config." )
109
+ csvCfgFile = & catalog.CSVConfigFile {}
105
110
}
106
111
107
112
log .Infof ("Generating CSV manifest version %s" , csvVersion )
Original file line number Diff line number Diff line change @@ -92,9 +92,9 @@ func (s *CSV) GetInput() (input.Input, error) {
92
92
}
93
93
if s .CSVConfigFile == nil {
94
94
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
98
98
}
99
99
return s .Input , nil
100
100
}
You can’t perform that action at this time.
0 commit comments