Force send Enable field for LogConfig

kubernetes · May 26, 2020 · babffa2 · babffa2
1 parent 4c0e352
commit babffa2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/pkg/backends/features/logging.go b/pkg/backends/features/logging.go
@@ -40,7 +40,7 @@ func EnsureLogging(sp utils.ServicePort, be *composite.BackendService) bool {
 	if be.LogConfig == nil || expectedLogConfig.Enable != be.LogConfig.Enable ||
 		expectedLogConfig.SampleRate != be.LogConfig.SampleRate {
 		be.LogConfig = expectedLogConfig
-		klog.V(2).Infof("Updated Logging settings for service %s(Enable: %t, SampleRate: %f)", svcKey, be.LogConfig.Enable, be.LogConfig.SampleRate)
+		klog.V(2).Infof("Updated Logging settings for service %s and port %d (Enable: %t, SampleRate: %f)", svcKey, sp.Port, be.LogConfig.Enable, be.LogConfig.SampleRate)
 		return true
 	}
 	return false

diff --git a/pkg/composite/gen.go b/pkg/composite/gen.go
@@ -3220,6 +3220,9 @@ func (backendService *BackendService) ToGA() (*compute.BackendService, error) {
 	if ga.Iap != nil {
 		ga.Iap.ForceSendFields = []string{"Enabled", "Oauth2ClientId", "Oauth2ClientSecret"}
 	}
+	if ga.LogConfig != nil {
+		ga.LogConfig.ForceSendFields = []string{"Enable"}
+	}
 
 	return ga, nil
 }