Merge pull request #1711 from spencerhance/redirects-fix

Fix HttpsRedirects Lifecycle
kubernetes · May 10, 2022 · 55ed944 · 55ed944
2 parents 37a3586 + 56273f5
commit 55ed944
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/pkg/loadbalancers/target_proxies.go b/pkg/loadbalancers/target_proxies.go
@@ -38,7 +38,6 @@ func (l *L7) checkProxy() (err error) {
 	// TODO(shance): move to translator
 	var umName string
 	if flags.F.EnableFrontendConfig {
-		// TODO(shance): check for empty name?
 		if l.redirectUm != nil && l.runtimeInfo.FrontendConfig.Spec.RedirectToHttps != nil && l.runtimeInfo.FrontendConfig.Spec.RedirectToHttps.Enabled {
 			umName = l.redirectUm.Name
 		} else {

diff --git a/pkg/loadbalancers/url_maps.go b/pkg/loadbalancers/url_maps.go
@@ -119,7 +119,10 @@ func (l *L7) ensureRedirectURLMap() error {
 			return nil
 		} else {
 			if err := composite.DeleteUrlMap(l.cloud, key, l.Versions().UrlMap); err != nil {
-				return err
+				// Do not block LB sync if this fails
+				klog.Errorf("DeleteUrlMap(%s) = %v", key, err)
+				// Signal to the rest of the controller that the UrlMap still exists
+				l.redirectUm = &composite.UrlMap{Name: key.Name}
 			}
 		}
 		return nil