From 4642c3ab491b4360f2cfba71cac5b9d5148f9efc Mon Sep 17 00:00:00 2001
From: John Collier <John.J.Collier@ibm.com>
Date: Wed, 12 Aug 2020 10:29:26 -0400
Subject: [PATCH] Add default registry when preferences initialized

Signed-off-by: John Collier <John.J.Collier@ibm.com>
---
 pkg/preference/preference.go | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/pkg/preference/preference.go b/pkg/preference/preference.go
index 928f23ba6af..aa23c28776d 100644
--- a/pkg/preference/preference.go
+++ b/pkg/preference/preference.go
@@ -218,6 +218,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
 	}
 
@@ -226,20 +235,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
 }