Merge pull request #80695 from seans3/move-apply-staging

Move pkg/kubectl/apply and subdirectories to staging
This commit is contained in:
Kubernetes Prow Robot 2019-07-29 06:44:05 -07:00 committed by GitHub
commit a78cd38532
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
43 changed files with 41 additions and 47 deletions

View File

@ -82,7 +82,6 @@ filegroup(
name = "all-srcs",
srcs = [
":package-srcs",
"//pkg/kubectl/apply:all-srcs",
"//pkg/kubectl/cmd:all-srcs",
"//pkg/kubectl/explain:all-srcs",
"//pkg/kubectl/generate:all-srcs",

View File

@ -9,6 +9,7 @@ filegroup(
name = "all-srcs",
srcs = [
":package-srcs",
"//staging/src/k8s.io/kubectl/pkg/apply:all-srcs",
"//staging/src/k8s.io/kubectl/pkg/apps:all-srcs",
"//staging/src/k8s.io/kubectl/pkg/describe:all-srcs",
"//staging/src/k8s.io/kubectl/pkg/drain:all-srcs",

View File

@ -31,6 +31,7 @@ require (
k8s.io/klog v0.3.1
k8s.io/kube-openapi v0.0.0-20190709113604-33be087ad058
k8s.io/utils v0.0.0-20190607212802-c55fbcfc754a
sigs.k8s.io/yaml v1.1.0
)
replace (

View File

@ -13,7 +13,8 @@ go_library(
"type_element.go",
"visitor.go",
],
importpath = "k8s.io/kubernetes/pkg/kubectl/apply",
importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/apply",
importpath = "k8s.io/kubectl/pkg/apply",
visibility = ["//visibility:public"],
)
@ -28,8 +29,8 @@ filegroup(
name = "all-srcs",
srcs = [
":package-srcs",
"//pkg/kubectl/apply/parse:all-srcs",
"//pkg/kubectl/apply/strategy:all-srcs",
"//staging/src/k8s.io/kubectl/pkg/apply/parse:all-srcs",
"//staging/src/k8s.io/kubectl/pkg/apply/strategy:all-srcs",
],
tags = ["automanaged"],
visibility = ["//visibility:public"],

View File

@ -13,11 +13,12 @@ go_library(
"util.go",
"visitor.go",
],
importpath = "k8s.io/kubernetes/pkg/kubectl/apply/parse",
importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/apply/parse",
importpath = "k8s.io/kubectl/pkg/apply/parse",
visibility = ["//visibility:public"],
deps = [
"//pkg/kubectl/apply:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
"//staging/src/k8s.io/kubectl/pkg/apply:go_default_library",
"//staging/src/k8s.io/kubectl/pkg/util/openapi:go_default_library",
"//vendor/k8s.io/kube-openapi/pkg/util/proto:go_default_library",
],
@ -26,9 +27,6 @@ go_library(
go_test(
name = "go_default_test",
srcs = ["suite_test.go"],
data = [
"//api/openapi-spec",
],
embed = [":go_default_library"],
deps = [
"//vendor/github.com/onsi/ginkgo:go_default_library",

View File

@ -21,8 +21,8 @@ import (
"reflect"
"k8s.io/kube-openapi/pkg/util/proto"
"k8s.io/kubectl/pkg/apply"
"k8s.io/kubectl/pkg/util/openapi"
"k8s.io/kubernetes/pkg/kubectl/apply"
)
// Factory creates an Element by combining object values from recorded, local and remote sources with

View File

@ -18,7 +18,7 @@ package parse
import (
"k8s.io/kube-openapi/pkg/util/proto"
"k8s.io/kubernetes/pkg/kubectl/apply"
"k8s.io/kubectl/pkg/apply"
)
// Item wraps values from 3 sources (recorded, local, remote).

View File

@ -20,7 +20,7 @@ import (
"fmt"
"k8s.io/kube-openapi/pkg/util/proto"
"k8s.io/kubernetes/pkg/kubectl/apply"
"k8s.io/kubectl/pkg/apply"
)
// Contains the heavy lifting for finding tuples of matching elements in lists based on the merge key

View File

@ -18,7 +18,7 @@ package parse
import (
"k8s.io/kube-openapi/pkg/util/proto"
"k8s.io/kubernetes/pkg/kubectl/apply"
"k8s.io/kubectl/pkg/apply"
)
// mapElement builds a new mapElement from a mapItem

View File

@ -16,7 +16,7 @@ limitations under the License.
package parse
import "k8s.io/kubernetes/pkg/kubectl/apply"
import "k8s.io/kubectl/pkg/apply"
// primitiveElement builds a new primitiveElement from a PrimitiveItem
func (v ElementBuildingVisitor) primitiveElement(item *primitiveItem) (*apply.PrimitiveElement, error) {

View File

@ -18,7 +18,7 @@ package parse
import (
"k8s.io/kube-openapi/pkg/util/proto"
"k8s.io/kubernetes/pkg/kubectl/apply"
"k8s.io/kubectl/pkg/apply"
)
// typeElement builds a new mapElement from a typeItem

View File

@ -23,7 +23,7 @@ import (
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/kube-openapi/pkg/util/proto"
"k8s.io/kubernetes/pkg/kubectl/apply"
"k8s.io/kubectl/pkg/apply"
)
// nilSafeLookup returns the value from the map if the map is non-nil

View File

@ -17,8 +17,8 @@ limitations under the License.
package parse
import (
"k8s.io/kubectl/pkg/apply"
"k8s.io/kubectl/pkg/util/openapi"
"k8s.io/kubernetes/pkg/kubectl/apply"
)
// ItemVisitor provides an interface for Items to Accept and call

View File

@ -10,9 +10,10 @@ go_library(
"retain_keys_visitor.go",
"strategic_visitor.go",
],
importpath = "k8s.io/kubernetes/pkg/kubectl/apply/strategy",
importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/apply/strategy",
importpath = "k8s.io/kubectl/pkg/apply/strategy",
visibility = ["//visibility:public"],
deps = ["//pkg/kubectl/apply:go_default_library"],
deps = ["//staging/src/k8s.io/kubectl/pkg/apply:go_default_library"],
)
go_test(
@ -31,14 +32,14 @@ go_test(
"utils_test.go",
],
data = [
":openapi-spec",
"//api/openapi-spec",
"test_swagger.json",
"//staging/src/k8s.io/kubectl/test/data/openapi",
],
embed = [":go_default_library"],
deps = [
"//pkg/kubectl/apply:go_default_library",
"//pkg/kubectl/apply/parse:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/diff:go_default_library",
"//staging/src/k8s.io/kubectl/pkg/apply:go_default_library",
"//staging/src/k8s.io/kubectl/pkg/apply/parse:go_default_library",
"//staging/src/k8s.io/kubectl/pkg/util/openapi:go_default_library",
"//staging/src/k8s.io/kubectl/pkg/util/openapi/testing:go_default_library",
"//vendor/github.com/onsi/ginkgo:go_default_library",
@ -62,10 +63,3 @@ filegroup(
tags = ["automanaged"],
visibility = ["//visibility:public"],
)
filegroup(
name = "openapi-spec",
srcs = glob([
"**/*.json",
]),
)

View File

@ -16,7 +16,7 @@ limitations under the License.
package strategy
import "k8s.io/kubernetes/pkg/kubectl/apply"
import "k8s.io/kubectl/pkg/apply"
// Options controls how a merge will be executed
type Options struct {

View File

@ -19,7 +19,7 @@ package strategy_test
import (
. "github.com/onsi/ginkgo"
"k8s.io/kubernetes/pkg/kubectl/apply/strategy"
"k8s.io/kubectl/pkg/apply/strategy"
)
var _ = Describe("Comparing fields of remote and recorded ", func() {

View File

@ -19,9 +19,9 @@ package strategy_test
import (
. "github.com/onsi/ginkgo"
"k8s.io/kubectl/pkg/apply/strategy"
"k8s.io/kubectl/pkg/util/openapi"
tst "k8s.io/kubectl/pkg/util/openapi/testing"
"k8s.io/kubernetes/pkg/kubectl/apply/strategy"
)
var _ = Describe("Merging fields of type list-of-map with openapi", func() {

View File

@ -19,7 +19,7 @@ package strategy_test
import (
. "github.com/onsi/ginkgo"
"k8s.io/kubernetes/pkg/kubectl/apply/strategy"
"k8s.io/kubectl/pkg/apply/strategy"
)
var _ = Describe("Merging fields of type map with openapi for some fields", func() {

View File

@ -19,7 +19,7 @@ package strategy_test
import (
. "github.com/onsi/ginkgo"
"k8s.io/kubernetes/pkg/kubectl/apply/strategy"
"k8s.io/kubectl/pkg/apply/strategy"
)
var _ = Describe("Merging fields of type list-of-primitive with openapi", func() {

View File

@ -19,7 +19,7 @@ package strategy_test
import (
. "github.com/onsi/ginkgo"
"k8s.io/kubernetes/pkg/kubectl/apply/strategy"
"k8s.io/kubectl/pkg/apply/strategy"
)
var _ = Describe("Merging fields of type map with openapi", func() {

View File

@ -19,7 +19,7 @@ package strategy
import (
"fmt"
"k8s.io/kubernetes/pkg/kubectl/apply"
"k8s.io/kubectl/pkg/apply"
)
func createMergeStrategy(options Options, strategic *delegatingStrategy) mergeStrategy {

View File

@ -19,7 +19,7 @@ package strategy_test
import (
. "github.com/onsi/ginkgo"
"k8s.io/kubernetes/pkg/kubectl/apply/strategy"
"k8s.io/kubectl/pkg/apply/strategy"
)
var _ = Describe("Replacing fields of type list without openapi", func() {

View File

@ -19,9 +19,9 @@ package strategy_test
import (
. "github.com/onsi/ginkgo"
"k8s.io/kubectl/pkg/apply/strategy"
"k8s.io/kubectl/pkg/util/openapi"
tst "k8s.io/kubectl/pkg/util/openapi/testing"
"k8s.io/kubernetes/pkg/kubectl/apply/strategy"
)
var _ = Describe("Replacing fields of type map with openapi for some fields", func() {

View File

@ -19,7 +19,7 @@ package strategy_test
import (
. "github.com/onsi/ginkgo"
"k8s.io/kubernetes/pkg/kubectl/apply/strategy"
"k8s.io/kubectl/pkg/apply/strategy"
)
var _ = Describe("Replacing fields of type list with openapi", func() {

View File

@ -17,7 +17,7 @@ limitations under the License.
package strategy
import (
"k8s.io/kubernetes/pkg/kubectl/apply"
"k8s.io/kubectl/pkg/apply"
)
// replaceVisitor creates a patch to replace a remote field value with a local field value

View File

@ -19,7 +19,7 @@ package strategy_test
import (
. "github.com/onsi/ginkgo"
"k8s.io/kubernetes/pkg/kubectl/apply/strategy"
"k8s.io/kubectl/pkg/apply/strategy"
)
var _ = Describe("Merging fields with the retainkeys strategy", func() {

View File

@ -18,7 +18,7 @@ package strategy
import (
"fmt"
"k8s.io/kubernetes/pkg/kubectl/apply"
"k8s.io/kubectl/pkg/apply"
)
func createRetainKeysStrategy(options Options, strategic *delegatingStrategy) retainKeysStrategy {

View File

@ -17,7 +17,7 @@ limitations under the License.
package strategy
import (
"k8s.io/kubernetes/pkg/kubectl/apply"
"k8s.io/kubectl/pkg/apply"
)
// delegatingStrategy delegates merging fields to other visitor implementations

View File

@ -26,10 +26,10 @@ import (
"sigs.k8s.io/yaml"
"k8s.io/apimachinery/pkg/util/diff"
"k8s.io/kubectl/pkg/apply"
"k8s.io/kubectl/pkg/apply/parse"
"k8s.io/kubectl/pkg/util/openapi"
tst "k8s.io/kubectl/pkg/util/openapi/testing"
"k8s.io/kubernetes/pkg/kubectl/apply"
"k8s.io/kubernetes/pkg/kubectl/apply/parse"
)
const (
@ -37,7 +37,7 @@ const (
noConflict = false
)
var fakeResources = tst.NewFakeResources(filepath.Join("..", "..", "..", "..", "api", "openapi-spec", "swagger.json"))
var fakeResources = tst.NewFakeResources(filepath.Join("..", "..", "..", "test", "data", "openapi", "swagger.json"))
// run parses the openapi and runs the tests
func run(instance apply.Strategy, recorded, local, remote, expected map[string]interface{}) {