Skip to content

Commit

Permalink
Add default registry when preferences initialized
Browse files Browse the repository at this point in the history
Signed-off-by: John Collier <John.J.Collier@ibm.com>
  • Loading branch information
johnmcollier committed Aug 12, 2020
1 parent 8b213dc commit 274acb7
Showing 1 changed file with 9 additions and 14 deletions.
23 changes: 9 additions & 14 deletions pkg/preference/preference.go
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,15 @@ func NewPreferenceInfo() (*PreferenceInfo, error) {

// If the preference file doesn't exist then we return with default preference
if _, err = os.Stat(preferenceFile); os.IsNotExist(err) {
// Handle user has preference file but doesn't use dynamic registry before
defaultRegistryList := []Registry{
{
Name: DefaultDevfileRegistryName,
URL: DefaultDevfileRegistryURL,
Secure: false,
},
}
c.OdoSettings.RegistryList = &defaultRegistryList
return &c, nil
}

Expand All @@ -213,20 +222,6 @@ func NewPreferenceInfo() (*PreferenceInfo, error) {
return nil, err
}

if c.OdoSettings.Experimental != nil && *c.OdoSettings.Experimental {
if c.OdoSettings.RegistryList == nil {
// Handle user has preference file but doesn't use dynamic registry before
defaultRegistryList := []Registry{
{
Name: DefaultDevfileRegistryName,
URL: DefaultDevfileRegistryURL,
Secure: false,
},
}
c.OdoSettings.RegistryList = &defaultRegistryList
}
}

return &c, nil
}

Expand Down

0 comments on commit 274acb7

Please sign in to comment.