Skip to content
This repository was archived by the owner on Mar 22, 2018. It is now read-only.

Commit 2622f43

Browse files
author
Kubernetes Submit Queue
authored
Merge pull request #53651 from sttts/sttts-apis-core
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Move core API to pkg/apis/core Fixes kubernetes/kubernetes#55304. This moves the types in pkg/api and most of pkg/api/v1 to pkg/apis/core to match the other api groups, following-up on what kubernetes/kubernetes#44784 did for the external types. It's a nearly 100% mechanical package move with a number of trivial fixups in code-generators and in tests which do string comparisons of types via reflection. **Most importantly:** - group names are unchanged - apimachinery semantics are unchanged - the outside api is unchanged. Note that some packages for helpers are left in pkg/api/v1. Splitting them into helpers which belong tightly to the api and those which are not is left to follow-ups. @kubernetes/sig-api-machinery-pr-reviews
2 parents f273bd5 + dc03ec3 commit 2622f43

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

pkg/cloudprovider/providers/openstack/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ go_library(
2020
],
2121
importpath = "k8s.io/kubernetes/pkg/cloudprovider/providers/openstack",
2222
deps = [
23-
"//pkg/api/v1/helper:go_default_library",
2423
"//pkg/api/v1/service:go_default_library",
24+
"//pkg/apis/core/v1/helper:go_default_library",
2525
"//pkg/cloudprovider:go_default_library",
2626
"//pkg/controller:go_default_library",
2727
"//pkg/util/mount:go_default_library",

pkg/cloudprovider/providers/openstack/openstack.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ import (
4242
"k8s.io/apimachinery/pkg/types"
4343
netutil "k8s.io/apimachinery/pkg/util/net"
4444
certutil "k8s.io/client-go/util/cert"
45-
v1helper "k8s.io/kubernetes/pkg/api/v1/helper"
45+
v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper"
4646
"k8s.io/kubernetes/pkg/cloudprovider"
4747
"k8s.io/kubernetes/pkg/controller"
4848
)

0 commit comments

Comments
 (0)