github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #44472 from perotinus/annotation_fixes

Browse Source 
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
```
This commit is contained in:
Kubernetes Submit Queue 2017-04-25 14:47:39 -07:00 committed by GitHub
commit d059c32cdf
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
federation/apis/federation/annotations.go
View File

@ -1,5 +1,5 @@
/* /*
Copyright 2016 The Kubernetes Authors. Copyright 2017 The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
@ -17,8 +17,9 @@ limitations under the License.
package federation package federation
// FederationNameAnnotation is the annotation which holds the name of // FederationNameAnnotation is the annotation which holds the name of
// the federation that an object is associated with. It must be // the federation that a federation control plane component is associated
// applied to all API objects associated with that federation. // 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" const FederationNameAnnotation = "federation.alpha.kubernetes.io/federation-name"
// ClusterNameAnnotation is the annotation which holds the name of // ClusterNameAnnotation is the annotation which holds the name of