Merge pull request #321 from sanchezl/degrade-on-no-host-etcd-endpoints

Degrade on no host etcd endpoints
openshift · Feb 27, 2020 · d82183b · d82183b
2 parents 9eda24a + ae641d6
commit d82183b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/pkg/operator/configobservation/etcdobserver/observe_etcd.go b/pkg/operator/configobservation/etcdobserver/observe_etcd.go
@@ -42,8 +42,9 @@ func ObserveStorageURLs(genericListers configobserver.Listers, recorder events.R
 	var etcdURLs sort.StringSlice
 	etcdEndpoints, err := listers.EndpointsLister.Endpoints(EtcdEndpointNamespace).Get(EtcdEndpointName)
 	if errors.IsNotFound(err) {
-		recorder.Warningf("ObserveStorageFailed", "Required endpoints/%s in the %s namespace not found, falling back to default etcd service", EtcdEndpointName, EtcdEndpointNamespace)
-		return observedConfig, errs
+		recorder.Warningf("ObserveStorageFailed", "Required endpoints/%s in the %s namespace not found.", EtcdEndpointName, EtcdEndpointNamespace)
+		errs = append(errs, fmt.Errorf("endpoints/%s in the %s namespace: not found", EtcdEndpointName, EtcdEndpointNamespace))
+		return previouslyObservedConfig, errs
 	}
 	if err != nil {
 		recorder.Warningf("ObserveStorageFailed", "Error getting endpoints/%s in the %s namespace: %v", EtcdEndpointName, EtcdEndpointNamespace, err)

diff --git a/pkg/operator/configobservation/etcdobserver/observe_etcd_test.go b/pkg/operator/configobservation/etcdobserver/observe_etcd_test.go
@@ -28,7 +28,8 @@ func TestObserveStorageURLs(t *testing.T) {
 		{
 			name:          "NoEtcdHosts",
 			currentConfig: observedConfig(withStorageURL("https://previous.url:2379")),
-			expected:      observedConfig(),
+			expected:      observedConfig(withStorageURL("https://previous.url:2379")),
+			expectErrors:  true,
 		},
 		{
 			name:          "ValidIPv4",