Merge pull request #435 from rramkumar1/master

BackendPool Update() should set backend service version
kubernetes · Aug 15, 2018 · 274a1e5 · 274a1e5
2 parents 3ec7acf + a727f62
commit 274a1e5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/pkg/backends/backends.go b/pkg/backends/backends.go
@@ -108,6 +108,8 @@ func (b *Backends) Create(sp utils.ServicePort, hcLink string) (*composite.Backe
 
 // Update implements Pool.
 func (b *Backends) Update(be *composite.BackendService) error {
+	// Ensure the backend service has the proper version before updating.
+	be.Version = features.VersionFromDescription(be.Description)
 	if err := composite.UpdateBackendService(be, b.cloud); err != nil {
 		return err
 	}

diff --git a/pkg/backends/syncer.go b/pkg/backends/syncer.go
@@ -105,8 +105,7 @@ func (s *backendSyncer) ensureBackendService(sp utils.ServicePort) error {
 			return err
 		}
 	}
-	// Set composite backend service to the version required by current service port.
-	be.Version = version
+
 	needUpdate := ensureProtocol(be, sp)
 	needUpdate = ensureHealthCheckLink(be, hcLink) || needUpdate
 	needUpdate = ensureDescription(be, &sp) || needUpdate