Move API annotations into annotation_key_constants and remove api/annotations package

This commit is contained in:
Zihong Zheng
2017-05-16 15:30:29 -07:00
parent a82676a126
commit c0920f75cf
26 changed files with 215 additions and 325 deletions

View File

@@ -35,7 +35,6 @@ import (
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/client-go/util/integer"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/annotations"
"k8s.io/kubernetes/pkg/api/v1"
internalextensions "k8s.io/kubernetes/pkg/apis/extensions"
extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
@@ -285,12 +284,12 @@ func SetNewReplicaSetAnnotations(deployment *extensions.Deployment, newRS *exten
}
var annotationsToSkip = map[string]bool{
annotations.LastAppliedConfigAnnotation: true,
RevisionAnnotation: true,
RevisionHistoryAnnotation: true,
DesiredReplicasAnnotation: true,
MaxReplicasAnnotation: true,
OverlapAnnotation: true,
v1.LastAppliedConfigAnnotation: true,
RevisionAnnotation: true,
RevisionHistoryAnnotation: true,
DesiredReplicasAnnotation: true,
MaxReplicasAnnotation: true,
OverlapAnnotation: true,
}
// skipCopyAnnotation returns true if we should skip copying the annotation with the given annotation key