github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-27 13:15:36 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #25119 from XiaoningDing/api-shared-annotations

Browse Source 
move shared annotations to new api/annotations package
This commit is contained in:
Fabio Yeon
2016-05-10 19:34:17 -07:00
parent a206b3680c 441e206671
commit 0809b2be4d
7 changed files with 81 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/e2e/kubectl.go
View File

@@ -40,11 +40,11 @@ import (
"github.com/ghodss/yaml"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/annotations"
apierrs "k8s.io/kubernetes/pkg/api/errors"
"k8s.io/kubernetes/pkg/api/unversioned"
client "k8s.io/kubernetes/pkg/client/unversioned"
"k8s.io/kubernetes/pkg/controller"
"k8s.io/kubernetes/pkg/kubectl"
"k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/labels"
utilnet "k8s.io/kubernetes/pkg/util/net"
@@ -1438,7 +1438,7 @@ func forEachReplicationController(c *client.Client, ns, selectorKey, selectorVal
func validateReplicationControllerConfiguration(rc api.ReplicationController) {
if rc.Name == "redis-master" {
if _, ok := rc.Annotations[kubectl.LastAppliedConfigAnnotation]; !ok {
if _, ok := rc.Annotations[annotations.LastAppliedConfigAnnotation]; !ok {
framework.Failf("Annotation not found in modified configuration:\n%v\n", rc)
}