Merge pull request #1119 from skmatti/log-fix

Force send Enable field for LogConfig
kubernetes · May 26, 2020 · a294488 · a294488
2 parents 311d713 + 12a7618
commit a294488
Show file tree

Hide file tree

Showing 3 changed files with 13 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
@@ -3182,6 +3182,9 @@ func (backendService *BackendService) ToAlpha() (*computealpha.BackendService, e
 	if alpha.Iap != nil {
 		alpha.Iap.ForceSendFields = []string{"Enabled", "Oauth2ClientId", "Oauth2ClientSecret"}
 	}
+	if alpha.LogConfig != nil {
+		alpha.LogConfig.ForceSendFields = []string{"Enable"}
+	}
 
 	return alpha, nil
 }
@@ -3201,6 +3204,9 @@ func (backendService *BackendService) ToBeta() (*computebeta.BackendService, err
 	if beta.Iap != nil {
 		beta.Iap.ForceSendFields = []string{"Enabled", "Oauth2ClientId", "Oauth2ClientSecret"}
 	}
+	if beta.LogConfig != nil {
+		beta.LogConfig.ForceSendFields = []string{"Enable"}
+	}
 
 	return beta, nil
 }
@@ -3220,6 +3226,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
 }

diff --git a/pkg/composite/gen/main.go b/pkg/composite/gen/main.go
@@ -824,6 +824,9 @@ func ({{$type.VarName}} *{{$type.Name}}) To{{$version}}() (*compute{{$extension}
 	if {{$lower}}.Iap != nil {
 		{{$lower}}.Iap.ForceSendFields = []string{"Enabled", "Oauth2ClientId", "Oauth2ClientSecret"}
 	}
+	if {{$lower}}.LogConfig != nil {
+		{{$lower}}.LogConfig.ForceSendFields = []string{"Enable"}
+	}
 	{{- end}}
 
 	return {{$lower}}, nil