logging: fix names of keys
The stricter checking with the upcoming logcheck v0.4.1 pointed out these names which don't comply with our recommendations in https://github.com/kubernetes/community/blob/master/contributors/devel/sig-instrumentation/migration-to-structured-logging.md#name-arguments. Kubernetes-commit: bc6c7fa91201348d010b638fbadf32007c0ac546
This commit is contained in:
		
							parent
							
								
									ce86ff4a7b
								
							
						
					
					
						commit
						8f8c30ff8f
					
				|  | @ -70,7 +70,7 @@ func WithAuthorization(handler http.Handler, a authorizer.Authorizer, s runtime. | |||
| 			return | ||||
| 		} | ||||
| 
 | ||||
| 		klog.V(4).InfoS("Forbidden", "URI", req.RequestURI, "Reason", reason) | ||||
| 		klog.V(4).InfoS("Forbidden", "URI", req.RequestURI, "reason", reason) | ||||
| 		audit.AddAuditAnnotations(ctx, | ||||
| 			decisionAnnotationKey, decisionForbid, | ||||
| 			reasonAnnotationKey, reason) | ||||
|  |  | |||
|  | @ -109,14 +109,14 @@ func WithImpersonation(handler http.Handler, a authorizer.Authorizer, s runtime. | |||
| 				actingAsAttributes.Resource = "uids" | ||||
| 
 | ||||
| 			default: | ||||
| 				klog.V(4).InfoS("unknown impersonation request type", "Request", impersonationRequest) | ||||
| 				klog.V(4).InfoS("unknown impersonation request type", "request", impersonationRequest) | ||||
| 				responsewriters.Forbidden(ctx, actingAsAttributes, w, req, fmt.Sprintf("unknown impersonation request type: %v", impersonationRequest), s) | ||||
| 				return | ||||
| 			} | ||||
| 
 | ||||
| 			decision, reason, err := a.Authorize(ctx, actingAsAttributes) | ||||
| 			if err != nil || decision != authorizer.DecisionAllow { | ||||
| 				klog.V(4).InfoS("Forbidden", "URI", req.RequestURI, "Reason", reason, "Error", err) | ||||
| 				klog.V(4).InfoS("Forbidden", "URI", req.RequestURI, "reason", reason, "err", err) | ||||
| 				responsewriters.Forbidden(ctx, actingAsAttributes, w, req, reason, s) | ||||
| 				return | ||||
| 			} | ||||
|  |  | |||
|  | @ -149,7 +149,7 @@ func (f *FieldManager) UpdateNoErrors(liveObj, newObj runtime.Object, manager st | |||
| 				name = accessor.GetName() | ||||
| 			} | ||||
| 
 | ||||
| 			klog.ErrorS(err, "[SHOULD NOT HAPPEN] failed to update managedFields", "VersionKind", | ||||
| 			klog.ErrorS(err, "[SHOULD NOT HAPPEN] failed to update managedFields", "versionKind", | ||||
| 				newObj.GetObjectKind().GroupVersionKind(), "namespace", ns, "name", name) | ||||
| 		}) | ||||
| 		// Explicitly remove managedFields on failure, so that
 | ||||
|  |  | |||
|  | @ -211,7 +211,7 @@ func (r *RequestInfoFactory) NewRequestInfo(req *http.Request) (*RequestInfo, er | |||
| 		opts := metainternalversion.ListOptions{} | ||||
| 		if err := metainternalversionscheme.ParameterCodec.DecodeParameters(req.URL.Query(), metav1.SchemeGroupVersion, &opts); err != nil { | ||||
| 			// An error in parsing request will result in default to "list" and not setting "name" field.
 | ||||
| 			klog.ErrorS(err, "Couldn't parse request", "Request", req.URL.Query()) | ||||
| 			klog.ErrorS(err, "Couldn't parse request", "request", req.URL.Query()) | ||||
| 			// Reset opts to not rely on partial results from parsing.
 | ||||
| 			// However, if watch is set, let's report it.
 | ||||
| 			opts = metainternalversion.ListOptions{} | ||||
|  |  | |||
|  | @ -55,7 +55,7 @@ func WithPanicRecovery(handler http.Handler, resolver request.RequestInfoResolve | |||
| 			return | ||||
| 		} | ||||
| 		http.Error(w, "This request caused apiserver to panic. Look in the logs for details.", http.StatusInternalServerError) | ||||
| 		klog.ErrorS(nil, "apiserver panic'd", "method", req.Method, "URI", req.RequestURI, "audit-ID", audit.GetAuditIDTruncated(req.Context())) | ||||
| 		klog.ErrorS(nil, "apiserver panic'd", "method", req.Method, "URI", req.RequestURI, "auditID", audit.GetAuditIDTruncated(req.Context())) | ||||
| 	}) | ||||
| } | ||||
| 
 | ||||
|  |  | |||
|  | @ -522,7 +522,7 @@ func (s preparedGenericAPIServer) Run(stopCh <-chan struct{}) error { | |||
| 		//   net/http waits for 1s for the peer to respond to a GO_AWAY frame, so
 | ||||
| 		//   we should wait for a minimum of 2s
 | ||||
| 		shutdownTimeout = 2 * time.Second | ||||
| 		klog.V(1).InfoS("[graceful-termination] using HTTP Server shutdown timeout", "ShutdownTimeout", shutdownTimeout) | ||||
| 		klog.V(1).InfoS("[graceful-termination] using HTTP Server shutdown timeout", "shutdownTimeout", shutdownTimeout) | ||||
| 	} | ||||
| 
 | ||||
| 	notAcceptingNewRequestCh := s.lifecycleSignals.NotAcceptingNewRequest | ||||
|  |  | |||
|  | @ -175,7 +175,7 @@ func (t *envelopeTransformer) TransformToStorage(ctx context.Context, data []byt | |||
| 	// Check keyID freshness and write to log if key IDs are different
 | ||||
| 	statusKeyID, err := t.keyIDGetter(ctx) | ||||
| 	if err == nil && encObject.KeyID != statusKeyID { | ||||
| 		klog.V(2).InfoS("observed different key IDs when encrypting content using kms v2 envelope service", "uid", uid, "encObject.KeyID", encObject.KeyID, "statusKeyID", statusKeyID) | ||||
| 		klog.V(2).InfoS("observed different key IDs when encrypting content using kms v2 envelope service", "uid", uid, "objectKeyID", encObject.KeyID, "statusKeyID", statusKeyID) | ||||
| 	} | ||||
| 
 | ||||
| 	// Serialize the EncryptedObject to a byte array.
 | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue