Skip to content

Commit 15a883b

Browse files
yue9944882yue9944882
committed
s/apiextensions/apiextensionsv1/ for all imports in k/k
rename alias import fmt
1 parent 168f8f5 commit 15a883b

File tree

22 files changed

+445
-445
lines changed

22 files changed

+445
-445
lines changed

‎pkg/master/controller/crdregistration/crdregistration_controller.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222

2323
"k8s.io/klog"
2424

25-
apiextensions "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
25+
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
2626
crdinformers "k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/apiextensions/v1"
2727
crdlisters "k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/v1"
2828
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -73,24 +73,24 @@ func NewCRDRegistrationController(crdinformer crdinformers.CustomResourceDefinit
7373

7474
crdinformer.Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{
7575
AddFunc: func(obj interface{}) {
76-
cast := obj.(*apiextensions.CustomResourceDefinition)
76+
cast := obj.(*apiextensionsv1.CustomResourceDefinition)
7777
c.enqueueCRD(cast)
7878
},
7979
UpdateFunc: func(oldObj, newObj interface{}) {
8080
// Enqueue both old and new object to make sure we remove and add appropriate API services.
8181
// The working queue will resolve any duplicates and only changes will stay in the queue.
82-
c.enqueueCRD(oldObj.(*apiextensions.CustomResourceDefinition))
83-
c.enqueueCRD(newObj.(*apiextensions.CustomResourceDefinition))
82+
c.enqueueCRD(oldObj.(*apiextensionsv1.CustomResourceDefinition))
83+
c.enqueueCRD(newObj.(*apiextensionsv1.CustomResourceDefinition))
8484
},
8585
DeleteFunc: func(obj interface{}) {
86-
cast, ok := obj.(*apiextensions.CustomResourceDefinition)
86+
cast, ok := obj.(*apiextensionsv1.CustomResourceDefinition)
8787
if !ok {
8888
tombstone, ok := obj.(cache.DeletedFinalStateUnknown)
8989
if !ok {
9090
klog.V(2).Infof("Couldn't get object from tombstone %#v", obj)
9191
return
9292
}
93-
cast, ok = tombstone.Obj.(*apiextensions.CustomResourceDefinition)
93+
cast, ok = tombstone.Obj.(*apiextensionsv1.CustomResourceDefinition)
9494
if !ok {
9595
klog.V(2).Infof("Tombstone contained unexpected object: %#v", obj)
9696
return
@@ -184,7 +184,7 @@ func (c *crdRegistrationController) processNextWorkItem() bool {
184184
return true
185185
}
186186

187-
func (c *crdRegistrationController) enqueueCRD(crd *apiextensions.CustomResourceDefinition) {
187+
func (c *crdRegistrationController) enqueueCRD(crd *apiextensionsv1.CustomResourceDefinition) {
188188
for _, version := range crd.Spec.Versions {
189189
c.queue.Add(schema.GroupVersion{Group: crd.Spec.Group, Version: version.Name})
190190
}

‎pkg/master/controller/crdregistration/crdregistration_controller_test.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"reflect"
2121
"testing"
2222

23-
apiextensions "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
23+
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
2424
crdlisters "k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/v1"
2525
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2626
"k8s.io/apimachinery/pkg/runtime/schema"
@@ -31,21 +31,21 @@ import (
3131
func TestHandleVersionUpdate(t *testing.T) {
3232
tests := []struct {
3333
name string
34-
startingCRDs []*apiextensions.CustomResourceDefinition
34+
startingCRDs []*apiextensionsv1.CustomResourceDefinition
3535
version schema.GroupVersion
3636

3737
expectedAdded []*apiregistration.APIService
3838
expectedRemoved []string
3939
}{
4040
{
4141
name: "simple add crd",
42-
startingCRDs: []*apiextensions.CustomResourceDefinition{
42+
startingCRDs: []*apiextensionsv1.CustomResourceDefinition{
4343
{
44-
Spec: apiextensions.CustomResourceDefinitionSpec{
44+
Spec: apiextensionsv1.CustomResourceDefinitionSpec{
4545
Group: "group.com",
4646
// Version field is deprecated and crd registration won't rely on it at all.
4747
// defaulting route will fill up Versions field if user only provided version field.
48-
Versions: []apiextensions.CustomResourceDefinitionVersion{
48+
Versions: []apiextensionsv1.CustomResourceDefinitionVersion{
4949
{
5050
Name: "v1",
5151
Served: true,
@@ -71,11 +71,11 @@ func TestHandleVersionUpdate(t *testing.T) {
7171
},
7272
{
7373
name: "simple remove crd",
74-
startingCRDs: []*apiextensions.CustomResourceDefinition{
74+
startingCRDs: []*apiextensionsv1.CustomResourceDefinition{
7575
{
76-
Spec: apiextensions.CustomResourceDefinitionSpec{
76+
Spec: apiextensionsv1.CustomResourceDefinitionSpec{
7777
Group: "group.com",
78-
Versions: []apiextensions.CustomResourceDefinitionVersion{
78+
Versions: []apiextensionsv1.CustomResourceDefinitionVersion{
7979
{
8080
Name: "v1",
8181
Served: true,

‎staging/src/k8s.io/apiextensions-apiserver/pkg/apihelpers/helpers.go‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"strings"
2323
"time"
2424

25-
apiextensions "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
25+
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
2626
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2727
)
2828

@@ -56,24 +56,24 @@ const (
5656

5757
// GetAPIApprovalState returns the state of the API approval and reason for that state
5858
func GetAPIApprovalState(annotations map[string]string) (state APIApprovalState, reason string) {
59-
annotation := annotations[apiextensions.KubeAPIApprovedAnnotation]
59+
annotation := annotations[apiextensionsv1.KubeAPIApprovedAnnotation]
6060

6161
// we use the result of this parsing in the switch/case below
6262
url, annotationURLParseErr := url.ParseRequestURI(annotation)
6363
switch {
6464
case len(annotation) == 0:
65-
return APIApprovalMissing, fmt.Sprintf("protected groups must have approval annotation %q, see https://github.com/kubernetes/enhancements/pull/1111", apiextensions.KubeAPIApprovedAnnotation)
65+
return APIApprovalMissing, fmt.Sprintf("protected groups must have approval annotation %q, see https://github.com/kubernetes/enhancements/pull/1111", apiextensionsv1.KubeAPIApprovedAnnotation)
6666
case strings.HasPrefix(annotation, "unapproved"):
6767
return APIApprovalBypassed, fmt.Sprintf("not approved: %q", annotation)
6868
case annotationURLParseErr == nil && url != nil && len(url.Host) > 0 && len(url.Scheme) > 0:
6969
return APIApproved, fmt.Sprintf("approved in %v", annotation)
7070
default:
71-
return APIApprovalInvalid, fmt.Sprintf("protected groups must have approval annotation %q with either a URL or a reason starting with \"unapproved\", see https://github.com/kubernetes/enhancements/pull/1111", apiextensions.KubeAPIApprovedAnnotation)
71+
return APIApprovalInvalid, fmt.Sprintf("protected groups must have approval annotation %q with either a URL or a reason starting with \"unapproved\", see https://github.com/kubernetes/enhancements/pull/1111", apiextensionsv1.KubeAPIApprovedAnnotation)
7272
}
7373
}
7474

7575
// SetCRDCondition sets the status condition. It either overwrites the existing one or creates a new one.
76-
func SetCRDCondition(crd *apiextensions.CustomResourceDefinition, newCondition apiextensions.CustomResourceDefinitionCondition) {
76+
func SetCRDCondition(crd *apiextensionsv1.CustomResourceDefinition, newCondition apiextensionsv1.CustomResourceDefinitionCondition) {
7777
newCondition.LastTransitionTime = metav1.NewTime(time.Now())
7878

7979
existingCondition := FindCRDCondition(crd, newCondition.Type)
@@ -92,8 +92,8 @@ func SetCRDCondition(crd *apiextensions.CustomResourceDefinition, newCondition a
9292
}
9393

9494
// RemoveCRDCondition removes the status condition.
95-
func RemoveCRDCondition(crd *apiextensions.CustomResourceDefinition, conditionType apiextensions.CustomResourceDefinitionConditionType) {
96-
newConditions := []apiextensions.CustomResourceDefinitionCondition{}
95+
func RemoveCRDCondition(crd *apiextensionsv1.CustomResourceDefinition, conditionType apiextensionsv1.CustomResourceDefinitionConditionType) {
96+
newConditions := []apiextensionsv1.CustomResourceDefinitionCondition{}
9797
for _, condition := range crd.Status.Conditions {
9898
if condition.Type != conditionType {
9999
newConditions = append(newConditions, condition)
@@ -103,7 +103,7 @@ func RemoveCRDCondition(crd *apiextensions.CustomResourceDefinition, conditionTy
103103
}
104104

105105
// FindCRDCondition returns the condition you're looking for or nil.
106-
func FindCRDCondition(crd *apiextensions.CustomResourceDefinition, conditionType apiextensions.CustomResourceDefinitionConditionType) *apiextensions.CustomResourceDefinitionCondition {
106+
func FindCRDCondition(crd *apiextensionsv1.CustomResourceDefinition, conditionType apiextensionsv1.CustomResourceDefinitionConditionType) *apiextensionsv1.CustomResourceDefinitionCondition {
107107
for i := range crd.Status.Conditions {
108108
if crd.Status.Conditions[i].Type == conditionType {
109109
return &crd.Status.Conditions[i]
@@ -114,17 +114,17 @@ func FindCRDCondition(crd *apiextensions.CustomResourceDefinition, conditionType
114114
}
115115

116116
// IsCRDConditionTrue indicates if the condition is present and strictly true.
117-
func IsCRDConditionTrue(crd *apiextensions.CustomResourceDefinition, conditionType apiextensions.CustomResourceDefinitionConditionType) bool {
118-
return IsCRDConditionPresentAndEqual(crd, conditionType, apiextensions.ConditionTrue)
117+
func IsCRDConditionTrue(crd *apiextensionsv1.CustomResourceDefinition, conditionType apiextensionsv1.CustomResourceDefinitionConditionType) bool {
118+
return IsCRDConditionPresentAndEqual(crd, conditionType, apiextensionsv1.ConditionTrue)
119119
}
120120

121121
// IsCRDConditionFalse indicates if the condition is present and false.
122-
func IsCRDConditionFalse(crd *apiextensions.CustomResourceDefinition, conditionType apiextensions.CustomResourceDefinitionConditionType) bool {
123-
return IsCRDConditionPresentAndEqual(crd, conditionType, apiextensions.ConditionFalse)
122+
func IsCRDConditionFalse(crd *apiextensionsv1.CustomResourceDefinition, conditionType apiextensionsv1.CustomResourceDefinitionConditionType) bool {
123+
return IsCRDConditionPresentAndEqual(crd, conditionType, apiextensionsv1.ConditionFalse)
124124
}
125125

126126
// IsCRDConditionPresentAndEqual indicates if the condition is present and equal to the given status.
127-
func IsCRDConditionPresentAndEqual(crd *apiextensions.CustomResourceDefinition, conditionType apiextensions.CustomResourceDefinitionConditionType, status apiextensions.ConditionStatus) bool {
127+
func IsCRDConditionPresentAndEqual(crd *apiextensionsv1.CustomResourceDefinition, conditionType apiextensionsv1.CustomResourceDefinitionConditionType, status apiextensionsv1.ConditionStatus) bool {
128128
for _, condition := range crd.Status.Conditions {
129129
if condition.Type == conditionType {
130130
return condition.Status == status
@@ -134,7 +134,7 @@ func IsCRDConditionPresentAndEqual(crd *apiextensions.CustomResourceDefinition,
134134
}
135135

136136
// IsCRDConditionEquivalent returns true if the lhs and rhs are equivalent except for times.
137-
func IsCRDConditionEquivalent(lhs, rhs *apiextensions.CustomResourceDefinitionCondition) bool {
137+
func IsCRDConditionEquivalent(lhs, rhs *apiextensionsv1.CustomResourceDefinitionCondition) bool {
138138
if lhs == nil && rhs == nil {
139139
return true
140140
}
@@ -146,7 +146,7 @@ func IsCRDConditionEquivalent(lhs, rhs *apiextensions.CustomResourceDefinitionCo
146146
}
147147

148148
// CRDHasFinalizer returns true if the finalizer is in the list.
149-
func CRDHasFinalizer(crd *apiextensions.CustomResourceDefinition, needle string) bool {
149+
func CRDHasFinalizer(crd *apiextensionsv1.CustomResourceDefinition, needle string) bool {
150150
for _, finalizer := range crd.Finalizers {
151151
if finalizer == needle {
152152
return true
@@ -157,7 +157,7 @@ func CRDHasFinalizer(crd *apiextensions.CustomResourceDefinition, needle string)
157157
}
158158

159159
// CRDRemoveFinalizer removes the finalizer if present.
160-
func CRDRemoveFinalizer(crd *apiextensions.CustomResourceDefinition, needle string) {
160+
func CRDRemoveFinalizer(crd *apiextensionsv1.CustomResourceDefinition, needle string) {
161161
newFinalizers := []string{}
162162
for _, finalizer := range crd.Finalizers {
163163
if finalizer != needle {
@@ -168,7 +168,7 @@ func CRDRemoveFinalizer(crd *apiextensions.CustomResourceDefinition, needle stri
168168
}
169169

170170
// HasServedCRDVersion returns true if the given version is in the list of CRD's versions and the Served flag is set.
171-
func HasServedCRDVersion(crd *apiextensions.CustomResourceDefinition, version string) bool {
171+
func HasServedCRDVersion(crd *apiextensionsv1.CustomResourceDefinition, version string) bool {
172172
for _, v := range crd.Spec.Versions {
173173
if v.Name == version {
174174
return v.Served
@@ -178,18 +178,18 @@ func HasServedCRDVersion(crd *apiextensions.CustomResourceDefinition, version st
178178
}
179179

180180
// GetCRDStorageVersion returns the storage version for given CRD.
181-
func GetCRDStorageVersion(crd *apiextensions.CustomResourceDefinition) (string, error) {
181+
func GetCRDStorageVersion(crd *apiextensionsv1.CustomResourceDefinition) (string, error) {
182182
for _, v := range crd.Spec.Versions {
183183
if v.Storage {
184184
return v.Name, nil
185185
}
186186
}
187187
// This should not happened if crd is valid
188-
return "", fmt.Errorf("invalid apiextensions.CustomResourceDefinition, no storage version")
188+
return "", fmt.Errorf("invalid apiextensionsv1.CustomResourceDefinition, no storage version")
189189
}
190190

191191
// IsStoredVersion returns whether the given version is the storage version of the CRD.
192-
func IsStoredVersion(crd *apiextensions.CustomResourceDefinition, version string) bool {
192+
func IsStoredVersion(crd *apiextensionsv1.CustomResourceDefinition, version string) bool {
193193
for _, v := range crd.Status.StoredVersions {
194194
if version == v {
195195
return true
@@ -199,27 +199,27 @@ func IsStoredVersion(crd *apiextensions.CustomResourceDefinition, version string
199199
}
200200

201201
// GetSchemaForVersion returns the validation schema for the given version or nil.
202-
func GetSchemaForVersion(crd *apiextensions.CustomResourceDefinition, version string) (*apiextensions.CustomResourceValidation, error) {
202+
func GetSchemaForVersion(crd *apiextensionsv1.CustomResourceDefinition, version string) (*apiextensionsv1.CustomResourceValidation, error) {
203203
for _, v := range crd.Spec.Versions {
204204
if version == v.Name {
205205
return v.Schema, nil
206206
}
207207
}
208-
return nil, fmt.Errorf("version %s not found in apiextensions.CustomResourceDefinition: %v", version, crd.Name)
208+
return nil, fmt.Errorf("version %s not found in apiextensionsv1.CustomResourceDefinition: %v", version, crd.Name)
209209
}
210210

211211
// GetSubresourcesForVersion returns the subresources for given version or nil.
212-
func GetSubresourcesForVersion(crd *apiextensions.CustomResourceDefinition, version string) (*apiextensions.CustomResourceSubresources, error) {
212+
func GetSubresourcesForVersion(crd *apiextensionsv1.CustomResourceDefinition, version string) (*apiextensionsv1.CustomResourceSubresources, error) {
213213
for _, v := range crd.Spec.Versions {
214214
if version == v.Name {
215215
return v.Subresources, nil
216216
}
217217
}
218-
return nil, fmt.Errorf("version %s not found in apiextensions.CustomResourceDefinition: %v", version, crd.Name)
218+
return nil, fmt.Errorf("version %s not found in apiextensionsv1.CustomResourceDefinition: %v", version, crd.Name)
219219
}
220220

221221
// HasPerVersionSchema returns true if a CRD uses per-version schema.
222-
func HasPerVersionSchema(versions []apiextensions.CustomResourceDefinitionVersion) bool {
222+
func HasPerVersionSchema(versions []apiextensionsv1.CustomResourceDefinitionVersion) bool {
223223
for _, v := range versions {
224224
if v.Schema != nil {
225225
return true
@@ -229,7 +229,7 @@ func HasPerVersionSchema(versions []apiextensions.CustomResourceDefinitionVersio
229229
}
230230

231231
// HasPerVersionSubresources returns true if a CRD uses per-version subresources.
232-
func HasPerVersionSubresources(versions []apiextensions.CustomResourceDefinitionVersion) bool {
232+
func HasPerVersionSubresources(versions []apiextensionsv1.CustomResourceDefinitionVersion) bool {
233233
for _, v := range versions {
234234
if v.Subresources != nil {
235235
return true
@@ -239,7 +239,7 @@ func HasPerVersionSubresources(versions []apiextensions.CustomResourceDefinition
239239
}
240240

241241
// HasPerVersionColumns returns true if a CRD uses per-version columns.
242-
func HasPerVersionColumns(versions []apiextensions.CustomResourceDefinitionVersion) bool {
242+
func HasPerVersionColumns(versions []apiextensionsv1.CustomResourceDefinitionVersion) bool {
243243
for _, v := range versions {
244244
if len(v.AdditionalPrinterColumns) > 0 {
245245
return true
@@ -249,7 +249,7 @@ func HasPerVersionColumns(versions []apiextensions.CustomResourceDefinitionVersi
249249
}
250250

251251
// HasVersionServed returns true if given CRD has given version served.
252-
func HasVersionServed(crd *apiextensions.CustomResourceDefinition, version string) bool {
252+
func HasVersionServed(crd *apiextensionsv1.CustomResourceDefinition, version string) bool {
253253
for _, v := range crd.Spec.Versions {
254254
if !v.Served || v.Name != version {
255255
continue

0 commit comments

Comments
 (0)