Merge pull request #44472 from perotinus/annotation_fixes

Automatic merge from submit-queue (batch tested with PRs 44607, 44472, 44482) [Federation] Fix the comments on FederationNameAnnotation Follow-up for minor issues raised in #42683 ```release-note NONE ```

Merge pull request #44472 from perotinus/annotation_fixes
d059c32c · Kubernetes Submit Queue · GitHub · b7f890fc · 3e69ca74 · d059c32c
Commit d059c32c authored Apr 25, 2017 by Kubernetes Submit Queue Committed by GitHub Apr 25, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

annotations.go federation/apis/federation/annotations.go +4 -3

No files found.
--- a/federation/apis/federation/annotations.go
+++ b/federation/apis/federation/annotations.go
 /*
-Copyright 2016 The Kubernetes Authors.
+Copyright 2017 The Kubernetes Authors.

 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -17,8 +17,9 @@ limitations under the License.
 package federation

 // FederationNameAnnotation is the annotation which holds the name of
-// the federation that an object is associated with. It must be
-// applied to all API objects associated with that federation.
+// the federation that a federation control plane component is associated
+// with. It must be applied to all the API types that represent that federations
+// control plane's components in the host cluster and in joining clusters.
 const FederationNameAnnotation = "federation.alpha.kubernetes.io/federation-name"

 // ClusterNameAnnotation is the annotation which holds the name of