Merge pull request #3456 from justinsb/gce_forwardingrule_lifecycle

Automatic merge from submit-queue. GCE: Ignore Lifecycle in forwarding rule
2017-09-27 11:17:34 -07:00 · 2017-09-27 11:17:34 -07:00 · ea314784b5
parent dce11865a7 7166365006
commit ea314784b5
1 changed files with 3 additions and 0 deletions
--- a/upup/pkg/fi/cloudup/gcetasks/forwardingrule.go
+++ b/upup/pkg/fi/cloudup/gcetasks/forwardingrule.go
@ -73,6 +73,9 @@ func (e *ForwardingRule) Find(c *fi.Context) (*ForwardingRule, error) {
 		actual.IPAddress = address
 	}

+	// Ignore "system" fields
+	actual.Lifecycle = e.Lifecycle
+
 	return actual, nil
 }