From 58b59ae4e07f9d3718271a43740a4de9508d8688 Mon Sep 17 00:00:00 2001 From: Sean Sullivan Date: Thu, 1 Aug 2019 15:17:53 -0700 Subject: [PATCH] Update test data to reflect code move to staging --- pkg/kubectl/cmd/BUILD | 1 + pkg/kubectl/cmd/cmd_test.go | 2 +- .../kubectl/cmd/plugin/testdata}/BUILD | 4 +- pkg/kubectl/cmd/plugin/testdata/kubectl-foo | 3 + .../cmd/plugin/testdata/kubectl-version | 4 ++ staging/src/k8s.io/kubectl/BUILD | 2 +- .../k8s.io/kubectl/pkg/apply/strategy/BUILD | 2 +- .../src/k8s.io/kubectl/pkg/cmd/annotate/BUILD | 4 +- .../kubectl/pkg/cmd/annotate/annotate_test.go | 4 +- .../src/k8s.io/kubectl/pkg/cmd/apply/BUILD | 5 +- .../kubectl/pkg/cmd/apply/apply_test.go | 34 +++++------ .../src/k8s.io/kubectl/pkg/cmd/create/BUILD | 4 +- .../kubectl/pkg/cmd/create/create_test.go | 8 +-- .../src/k8s.io/kubectl/pkg/cmd/delete/BUILD | 4 +- .../kubectl/pkg/cmd/delete/delete_test.go | 18 +++--- .../src/k8s.io/kubectl/pkg/cmd/describe/BUILD | 4 +- .../kubectl/pkg/cmd/describe/describe_test.go | 2 +- .../src/k8s.io/kubectl/pkg/cmd/expose/BUILD | 4 +- .../kubectl/pkg/cmd/expose/expose_test.go | 2 +- .../src/k8s.io/kubectl/pkg/cmd/label/BUILD | 4 +- .../kubectl/pkg/cmd/label/label_test.go | 4 +- .../src/k8s.io/kubectl/pkg/cmd/patch/BUILD | 4 +- .../kubectl/pkg/cmd/patch/patch_test.go | 4 +- .../src/k8s.io/kubectl/pkg/cmd/replace/BUILD | 4 +- .../kubectl/pkg/cmd/replace/replace_test.go | 10 ++-- staging/src/k8s.io/kubectl/pkg/cmd/set/BUILD | 5 +- .../kubectl/pkg/cmd/set/set_env_test.go | 6 +- .../kubectl/pkg/cmd/set/set_image_test.go | 4 +- .../kubectl/pkg/cmd/set/set_resources_test.go | 4 +- .../pkg/cmd/set/set_serviceaccount_test.go | 12 ++-- .../src/k8s.io/kubectl/pkg/util/openapi/BUILD | 4 +- .../kubectl/pkg/util/openapi/validation/BUILD | 4 +- staging/src/k8s.io/kubectl/test/data/BUILD | 24 ++++++++ .../k8s.io/kubectl/test/data/apply/cm.yaml | 16 +++++ .../test/data/apply/deploy-clientside.yaml | 21 +++++++ .../test/data/apply/deploy-serverside.yaml | 46 +++++++++++++++ .../k8s.io/kubectl/test/data/apply/patch.json | 1 + .../kubectl/test/data/apply/rc-args.yaml | 20 +++++++ .../test/data/apply/rc-lastapplied-args.yaml | 23 ++++++++ .../test/data/apply/rc-lastapplied.yaml | 21 +++++++ .../test/data/apply/rc-no-annotation.yaml | 18 ++++++ .../kubectl/test/data/apply/rc-noexist.yaml | 18 ++++++ .../kubectl/test/data/apply/rc-service.yaml | 32 ++++++++++ .../k8s.io/kubectl/test/data/apply/rc.json | 33 +++++++++++ .../k8s.io/kubectl/test/data/apply/rc.yaml | 19 ++++++ .../kubectl/test/data/apply/service.yaml | 11 ++++ .../kubectl/test/data/apply/testdir/rc.yaml | 18 ++++++ .../kubectl/test/data/apply/testdir/rc1.yaml | 18 ++++++ .../test/data/apply/widget-clientside.yaml | 8 +++ .../test/data/apply/widget-serverside.yaml | 10 ++++ .../k8s.io/kubectl/test/data/controller.yaml | 58 +++++++++++++++++++ .../kubectl/test/data/frontend-service.yaml | 16 +++++ .../test/data/redis-master-controller.yaml | 26 +++++++++ .../test/data/redis-master-service.yaml | 16 +++++ .../replace/legacy/frontend-controller.yaml | 29 ++++++++++ .../legacy/redis-master-controller.yaml | 26 +++++++++ .../legacy/redis-slave-controller.yaml | 37 ++++++++++++ .../k8s.io/kubectl/test/data/set/daemon.yaml | 21 +++++++ .../kubectl/test/data/set/deployment.yaml | 21 +++++++ .../src/k8s.io/kubectl/test/data/set/job.yaml | 15 +++++ .../test/data/set/multi-resource-yaml.yaml | 33 +++++++++++ .../test/data/set/namespaced-resource.yaml | 17 ++++++ .../kubectl/test/data/set/redis-slave.yaml | 44 ++++++++++++++ .../kubectl/test/data/set/replication.yaml | 19 ++++++ 64 files changed, 816 insertions(+), 99 deletions(-) rename {staging/src/k8s.io/kubectl/test/data/openapi => pkg/kubectl/cmd/plugin/testdata}/BUILD (89%) create mode 100755 pkg/kubectl/cmd/plugin/testdata/kubectl-foo create mode 100755 pkg/kubectl/cmd/plugin/testdata/kubectl-version create mode 100644 staging/src/k8s.io/kubectl/test/data/BUILD create mode 100644 staging/src/k8s.io/kubectl/test/data/apply/cm.yaml create mode 100644 staging/src/k8s.io/kubectl/test/data/apply/deploy-clientside.yaml create mode 100644 staging/src/k8s.io/kubectl/test/data/apply/deploy-serverside.yaml create mode 100644 staging/src/k8s.io/kubectl/test/data/apply/patch.json create mode 100644 staging/src/k8s.io/kubectl/test/data/apply/rc-args.yaml create mode 100644 staging/src/k8s.io/kubectl/test/data/apply/rc-lastapplied-args.yaml create mode 100644 staging/src/k8s.io/kubectl/test/data/apply/rc-lastapplied.yaml create mode 100644 staging/src/k8s.io/kubectl/test/data/apply/rc-no-annotation.yaml create mode 100644 staging/src/k8s.io/kubectl/test/data/apply/rc-noexist.yaml create mode 100644 staging/src/k8s.io/kubectl/test/data/apply/rc-service.yaml create mode 100644 staging/src/k8s.io/kubectl/test/data/apply/rc.json create mode 100644 staging/src/k8s.io/kubectl/test/data/apply/rc.yaml create mode 100644 staging/src/k8s.io/kubectl/test/data/apply/service.yaml create mode 100644 staging/src/k8s.io/kubectl/test/data/apply/testdir/rc.yaml create mode 100644 staging/src/k8s.io/kubectl/test/data/apply/testdir/rc1.yaml create mode 100644 staging/src/k8s.io/kubectl/test/data/apply/widget-clientside.yaml create mode 100644 staging/src/k8s.io/kubectl/test/data/apply/widget-serverside.yaml create mode 100644 staging/src/k8s.io/kubectl/test/data/controller.yaml create mode 100644 staging/src/k8s.io/kubectl/test/data/frontend-service.yaml create mode 100644 staging/src/k8s.io/kubectl/test/data/redis-master-controller.yaml create mode 100644 staging/src/k8s.io/kubectl/test/data/redis-master-service.yaml create mode 100644 staging/src/k8s.io/kubectl/test/data/replace/legacy/frontend-controller.yaml create mode 100644 staging/src/k8s.io/kubectl/test/data/replace/legacy/redis-master-controller.yaml create mode 100644 staging/src/k8s.io/kubectl/test/data/replace/legacy/redis-slave-controller.yaml create mode 100644 staging/src/k8s.io/kubectl/test/data/set/daemon.yaml create mode 100644 staging/src/k8s.io/kubectl/test/data/set/deployment.yaml create mode 100644 staging/src/k8s.io/kubectl/test/data/set/job.yaml create mode 100644 staging/src/k8s.io/kubectl/test/data/set/multi-resource-yaml.yaml create mode 100644 staging/src/k8s.io/kubectl/test/data/set/namespaced-resource.yaml create mode 100644 staging/src/k8s.io/kubectl/test/data/set/redis-slave.yaml create mode 100644 staging/src/k8s.io/kubectl/test/data/set/replication.yaml diff --git a/pkg/kubectl/cmd/BUILD b/pkg/kubectl/cmd/BUILD index f92760a7de4..e1eb610d12a 100644 --- a/pkg/kubectl/cmd/BUILD +++ b/pkg/kubectl/cmd/BUILD @@ -60,6 +60,7 @@ go_library( go_test( name = "go_default_test", srcs = ["cmd_test.go"], + data = ["//pkg/kubectl/cmd/plugin/testdata"], embed = [":go_default_library"], deps = [ "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library", diff --git a/pkg/kubectl/cmd/cmd_test.go b/pkg/kubectl/cmd/cmd_test.go index d93b240d2e1..f2a19179751 100644 --- a/pkg/kubectl/cmd/cmd_test.go +++ b/pkg/kubectl/cmd/cmd_test.go @@ -100,7 +100,7 @@ func TestKubectlCommandHandlesPlugins(t *testing.T) { } if pluginsHandler.executedPlugin != test.expectPlugin { - t.Fatalf("unexpected plugin execution: expedcted %q, got %q", test.expectPlugin, pluginsHandler.executedPlugin) + t.Fatalf("unexpected plugin execution: expected %q, got %q", test.expectPlugin, pluginsHandler.executedPlugin) } if len(pluginsHandler.withArgs) != len(test.expectPluginArgs) { diff --git a/staging/src/k8s.io/kubectl/test/data/openapi/BUILD b/pkg/kubectl/cmd/plugin/testdata/BUILD similarity index 89% rename from staging/src/k8s.io/kubectl/test/data/openapi/BUILD rename to pkg/kubectl/cmd/plugin/testdata/BUILD index c81558ca336..3377e9a49a0 100644 --- a/staging/src/k8s.io/kubectl/test/data/openapi/BUILD +++ b/pkg/kubectl/cmd/plugin/testdata/BUILD @@ -1,9 +1,9 @@ package(default_visibility = ["//visibility:public"]) filegroup( - name = "openapi", + name = "testdata", srcs = glob([ - "**/*.json", + "**/*", ]), ) diff --git a/pkg/kubectl/cmd/plugin/testdata/kubectl-foo b/pkg/kubectl/cmd/plugin/testdata/kubectl-foo new file mode 100755 index 00000000000..651b7662dda --- /dev/null +++ b/pkg/kubectl/cmd/plugin/testdata/kubectl-foo @@ -0,0 +1,3 @@ +#!/bin/bash + +echo "I am plugin foo" diff --git a/pkg/kubectl/cmd/plugin/testdata/kubectl-version b/pkg/kubectl/cmd/plugin/testdata/kubectl-version new file mode 100755 index 00000000000..3718966b689 --- /dev/null +++ b/pkg/kubectl/cmd/plugin/testdata/kubectl-version @@ -0,0 +1,4 @@ +#!/bin/bash + +# This plugin is a no-op and is used to test plugins +# that overshadow existing kubectl commands diff --git a/staging/src/k8s.io/kubectl/BUILD b/staging/src/k8s.io/kubectl/BUILD index a8ffb840cc8..d93dd8a31f6 100644 --- a/staging/src/k8s.io/kubectl/BUILD +++ b/staging/src/k8s.io/kubectl/BUILD @@ -26,7 +26,7 @@ filegroup( "//staging/src/k8s.io/kubectl/pkg/util:all-srcs", "//staging/src/k8s.io/kubectl/pkg/validation:all-srcs", "//staging/src/k8s.io/kubectl/pkg/version:all-srcs", - "//staging/src/k8s.io/kubectl/test/data/openapi:all-srcs", + "//staging/src/k8s.io/kubectl/test/data:all-srcs", ], tags = ["automanaged"], visibility = ["//visibility:public"], diff --git a/staging/src/k8s.io/kubectl/pkg/apply/strategy/BUILD b/staging/src/k8s.io/kubectl/pkg/apply/strategy/BUILD index d9353918071..344d96aa77b 100644 --- a/staging/src/k8s.io/kubectl/pkg/apply/strategy/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/apply/strategy/BUILD @@ -33,7 +33,7 @@ go_test( ], data = [ "test_swagger.json", - "//staging/src/k8s.io/kubectl/test/data/openapi", + "//staging/src/k8s.io/kubectl/test/data", ], embed = [":go_default_library"], deps = [ diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/annotate/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/annotate/BUILD index 93411fd9a11..fece9753377 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/annotate/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/annotate/BUILD @@ -29,9 +29,7 @@ go_library( go_test( name = "go_default_test", srcs = ["annotate_test.go"], - data = [ - "//test/e2e/testing-manifests:all-srcs", - ], + data = ["//staging/src/k8s.io/kubectl/test/data"], embed = [":go_default_library"], deps = [ "//staging/src/k8s.io/api/core/v1:go_default_library", diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/annotate/annotate_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/annotate/annotate_test.go index ae9bcff3f6e..acbe035886a 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/annotate/annotate_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/annotate/annotate_test.go @@ -543,7 +543,7 @@ func TestAnnotateObjectFromFile(t *testing.T) { cmd := NewCmdAnnotate("kubectl", tf, iostreams) cmd.SetOutput(bufOut) options := NewAnnotateOptions(iostreams) - options.Filenames = []string{"../../../../test/e2e/testing-manifests/statefulset/cassandra/controller.yaml"} + options.Filenames = []string{"../../../test/data/controller.yaml"} args := []string{"a=b", "c-"} if err := options.Complete(tf, cmd, args); err != nil { t.Fatalf("unexpected error: %v", err) @@ -574,7 +574,7 @@ func TestAnnotateLocal(t *testing.T) { cmd := NewCmdAnnotate("kubectl", tf, iostreams) options := NewAnnotateOptions(iostreams) options.local = true - options.Filenames = []string{"../../../../test/e2e/testing-manifests/statefulset/cassandra/controller.yaml"} + options.Filenames = []string{"../../../test/data/controller.yaml"} args := []string{"a=b"} if err := options.Complete(tf, cmd, args); err != nil { t.Fatalf("unexpected error: %v", err) diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/apply/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/apply/BUILD index ee84fd248c7..d82f63e524f 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/apply/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/apply/BUILD @@ -50,10 +50,7 @@ go_library( go_test( name = "go_default_test", srcs = ["apply_test.go"], - data = [ - "//api/openapi-spec", - "//test/fixtures", - ], + data = ["//staging/src/k8s.io/kubectl/test/data"], embed = [":go_default_library"], deps = [ "//staging/src/k8s.io/api/apps/v1:go_default_library", diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/apply/apply_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/apply/apply_test.go index fb185a1b343..a007032c489 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/apply/apply_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/apply/apply_test.go @@ -54,7 +54,7 @@ import ( ) var ( - fakeSchema = sptest.Fake{Path: filepath.Join("..", "..", "..", "..", "api", "openapi-spec", "swagger.json")} + fakeSchema = sptest.Fake{Path: filepath.Join("..", "..", "..", "test", "data", "openapi", "swagger.json")} testingOpenAPISchemaFns = []func() (openapi.Resources, error){nil, AlwaysErrorOpenAPISchemaFn, openAPISchemaFn} AlwaysErrorOpenAPISchemaFn = func() (openapi.Resources, error) { return nil, errors.New("cannot get openapi spec") @@ -87,23 +87,23 @@ func validateApplyArgs(cmd *cobra.Command, args []string) error { } const ( - filenameCM = "../../../../test/fixtures/pkg/kubectl/cmd/apply/cm.yaml" - filenameRC = "../../../../test/fixtures/pkg/kubectl/cmd/apply/rc.yaml" - filenameRCArgs = "../../../../test/fixtures/pkg/kubectl/cmd/apply/rc-args.yaml" - filenameRCLastAppliedArgs = "../../../../test/fixtures/pkg/kubectl/cmd/apply/rc-lastapplied-args.yaml" - filenameRCNoAnnotation = "../../../../test/fixtures/pkg/kubectl/cmd/apply/rc-no-annotation.yaml" - filenameRCLASTAPPLIED = "../../../../test/fixtures/pkg/kubectl/cmd/apply/rc-lastapplied.yaml" - filenameSVC = "../../../../test/fixtures/pkg/kubectl/cmd/apply/service.yaml" - filenameRCSVC = "../../../../test/fixtures/pkg/kubectl/cmd/apply/rc-service.yaml" - filenameNoExistRC = "../../../../test/fixtures/pkg/kubectl/cmd/apply/rc-noexist.yaml" - filenameRCPatchTest = "../../../../test/fixtures/pkg/kubectl/cmd/apply/patch.json" - dirName = "../../../../test/fixtures/pkg/kubectl/cmd/apply/testdir" - filenameRCJSON = "../../../../test/fixtures/pkg/kubectl/cmd/apply/rc.json" + filenameCM = "../../../test/data/apply/cm.yaml" + filenameRC = "../../../test/data/apply/rc.yaml" + filenameRCArgs = "../../../test/data/apply/rc-args.yaml" + filenameRCLastAppliedArgs = "../../../test/data/apply/rc-lastapplied-args.yaml" + filenameRCNoAnnotation = "../../../test/data/apply/rc-no-annotation.yaml" + filenameRCLASTAPPLIED = "../../../test/data/apply/rc-lastapplied.yaml" + filenameSVC = "../../../test/data/apply/service.yaml" + filenameRCSVC = "../../../test/data/apply/rc-service.yaml" + filenameNoExistRC = "../../../test/data/apply/rc-noexist.yaml" + filenameRCPatchTest = "../../../test/data/apply/patch.json" + dirName = "../../../test/data/apply/testdir" + filenameRCJSON = "../../../test/data/apply/rc.json" - filenameWidgetClientside = "../../../../test/fixtures/pkg/kubectl/cmd/apply/widget-clientside.yaml" - filenameWidgetServerside = "../../../../test/fixtures/pkg/kubectl/cmd/apply/widget-serverside.yaml" - filenameDeployObjServerside = "../../../../test/fixtures/pkg/kubectl/cmd/apply/deploy-serverside.yaml" - filenameDeployObjClientside = "../../../../test/fixtures/pkg/kubectl/cmd/apply/deploy-clientside.yaml" + filenameWidgetClientside = "../../../test/data/apply/widget-clientside.yaml" + filenameWidgetServerside = "../../../test/data/apply/widget-serverside.yaml" + filenameDeployObjServerside = "../../../test/data/apply/deploy-serverside.yaml" + filenameDeployObjClientside = "../../../test/data/apply/deploy-clientside.yaml" ) func readConfigMapList(t *testing.T, filename string) [][]byte { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/create/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/create/BUILD index ef40a36347c..4d34881f4bb 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/create/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/create/BUILD @@ -77,9 +77,7 @@ go_test( "create_serviceaccount_test.go", "create_test.go", ], - data = [ - "//test/e2e/testing-manifests:all-srcs", - ], + data = ["//staging/src/k8s.io/kubectl/test/data"], embed = [":go_default_library"], deps = [ "//staging/src/k8s.io/api/apps/v1:go_default_library", diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_test.go index 2dad484dc2f..e817f729953 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_test.go @@ -67,7 +67,7 @@ func TestCreateObject(t *testing.T) { ioStreams, _, buf, _ := genericclioptions.NewTestIOStreams() cmd := NewCmdCreate(tf, ioStreams) - cmd.Flags().Set("filename", "../../../../test/e2e/testing-manifests/guestbook/legacy/redis-master-controller.yaml") + cmd.Flags().Set("filename", "../../../test/data/redis-master-controller.yaml") cmd.Flags().Set("output", "name") cmd.Run(cmd, []string{}) @@ -104,8 +104,8 @@ func TestCreateMultipleObject(t *testing.T) { ioStreams, _, buf, _ := genericclioptions.NewTestIOStreams() cmd := NewCmdCreate(tf, ioStreams) - cmd.Flags().Set("filename", "../../../../test/e2e/testing-manifests/guestbook/legacy/redis-master-controller.yaml") - cmd.Flags().Set("filename", "../../../../test/e2e/testing-manifests/guestbook/frontend-service.yaml") + cmd.Flags().Set("filename", "../../../test/data/redis-master-controller.yaml") + cmd.Flags().Set("filename", "../../../test/data/frontend-service.yaml") cmd.Flags().Set("output", "name") cmd.Run(cmd, []string{}) @@ -141,7 +141,7 @@ func TestCreateDirectory(t *testing.T) { ioStreams, _, buf, _ := genericclioptions.NewTestIOStreams() cmd := NewCmdCreate(tf, ioStreams) - cmd.Flags().Set("filename", "../../../../test/e2e/testing-manifests/guestbook/legacy") + cmd.Flags().Set("filename", "../../../test/data/replace/legacy") cmd.Flags().Set("output", "name") cmd.Run(cmd, []string{}) diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/delete/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/delete/BUILD index 2c55d5e5491..27338c61496 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/delete/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/delete/BUILD @@ -31,9 +31,7 @@ go_library( go_test( name = "go_default_test", srcs = ["delete_test.go"], - data = [ - "//test/e2e/testing-manifests:all-srcs", - ], + data = ["//staging/src/k8s.io/kubectl/test/data"], embed = [":go_default_library"], deps = [ "//staging/src/k8s.io/api/core/v1:go_default_library", diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/delete/delete_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/delete/delete_test.go index 5fdd6254947..79d996c97b2 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/delete/delete_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/delete/delete_test.go @@ -38,9 +38,9 @@ import ( func fakecmd() *cobra.Command { cmd := &cobra.Command{ - Use: "delete ([-f FILENAME] | TYPE [(NAME | -l label | --all)])", + Use: "delete ([-f FILENAME] | TYPE [(NAME | -l label | --all)])", DisableFlagsInUseLine: true, - Run: func(cmd *cobra.Command, args []string) {}, + Run: func(cmd *cobra.Command, args []string) {}, } return cmd } @@ -237,7 +237,7 @@ func TestDeleteObject(t *testing.T) { streams, _, buf, _ := genericclioptions.NewTestIOStreams() cmd := NewCmdDelete(tf, streams) - cmd.Flags().Set("filename", "../../../../test/e2e/testing-manifests/guestbook/legacy/redis-master-controller.yaml") + cmd.Flags().Set("filename", "../../../test/data/redis-master-controller.yaml") cmd.Flags().Set("cascade", "false") cmd.Flags().Set("output", "name") cmd.Run(cmd, []string{}) @@ -317,7 +317,7 @@ func TestDeleteObjectNotFound(t *testing.T) { options := &DeleteOptions{ FilenameOptions: resource.FilenameOptions{ - Filenames: []string{"../../../../test/e2e/testing-manifests/guestbook/legacy/redis-master-controller.yaml"}, + Filenames: []string{"../../../test/data/redis-master-controller.yaml"}, }, GracePeriod: -1, Cascade: false, @@ -354,7 +354,7 @@ func TestDeleteObjectIgnoreNotFound(t *testing.T) { streams, _, buf, _ := genericclioptions.NewTestIOStreams() cmd := NewCmdDelete(tf, streams) - cmd.Flags().Set("filename", "../../../../test/e2e/testing-manifests/guestbook/legacy/redis-master-controller.yaml") + cmd.Flags().Set("filename", "../../../test/data/redis-master-controller.yaml") cmd.Flags().Set("cascade", "false") cmd.Flags().Set("ignore-not-found", "true") cmd.Flags().Set("output", "name") @@ -482,8 +482,8 @@ func TestDeleteMultipleObject(t *testing.T) { streams, _, buf, _ := genericclioptions.NewTestIOStreams() cmd := NewCmdDelete(tf, streams) - cmd.Flags().Set("filename", "../../../../test/e2e/testing-manifests/guestbook/legacy/redis-master-controller.yaml") - cmd.Flags().Set("filename", "../../../../test/e2e/testing-manifests/guestbook/frontend-service.yaml") + cmd.Flags().Set("filename", "../../../test/data/redis-master-controller.yaml") + cmd.Flags().Set("filename", "../../../test/data/frontend-service.yaml") cmd.Flags().Set("cascade", "false") cmd.Flags().Set("output", "name") cmd.Run(cmd, []string{}) @@ -520,7 +520,7 @@ func TestDeleteMultipleObjectContinueOnMissing(t *testing.T) { options := &DeleteOptions{ FilenameOptions: resource.FilenameOptions{ - Filenames: []string{"../../../../test/e2e/testing-manifests/guestbook/legacy/redis-master-controller.yaml", "../../../../test/e2e/testing-manifests/guestbook/frontend-service.yaml"}, + Filenames: []string{"../../../test/data/redis-master-controller.yaml", "../../../test/data/frontend-service.yaml"}, }, GracePeriod: -1, Cascade: false, @@ -604,7 +604,7 @@ func TestDeleteDirectory(t *testing.T) { streams, _, buf, _ := genericclioptions.NewTestIOStreams() cmd := NewCmdDelete(tf, streams) - cmd.Flags().Set("filename", "../../../../test/e2e/testing-manifests/guestbook/legacy") + cmd.Flags().Set("filename", "../../../test/data/replace/legacy") cmd.Flags().Set("cascade", "false") cmd.Flags().Set("output", "name") cmd.Run(cmd, []string{}) diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/describe/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/describe/BUILD index 374022d3fb4..3e7065bfc2b 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/describe/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/describe/BUILD @@ -25,9 +25,7 @@ go_library( go_test( name = "go_default_test", srcs = ["describe_test.go"], - data = [ - "//test/e2e/testing-manifests:all-srcs", - ], + data = ["//staging/src/k8s.io/kubectl/test/data"], embed = [":go_default_library"], deps = [ "//staging/src/k8s.io/apimachinery/pkg/api/meta:go_default_library", diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/describe/describe_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/describe/describe_test.go index e95e70bef67..d758e159f22 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/describe/describe_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/describe/describe_test.go @@ -126,7 +126,7 @@ func TestDescribeObject(t *testing.T) { streams, _, buf, _ := genericclioptions.NewTestIOStreams() cmd := NewCmdDescribe("kubectl", tf, streams) - cmd.Flags().Set("filename", "../../../../test/e2e/testing-manifests/guestbook/legacy/redis-master-controller.yaml") + cmd.Flags().Set("filename", "../../../test/data/redis-master-controller.yaml") cmd.Run(cmd, []string{}) if d.Name != "redis-master" || d.Namespace != "test" { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/expose/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/expose/BUILD index 99580a2bc75..ad2eb448164 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/expose/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/expose/BUILD @@ -33,9 +33,7 @@ go_library( go_test( name = "go_default_test", srcs = ["expose_test.go"], - data = [ - "//test/e2e/testing-manifests:all-srcs", - ], + data = ["//staging/src/k8s.io/kubectl/test/data"], embed = [":go_default_library"], deps = [ "//staging/src/k8s.io/api/core/v1:go_default_library", diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/expose/expose_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/expose/expose_test.go index a94592b3272..267d5d0c05d 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/expose/expose_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/expose/expose_test.go @@ -306,7 +306,7 @@ func TestRunExposeService(t *testing.T) { Selector: map[string]string{"app": "go"}, }, }, - flags: map[string]string{"filename": "../../../../test/e2e/testing-manifests/guestbook/redis-master-service.yaml", "selector": "func=stream", "protocol": "UDP", "port": "14", "name": "foo", "labels": "svc=test", "dry-run": "true"}, + flags: map[string]string{"filename": "../../../test/data/redis-master-service.yaml", "selector": "func=stream", "protocol": "UDP", "port": "14", "name": "foo", "labels": "svc=test", "dry-run": "true"}, output: &corev1.Service{ ObjectMeta: metav1.ObjectMeta{Name: "foo", Labels: map[string]string{"svc": "test"}}, Spec: corev1.ServiceSpec{ diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/label/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/label/BUILD index 28f8112f6eb..8b0a1043a07 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/label/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/label/BUILD @@ -31,9 +31,7 @@ go_library( go_test( name = "go_default_test", srcs = ["label_test.go"], - data = [ - "//test/e2e/testing-manifests:all-srcs", - ], + data = ["//staging/src/k8s.io/kubectl/test/data"], embed = [":go_default_library"], deps = [ "//staging/src/k8s.io/api/core/v1:go_default_library", diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/label/label_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/label/label_test.go index 828b8a146a3..f2634167295 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/label/label_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/label/label_test.go @@ -392,7 +392,7 @@ func TestLabelForResourceFromFile(t *testing.T) { ioStreams, _, buf, _ := genericclioptions.NewTestIOStreams() cmd := NewCmdLabel(tf, ioStreams) opts := NewLabelOptions(ioStreams) - opts.Filenames = []string{"../../../../test/e2e/testing-manifests/statefulset/cassandra/controller.yaml"} + opts.Filenames = []string{"../../../test/data/controller.yaml"} err := opts.Complete(tf, cmd, []string{"a=b"}) if err == nil { err = opts.Validate() @@ -424,7 +424,7 @@ func TestLabelLocal(t *testing.T) { ioStreams, _, buf, _ := genericclioptions.NewTestIOStreams() cmd := NewCmdLabel(tf, ioStreams) opts := NewLabelOptions(ioStreams) - opts.Filenames = []string{"../../../../test/e2e/testing-manifests/statefulset/cassandra/controller.yaml"} + opts.Filenames = []string{"../../../test/data/controller.yaml"} opts.local = true err := opts.Complete(tf, cmd, []string{"a=b"}) if err == nil { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/patch/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/patch/BUILD index fad8f8c7c05..6912d0ef10d 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/patch/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/patch/BUILD @@ -31,9 +31,7 @@ go_library( go_test( name = "go_default_test", srcs = ["patch_test.go"], - data = [ - "//test/e2e/testing-manifests:all-srcs", - ], + data = ["//staging/src/k8s.io/kubectl/test/data"], embed = [":go_default_library"], deps = [ "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library", diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/patch/patch_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/patch/patch_test.go index b5b7ef2feba..ac3335c5a72 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/patch/patch_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/patch/patch_test.go @@ -95,7 +95,7 @@ func TestPatchObjectFromFile(t *testing.T) { cmd.Flags().Set("namespace", "test") cmd.Flags().Set("patch", `{"spec":{"type":"NodePort"}}`) cmd.Flags().Set("output", "name") - cmd.Flags().Set("filename", "../../../../test/e2e/testing-manifests/guestbook/frontend-service.yaml") + cmd.Flags().Set("filename", "../../../test/data/frontend-service.yaml") cmd.Run(cmd, []string{}) // uses the name from the response @@ -181,7 +181,7 @@ func TestPatchObjectFromFileOutput(t *testing.T) { cmd.Flags().Set("namespace", "test") cmd.Flags().Set("patch", `{"spec":{"type":"NodePort"}}`) cmd.Flags().Set("output", "yaml") - cmd.Flags().Set("filename", "../../../../test/e2e/testing-manifests/guestbook/frontend-service.yaml") + cmd.Flags().Set("filename", "../../../test/data/frontend-service.yaml") cmd.Run(cmd, []string{}) t.Log(buf.String()) diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/replace/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/replace/BUILD index 97b04ebda72..5bd24eff8c8 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/replace/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/replace/BUILD @@ -28,9 +28,7 @@ go_library( go_test( name = "go_default_test", srcs = ["replace_test.go"], - data = [ - "//test/e2e/testing-manifests:all-srcs", - ], + data = ["//staging/src/k8s.io/kubectl/test/data"], embed = [":go_default_library"], deps = [ "//staging/src/k8s.io/api/core/v1:go_default_library", diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/replace/replace_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/replace/replace_test.go index d90027e71c4..e2a2b8f8b09 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/replace/replace_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/replace/replace_test.go @@ -65,7 +65,7 @@ func TestReplaceObject(t *testing.T) { streams, _, buf, _ := genericclioptions.NewTestIOStreams() cmd := NewCmdReplace(tf, streams) - cmd.Flags().Set("filename", "../../../../test/e2e/testing-manifests/guestbook/legacy/redis-master-controller.yaml") + cmd.Flags().Set("filename", "../../../test/data/redis-master-controller.yaml") cmd.Flags().Set("output", "name") cmd.Run(cmd, []string{}) @@ -135,8 +135,8 @@ func TestReplaceMultipleObject(t *testing.T) { streams, _, buf, _ := genericclioptions.NewTestIOStreams() cmd := NewCmdReplace(tf, streams) - cmd.Flags().Set("filename", "../../../../test/e2e/testing-manifests/guestbook/legacy/redis-master-controller.yaml") - cmd.Flags().Set("filename", "../../../../test/e2e/testing-manifests/guestbook/frontend-service.yaml") + cmd.Flags().Set("filename", "../../../test/data/redis-master-controller.yaml") + cmd.Flags().Set("filename", "../../../test/data/frontend-service.yaml") cmd.Flags().Set("output", "name") cmd.Run(cmd, []string{}) @@ -192,7 +192,7 @@ func TestReplaceDirectory(t *testing.T) { streams, _, buf, _ := genericclioptions.NewTestIOStreams() cmd := NewCmdReplace(tf, streams) - cmd.Flags().Set("filename", "../../../../test/e2e/testing-manifests/guestbook/legacy") + cmd.Flags().Set("filename", "../../../test/data/replace/legacy") cmd.Flags().Set("namespace", "test") cmd.Flags().Set("output", "name") cmd.Run(cmd, []string{}) @@ -238,7 +238,7 @@ func TestForceReplaceObjectNotFound(t *testing.T) { streams, _, buf, _ := genericclioptions.NewTestIOStreams() cmd := NewCmdReplace(tf, streams) - cmd.Flags().Set("filename", "../../../../test/e2e/testing-manifests/guestbook/legacy/redis-master-controller.yaml") + cmd.Flags().Set("filename", "../../../test/data/redis-master-controller.yaml") cmd.Flags().Set("force", "true") cmd.Flags().Set("cascade", "false") cmd.Flags().Set("output", "name") diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/set/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/set/BUILD index ded20d03740..169cd35930d 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/set/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/set/BUILD @@ -57,10 +57,7 @@ go_test( "set_subject_test.go", "set_test.go", ], - data = [ - "//test/e2e/testing-manifests:all-srcs", - "//test/fixtures", - ], + data = ["//staging/src/k8s.io/kubectl/test/data"], embed = [":go_default_library"], deps = [ "//staging/src/k8s.io/api/apps/v1:go_default_library", diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/set/set_env_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_env_test.go index 9726037e7db..0e6560cc801 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/set/set_env_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_env_test.go @@ -60,7 +60,7 @@ func TestSetEnvLocal(t *testing.T) { opts := NewEnvOptions(streams) opts.PrintFlags = genericclioptions.NewPrintFlags("").WithDefaultOutput(outputFormat).WithTypeSetter(scheme.Scheme) opts.FilenameOptions = resource.FilenameOptions{ - Filenames: []string{"../../../../test/e2e/testing-manifests/statefulset/cassandra/controller.yaml"}, + Filenames: []string{"../../../test/data/controller.yaml"}, } opts.Local = true @@ -97,7 +97,7 @@ func TestSetEnvLocalNamespace(t *testing.T) { opts := NewEnvOptions(streams) opts.PrintFlags = genericclioptions.NewPrintFlags("").WithDefaultOutput(outputFormat).WithTypeSetter(scheme.Scheme) opts.FilenameOptions = resource.FilenameOptions{ - Filenames: []string{"../../../../test/fixtures/pkg/kubectl/cmd/set/namespaced-resource.yaml"}, + Filenames: []string{"../../../test/data/set/namespaced-resource.yaml"}, } opts.Local = true @@ -134,7 +134,7 @@ func TestSetMultiResourcesEnvLocal(t *testing.T) { opts := NewEnvOptions(streams) opts.PrintFlags = genericclioptions.NewPrintFlags("").WithDefaultOutput(outputFormat).WithTypeSetter(scheme.Scheme) opts.FilenameOptions = resource.FilenameOptions{ - Filenames: []string{"../../../../test/fixtures/pkg/kubectl/cmd/set/multi-resource-yaml.yaml"}, + Filenames: []string{"../../../test/data/set/multi-resource-yaml.yaml"}, } opts.Local = true diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/set/set_image_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_image_test.go index 806da6dbfc4..6cd1ffb29bc 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/set/set_image_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_image_test.go @@ -67,7 +67,7 @@ func TestImageLocal(t *testing.T) { opts := SetImageOptions{ PrintFlags: genericclioptions.NewPrintFlags("").WithDefaultOutput(outputFormat).WithTypeSetter(scheme.Scheme), FilenameOptions: resource.FilenameOptions{ - Filenames: []string{"../../../../test/e2e/testing-manifests/statefulset/cassandra/controller.yaml"}}, + Filenames: []string{"../../../test/data/controller.yaml"}}, Local: true, IOStreams: streams, } @@ -179,7 +179,7 @@ func TestSetMultiResourcesImageLocal(t *testing.T) { opts := SetImageOptions{ PrintFlags: genericclioptions.NewPrintFlags("").WithDefaultOutput(outputFormat).WithTypeSetter(scheme.Scheme), FilenameOptions: resource.FilenameOptions{ - Filenames: []string{"../../../../test/fixtures/pkg/kubectl/cmd/set/multi-resource-yaml.yaml"}}, + Filenames: []string{"../../../test/data/set/multi-resource-yaml.yaml"}}, Local: true, IOStreams: streams, } diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/set/set_resources_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_resources_test.go index 69252043483..cc8202640ca 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/set/set_resources_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_resources_test.go @@ -66,7 +66,7 @@ func TestResourcesLocal(t *testing.T) { opts := SetResourcesOptions{ PrintFlags: genericclioptions.NewPrintFlags("").WithDefaultOutput(outputFormat).WithTypeSetter(scheme.Scheme), FilenameOptions: resource.FilenameOptions{ - Filenames: []string{"../../../../test/e2e/testing-manifests/statefulset/cassandra/controller.yaml"}}, + Filenames: []string{"../../../test/data/controller.yaml"}}, Local: true, Limits: "cpu=200m,memory=512Mi", Requests: "cpu=200m,memory=512Mi", @@ -114,7 +114,7 @@ func TestSetMultiResourcesLimitsLocal(t *testing.T) { opts := SetResourcesOptions{ PrintFlags: genericclioptions.NewPrintFlags("").WithDefaultOutput(outputFormat).WithTypeSetter(scheme.Scheme), FilenameOptions: resource.FilenameOptions{ - Filenames: []string{"../../../../test/fixtures/pkg/kubectl/cmd/set/multi-resource-yaml.yaml"}}, + Filenames: []string{"../../../test/data/set/multi-resource-yaml.yaml"}}, Local: true, Limits: "cpu=200m,memory=512Mi", Requests: "cpu=200m,memory=512Mi", diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/set/set_serviceaccount_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_serviceaccount_test.go index 59a3c1ce6ba..aa7e3dd6366 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/set/set_serviceaccount_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_serviceaccount_test.go @@ -57,11 +57,11 @@ func TestSetServiceAccountLocal(t *testing.T) { yaml string apiGroup string }{ - {yaml: "../../../../test/fixtures/doc-yaml/user-guide/replication.yaml", apiGroup: ""}, - {yaml: "../../../../test/fixtures/doc-yaml/admin/daemon.yaml", apiGroup: "extensions"}, - {yaml: "../../../../test/fixtures/doc-yaml/user-guide/replicaset/redis-slave.yaml", apiGroup: "extensions"}, - {yaml: "../../../../test/fixtures/doc-yaml/user-guide/job.yaml", apiGroup: "batch"}, - {yaml: "../../../../test/fixtures/doc-yaml/user-guide/deployment.yaml", apiGroup: "extensions"}, + {yaml: "../../../test/data/set/replication.yaml", apiGroup: ""}, + {yaml: "../../../test/data/set/daemon.yaml", apiGroup: "extensions"}, + {yaml: "../../../test/data/set/redis-slave.yaml", apiGroup: "extensions"}, + {yaml: "../../../test/data/set/job.yaml", apiGroup: "batch"}, + {yaml: "../../../test/data/set/deployment.yaml", apiGroup: "extensions"}, } for i, input := range inputs { @@ -122,7 +122,7 @@ func TestSetServiceAccountMultiLocal(t *testing.T) { opts := SetServiceAccountOptions{ PrintFlags: genericclioptions.NewPrintFlags("").WithDefaultOutput(outputFormat).WithTypeSetter(scheme.Scheme), fileNameOptions: resource.FilenameOptions{ - Filenames: []string{"../../../../test/fixtures/pkg/kubectl/cmd/set/multi-resource-yaml.yaml"}}, + Filenames: []string{"../../../test/data/set/multi-resource-yaml.yaml"}}, local: true, IOStreams: streams, } diff --git a/staging/src/k8s.io/kubectl/pkg/util/openapi/BUILD b/staging/src/k8s.io/kubectl/pkg/util/openapi/BUILD index e01cd8c7fd3..235f4a4e316 100644 --- a/staging/src/k8s.io/kubectl/pkg/util/openapi/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/util/openapi/BUILD @@ -30,9 +30,7 @@ go_test( "openapi_suite_test.go", "openapi_test.go", ], - data = [ - "//staging/src/k8s.io/kubectl/test/data/openapi", - ], + data = ["//staging/src/k8s.io/kubectl/test/data"], embed = [":go_default_library"], deps = [ "//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", diff --git a/staging/src/k8s.io/kubectl/pkg/util/openapi/validation/BUILD b/staging/src/k8s.io/kubectl/pkg/util/openapi/validation/BUILD index f731d73a611..f2ede189d79 100644 --- a/staging/src/k8s.io/kubectl/pkg/util/openapi/validation/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/util/openapi/validation/BUILD @@ -22,9 +22,7 @@ go_test( "validation_suite_test.go", "validation_test.go", ], - data = [ - "//staging/src/k8s.io/kubectl/test/data/openapi", - ], + data = ["//staging/src/k8s.io/kubectl/test/data"], embed = [":go_default_library"], deps = [ "//staging/src/k8s.io/apimachinery/pkg/util/errors:go_default_library", diff --git a/staging/src/k8s.io/kubectl/test/data/BUILD b/staging/src/k8s.io/kubectl/test/data/BUILD new file mode 100644 index 00000000000..ebcce3684ee --- /dev/null +++ b/staging/src/k8s.io/kubectl/test/data/BUILD @@ -0,0 +1,24 @@ +package(default_visibility = ["//visibility:public"]) + +filegroup( + name = "data", + srcs = glob([ + "**/*.yaml", + "**/*.yml", + "**/*.json", + ]), +) + +filegroup( + name = "package-srcs", + srcs = glob(["**"]), + tags = ["automanaged"], + visibility = ["//visibility:private"], +) + +filegroup( + name = "all-srcs", + srcs = [":package-srcs"], + tags = ["automanaged"], + visibility = ["//visibility:public"], +) diff --git a/staging/src/k8s.io/kubectl/test/data/apply/cm.yaml b/staging/src/k8s.io/kubectl/test/data/apply/cm.yaml new file mode 100644 index 00000000000..ef3200581d9 --- /dev/null +++ b/staging/src/k8s.io/kubectl/test/data/apply/cm.yaml @@ -0,0 +1,16 @@ +apiVersion: v1 +items: +- kind: ConfigMap + apiVersion: v1 + metadata: + name: test0 + data: + key1: apple +- kind: ConfigMap + apiVersion: v1 + metadata: + name: test1 + data: + key2: apple +kind: ConfigMapList +metadata: {} diff --git a/staging/src/k8s.io/kubectl/test/data/apply/deploy-clientside.yaml b/staging/src/k8s.io/kubectl/test/data/apply/deploy-clientside.yaml new file mode 100644 index 00000000000..4261fb09b96 --- /dev/null +++ b/staging/src/k8s.io/kubectl/test/data/apply/deploy-clientside.yaml @@ -0,0 +1,21 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: nginx-deployment + labels: + name: nginx +spec: + selector: + matchLabels: + name: nginx + strategy: + type: Recreate + rollingUpdate: null + template: + metadata: + labels: + name: nginx + spec: + containers: + - name: nginx + image: nginx diff --git a/staging/src/k8s.io/kubectl/test/data/apply/deploy-serverside.yaml b/staging/src/k8s.io/kubectl/test/data/apply/deploy-serverside.yaml new file mode 100644 index 00000000000..664b87fd770 --- /dev/null +++ b/staging/src/k8s.io/kubectl/test/data/apply/deploy-serverside.yaml @@ -0,0 +1,46 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + annotations: + deployment.kubernetes.io/revision: "1" + kubectl.kubernetes.io/last-applied-configuration: '{"kind":"Deployment","apiVersion":"apps/v1","metadata":{"name":"nginx-deployment","creationTimestamp":null,"labels":{"name":"nginx"}},"spec":{"selector":{"matchLabels":{"name":"nginx"}},"template":{"metadata":{"creationTimestamp":null,"labels":{"name":"nginx"}},"spec":{"containers":[{"name":"nginx","image":"nginx","resources":{}}]}},"strategy":{}},"status":{}}' + creationTimestamp: "2016-10-24T22:15:06Z" + generation: 6 + labels: + name: nginx + name: nginx-deployment + namespace: test + resourceVersion: "355959" + selfLink: /apis/extensions/v1beta1/namespaces/test/deployments/nginx-deployment + uid: 51ac266e-9a37-11e6-8738-0800270c4edc +spec: + replicas: 1 + selector: + matchLabels: + name: nginx + strategy: + rollingUpdate: + maxSurge: 1 + maxUnavailable: 1 + type: RollingUpdate + template: + metadata: + creationTimestamp: null + labels: + name: nginx + spec: + containers: + - image: nginx + imagePullPolicy: Always + name: nginx + resources: {} + terminationMessagePath: /dev/termination-log + dnsPolicy: ClusterFirst + restartPolicy: Always + securityContext: {} + terminationGracePeriodSeconds: 30 +status: + availableReplicas: 1 + observedGeneration: 6 + replicas: 1 + updatedReplicas: 1 diff --git a/staging/src/k8s.io/kubectl/test/data/apply/patch.json b/staging/src/k8s.io/kubectl/test/data/apply/patch.json new file mode 100644 index 00000000000..99542fb7022 --- /dev/null +++ b/staging/src/k8s.io/kubectl/test/data/apply/patch.json @@ -0,0 +1 @@ +{"apiVersion":"v1","kind":"ReplicationController","metadata":{"labels":{"name":"test-rc"},"name":"test-rc","namespace":"test"},"spec":{"replicas":1,"template":{"metadata":{"labels":{"name":"test-rc"}},"spec":{"containers":[{"image":"nginx","name":"test-rc","ports":[{"containerPort":80}]}]}}}} diff --git a/staging/src/k8s.io/kubectl/test/data/apply/rc-args.yaml b/staging/src/k8s.io/kubectl/test/data/apply/rc-args.yaml new file mode 100644 index 00000000000..84688732835 --- /dev/null +++ b/staging/src/k8s.io/kubectl/test/data/apply/rc-args.yaml @@ -0,0 +1,20 @@ +apiVersion: v1 +kind: ReplicationController +metadata: + name: test-rc + labels: + name: test-rc +spec: + replicas: 1 + template: + metadata: + labels: + name: test-rc + spec: + containers: + - name: test-rc + image: nginx + args: + - -random_flag=%s@domain.com + ports: + - containerPort: 80 diff --git a/staging/src/k8s.io/kubectl/test/data/apply/rc-lastapplied-args.yaml b/staging/src/k8s.io/kubectl/test/data/apply/rc-lastapplied-args.yaml new file mode 100644 index 00000000000..16e1d7ba899 --- /dev/null +++ b/staging/src/k8s.io/kubectl/test/data/apply/rc-lastapplied-args.yaml @@ -0,0 +1,23 @@ +apiVersion: v1 +kind: ReplicationController +metadata: + annotations: + kubectl.kubernetes.io/last-applied-configuration: | + {"args":"-random_flag=%s@domain.com"} + name: test-rc + labels: + name: test-rc +spec: + replicas: 1 + template: + metadata: + labels: + name: test-rc + spec: + containers: + - name: test-rc + image: nginx + args: + - -random_flag=%s@domain.com + ports: + - containerPort: 80 diff --git a/staging/src/k8s.io/kubectl/test/data/apply/rc-lastapplied.yaml b/staging/src/k8s.io/kubectl/test/data/apply/rc-lastapplied.yaml new file mode 100644 index 00000000000..6db0a5c47a1 --- /dev/null +++ b/staging/src/k8s.io/kubectl/test/data/apply/rc-lastapplied.yaml @@ -0,0 +1,21 @@ +apiVersion: v1 +kind: ReplicationController +metadata: + annotations: + kubectl.kubernetes.io/last-applied-configuration: | + {"test":1234} + name: test-rc + labels: + name: test-rc +spec: + replicas: 1 + template: + metadata: + labels: + name: test-rc + spec: + containers: + - name: test-rc + image: nginx + ports: + - containerPort: 80 diff --git a/staging/src/k8s.io/kubectl/test/data/apply/rc-no-annotation.yaml b/staging/src/k8s.io/kubectl/test/data/apply/rc-no-annotation.yaml new file mode 100644 index 00000000000..2cf3b46a1f3 --- /dev/null +++ b/staging/src/k8s.io/kubectl/test/data/apply/rc-no-annotation.yaml @@ -0,0 +1,18 @@ +apiVersion: v1 +kind: ReplicationController +metadata: + name: no-annotation + labels: + name: no-annotation +spec: + replicas: 1 + template: + metadata: + labels: + name: no-annotation + spec: + containers: + - name: no-annotation + image: nginx + ports: + - containerPort: 80 diff --git a/staging/src/k8s.io/kubectl/test/data/apply/rc-noexist.yaml b/staging/src/k8s.io/kubectl/test/data/apply/rc-noexist.yaml new file mode 100644 index 00000000000..df1d372ea4a --- /dev/null +++ b/staging/src/k8s.io/kubectl/test/data/apply/rc-noexist.yaml @@ -0,0 +1,18 @@ +apiVersion: v1 +kind: ReplicationController +metadata: + name: no-exist + labels: + name: no-exist +spec: + replicas: 1 + template: + metadata: + labels: + name: no-exist + spec: + containers: + - name: no-exist + image: nginx + ports: + - containerPort: 80 diff --git a/staging/src/k8s.io/kubectl/test/data/apply/rc-service.yaml b/staging/src/k8s.io/kubectl/test/data/apply/rc-service.yaml new file mode 100644 index 00000000000..23cf17d99ac --- /dev/null +++ b/staging/src/k8s.io/kubectl/test/data/apply/rc-service.yaml @@ -0,0 +1,32 @@ +apiVersion: v1 +kind: List +items: + - apiVersion: v1 + kind: Service + metadata: + name: test-service + labels: + name: test-service + spec: + ports: + - port: 80 + selector: + name: test-rc + - apiVersion: v1 + kind: ReplicationController + metadata: + name: test-rc + labels: + name: test-rc + spec: + replicas: 1 + template: + metadata: + labels: + name: test-rc + spec: + containers: + - name: test-rc + image: nginx + ports: + - containerPort: 80 diff --git a/staging/src/k8s.io/kubectl/test/data/apply/rc.json b/staging/src/k8s.io/kubectl/test/data/apply/rc.json new file mode 100644 index 00000000000..ae6db775f3b --- /dev/null +++ b/staging/src/k8s.io/kubectl/test/data/apply/rc.json @@ -0,0 +1,33 @@ +{ + "apiVersion": "v1", + "kind": "ReplicationController", + "metadata": { + "name": "test-rc", + "labels": { + "name": "test-rc" + } + }, + "spec": { + "replicas": 1, + "template": { + "metadata": { + "labels": { + "name": "test-rc" + } + }, + "spec": { + "containers": [ + { + "name": "test-rc", + "image": "nginx", + "ports": [ + { + "containerPort": 80 + } + ] + } + ] + } + } + } +} diff --git a/staging/src/k8s.io/kubectl/test/data/apply/rc.yaml b/staging/src/k8s.io/kubectl/test/data/apply/rc.yaml new file mode 100644 index 00000000000..24dc67ceb52 --- /dev/null +++ b/staging/src/k8s.io/kubectl/test/data/apply/rc.yaml @@ -0,0 +1,19 @@ +apiVersion: v1 +kind: ReplicationController +metadata: + name: test-rc + namespace: test + labels: + name: test-rc +spec: + replicas: 1 + template: + metadata: + labels: + name: test-rc + spec: + containers: + - name: test-rc + image: nginx + ports: + - containerPort: 80 diff --git a/staging/src/k8s.io/kubectl/test/data/apply/service.yaml b/staging/src/k8s.io/kubectl/test/data/apply/service.yaml new file mode 100644 index 00000000000..073970761b8 --- /dev/null +++ b/staging/src/k8s.io/kubectl/test/data/apply/service.yaml @@ -0,0 +1,11 @@ +apiVersion: v1 +kind: Service +metadata: + name: test-service + labels: + name: test-service +spec: + ports: + - port: 80 + selector: + name: test-rc diff --git a/staging/src/k8s.io/kubectl/test/data/apply/testdir/rc.yaml b/staging/src/k8s.io/kubectl/test/data/apply/testdir/rc.yaml new file mode 100644 index 00000000000..1c1bf15be7f --- /dev/null +++ b/staging/src/k8s.io/kubectl/test/data/apply/testdir/rc.yaml @@ -0,0 +1,18 @@ +apiVersion: v1 +kind: ReplicationController +metadata: + name: test-rc + labels: + name: test-rc +spec: + replicas: 1 + template: + metadata: + labels: + name: test-rc + spec: + containers: + - name: test-rc + image: nginx + ports: + - containerPort: 80 diff --git a/staging/src/k8s.io/kubectl/test/data/apply/testdir/rc1.yaml b/staging/src/k8s.io/kubectl/test/data/apply/testdir/rc1.yaml new file mode 100644 index 00000000000..1c1bf15be7f --- /dev/null +++ b/staging/src/k8s.io/kubectl/test/data/apply/testdir/rc1.yaml @@ -0,0 +1,18 @@ +apiVersion: v1 +kind: ReplicationController +metadata: + name: test-rc + labels: + name: test-rc +spec: + replicas: 1 + template: + metadata: + labels: + name: test-rc + spec: + containers: + - name: test-rc + image: nginx + ports: + - containerPort: 80 diff --git a/staging/src/k8s.io/kubectl/test/data/apply/widget-clientside.yaml b/staging/src/k8s.io/kubectl/test/data/apply/widget-clientside.yaml new file mode 100644 index 00000000000..4688160fe22 --- /dev/null +++ b/staging/src/k8s.io/kubectl/test/data/apply/widget-clientside.yaml @@ -0,0 +1,8 @@ +apiVersion: "unit-test.test.com/v1" +kind: Widget +metadata: + name: "widget" + namespace: "test" + labels: + foo: bar +key: "value" \ No newline at end of file diff --git a/staging/src/k8s.io/kubectl/test/data/apply/widget-serverside.yaml b/staging/src/k8s.io/kubectl/test/data/apply/widget-serverside.yaml new file mode 100644 index 00000000000..9fab75a8421 --- /dev/null +++ b/staging/src/k8s.io/kubectl/test/data/apply/widget-serverside.yaml @@ -0,0 +1,10 @@ +apiVersion: "unit-test.test.com/v1" +kind: Widget +metadata: + name: "widget" + namespace: "test" + annotations: + "kubectl.kubernetes.io/last-applied-configuration": "{\"apiVersion\":\"unit-test.test.com/v1\",\"key\":\"value\",\"kind\":\"Widget\",\"metadata\":{\"annotations\":{},\"labels\":{\"foo\":\"bar\"},\"name\":\"widget\",\"namespace\":\"test\"}}\n" + labels: + foo: bar +key: "value" \ No newline at end of file diff --git a/staging/src/k8s.io/kubectl/test/data/controller.yaml b/staging/src/k8s.io/kubectl/test/data/controller.yaml new file mode 100644 index 00000000000..f11aeb3ce66 --- /dev/null +++ b/staging/src/k8s.io/kubectl/test/data/controller.yaml @@ -0,0 +1,58 @@ +apiVersion: v1 +kind: ReplicationController +metadata: + name: cassandra + # The labels will be applied automatically + # from the labels in the pod template, if not set + # labels: + # app: cassandra +spec: + replicas: 2 + # The selector will be applied automatically + # from the labels in the pod template, if not set. + # selector: + # app: cassandra + template: + metadata: + labels: + app: cassandra + spec: + containers: + - command: + - /run.sh + resources: + limits: + cpu: 0.5 + env: + - name: MAX_HEAP_SIZE + value: 512M + - name: HEAP_NEWSIZE + value: 100M + - name: CASSANDRA_SEED_PROVIDER + value: "io.k8s.cassandra.KubernetesSeedProvider" + - name: POD_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + - name: POD_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + image: gcr.io/google-samples/cassandra:v13 + name: cassandra + ports: + - containerPort: 7000 + name: intra-node + - containerPort: 7001 + name: tls-intra-node + - containerPort: 7199 + name: jmx + - containerPort: 9042 + name: cql + volumeMounts: + - mountPath: /cassandra_data + name: data + volumes: + - name: data + emptyDir: {} + diff --git a/staging/src/k8s.io/kubectl/test/data/frontend-service.yaml b/staging/src/k8s.io/kubectl/test/data/frontend-service.yaml new file mode 100644 index 00000000000..ee50fd847cf --- /dev/null +++ b/staging/src/k8s.io/kubectl/test/data/frontend-service.yaml @@ -0,0 +1,16 @@ +apiVersion: v1 +kind: Service +metadata: + name: frontend + labels: + app: guestbook + tier: frontend +spec: + # if your cluster supports it, uncomment the following to automatically create + # an external load-balanced IP for the frontend service. + # type: LoadBalancer + ports: + - port: 80 + selector: + app: guestbook + tier: frontend diff --git a/staging/src/k8s.io/kubectl/test/data/redis-master-controller.yaml b/staging/src/k8s.io/kubectl/test/data/redis-master-controller.yaml new file mode 100644 index 00000000000..60a1a6fabaa --- /dev/null +++ b/staging/src/k8s.io/kubectl/test/data/redis-master-controller.yaml @@ -0,0 +1,26 @@ +apiVersion: v1 +kind: ReplicationController +metadata: + name: redis-master + labels: + app: redis + role: master + tier: backend +spec: + replicas: 1 + template: + metadata: + labels: + app: redis + role: master + tier: backend + spec: + containers: + - name: master + image: docker.io/library/redis:5.0.5-alpine + resources: + requests: + cpu: 100m + memory: 100Mi + ports: + - containerPort: 6379 diff --git a/staging/src/k8s.io/kubectl/test/data/redis-master-service.yaml b/staging/src/k8s.io/kubectl/test/data/redis-master-service.yaml new file mode 100644 index 00000000000..a484014f1fe --- /dev/null +++ b/staging/src/k8s.io/kubectl/test/data/redis-master-service.yaml @@ -0,0 +1,16 @@ +apiVersion: v1 +kind: Service +metadata: + name: redis-master + labels: + app: redis + role: master + tier: backend +spec: + ports: + - port: 6379 + targetPort: 6379 + selector: + app: redis + role: master + tier: backend diff --git a/staging/src/k8s.io/kubectl/test/data/replace/legacy/frontend-controller.yaml b/staging/src/k8s.io/kubectl/test/data/replace/legacy/frontend-controller.yaml new file mode 100644 index 00000000000..f2f7f1d24dc --- /dev/null +++ b/staging/src/k8s.io/kubectl/test/data/replace/legacy/frontend-controller.yaml @@ -0,0 +1,29 @@ +apiVersion: v1 +kind: ReplicationController +metadata: + name: frontend +spec: + replicas: 3 + template: + metadata: + labels: + app: guestbook + tier: frontend + spec: + containers: + - name: php-redis + image: gcr.io/google_samples/gb-frontend:v4 + resources: + requests: + cpu: 100m + memory: 100Mi + env: + - name: GET_HOSTS_FROM + value: dns + # If your cluster config does not include a dns service, then to + # instead access environment variables to find service host + # info, comment out the 'value: dns' line above, and uncomment the + # line below: + # value: env + ports: + - containerPort: 80 diff --git a/staging/src/k8s.io/kubectl/test/data/replace/legacy/redis-master-controller.yaml b/staging/src/k8s.io/kubectl/test/data/replace/legacy/redis-master-controller.yaml new file mode 100644 index 00000000000..60a1a6fabaa --- /dev/null +++ b/staging/src/k8s.io/kubectl/test/data/replace/legacy/redis-master-controller.yaml @@ -0,0 +1,26 @@ +apiVersion: v1 +kind: ReplicationController +metadata: + name: redis-master + labels: + app: redis + role: master + tier: backend +spec: + replicas: 1 + template: + metadata: + labels: + app: redis + role: master + tier: backend + spec: + containers: + - name: master + image: docker.io/library/redis:5.0.5-alpine + resources: + requests: + cpu: 100m + memory: 100Mi + ports: + - containerPort: 6379 diff --git a/staging/src/k8s.io/kubectl/test/data/replace/legacy/redis-slave-controller.yaml b/staging/src/k8s.io/kubectl/test/data/replace/legacy/redis-slave-controller.yaml new file mode 100644 index 00000000000..3376794b345 --- /dev/null +++ b/staging/src/k8s.io/kubectl/test/data/replace/legacy/redis-slave-controller.yaml @@ -0,0 +1,37 @@ +apiVersion: v1 +kind: ReplicationController +metadata: + name: redis-slave + labels: + app: redis + role: slave + tier: backend +spec: + replicas: 2 + template: + metadata: + labels: + app: redis + role: slave + tier: backend + spec: + containers: + - name: slave + image: docker.io/library/redis:5.0.5-alpine + # We are only implementing the dns option of: + # https://github.com/kubernetes/examples/blob/97c7ed0eb6555a4b667d2877f965d392e00abc45/guestbook/redis-slave/run.sh + command: [ "redis-server", "--slaveof", "redis-master", "6379" ] + resources: + requests: + cpu: 100m + memory: 100Mi + env: + - name: GET_HOSTS_FROM + value: dns + # If your cluster config does not include a dns service, then to + # instead access an environment variable to find the master + # service's host, comment out the 'value: dns' line above, and + # uncomment the line below: + # value: env + ports: + - containerPort: 6379 diff --git a/staging/src/k8s.io/kubectl/test/data/set/daemon.yaml b/staging/src/k8s.io/kubectl/test/data/set/daemon.yaml new file mode 100644 index 00000000000..46ceb752abd --- /dev/null +++ b/staging/src/k8s.io/kubectl/test/data/set/daemon.yaml @@ -0,0 +1,21 @@ +apiVersion: apps/v1 +kind: DaemonSet +metadata: + name: prometheus-node-exporter +spec: + selector: + matchLabels: + daemon: prom-node-exp + template: + metadata: + name: prometheus-node-exporter + labels: + daemon: prom-node-exp + spec: + containers: + - name: c + image: prom/prometheus + ports: + - containerPort: 9090 + hostPort: 9090 + name: serverport diff --git a/staging/src/k8s.io/kubectl/test/data/set/deployment.yaml b/staging/src/k8s.io/kubectl/test/data/set/deployment.yaml new file mode 100644 index 00000000000..a7b66993d15 --- /dev/null +++ b/staging/src/k8s.io/kubectl/test/data/set/deployment.yaml @@ -0,0 +1,21 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: nginx-deployment + labels: + name: nginx-deployment +spec: + replicas: 3 + selector: + matchLabels: + name: nginx + template: + metadata: + labels: + name: nginx + spec: + containers: + - name: nginx + image: nginx + ports: + - containerPort: 80 diff --git a/staging/src/k8s.io/kubectl/test/data/set/job.yaml b/staging/src/k8s.io/kubectl/test/data/set/job.yaml new file mode 100644 index 00000000000..ece4512a8ac --- /dev/null +++ b/staging/src/k8s.io/kubectl/test/data/set/job.yaml @@ -0,0 +1,15 @@ +apiVersion: batch/v1 +kind: Job +metadata: + name: pi +spec: + template: + metadata: + name: pi + spec: + containers: + - name: pi + image: perl + command: ["perl", "-Mbignum=bpi", "-wle", "print bpi(2000)"] + restartPolicy: Never + diff --git a/staging/src/k8s.io/kubectl/test/data/set/multi-resource-yaml.yaml b/staging/src/k8s.io/kubectl/test/data/set/multi-resource-yaml.yaml new file mode 100644 index 00000000000..6a2eed872a9 --- /dev/null +++ b/staging/src/k8s.io/kubectl/test/data/set/multi-resource-yaml.yaml @@ -0,0 +1,33 @@ +apiVersion: v1 +kind: ReplicationController +metadata: + name: first-rc +spec: + replicas: 1 + selector: + app: mock + template: + metadata: + labels: + app: mock + spec: + containers: + - name: mock-container + image: k8s.gcr.io/pause:3.1 +--- +apiVersion: v1 +kind: ReplicationController +metadata: + name: second-rc +spec: + replicas: 1 + selector: + app: mock + template: + metadata: + labels: + app: mock + spec: + containers: + - name: mock-container + image: k8s.gcr.io/pause:3.1 diff --git a/staging/src/k8s.io/kubectl/test/data/set/namespaced-resource.yaml b/staging/src/k8s.io/kubectl/test/data/set/namespaced-resource.yaml new file mode 100644 index 00000000000..71d9b24bae1 --- /dev/null +++ b/staging/src/k8s.io/kubectl/test/data/set/namespaced-resource.yaml @@ -0,0 +1,17 @@ +apiVersion: v1 +kind: ReplicationController +metadata: + name: namespaced-rc + namespace: existing-ns +spec: + replicas: 1 + selector: + app: mock + template: + metadata: + labels: + app: mock + spec: + containers: + - name: mock-container + image: k8s.gcr.io/pause:3.1 diff --git a/staging/src/k8s.io/kubectl/test/data/set/redis-slave.yaml b/staging/src/k8s.io/kubectl/test/data/set/redis-slave.yaml new file mode 100644 index 00000000000..d237c4d4290 --- /dev/null +++ b/staging/src/k8s.io/kubectl/test/data/set/redis-slave.yaml @@ -0,0 +1,44 @@ +apiVersion: apps/v1 +kind: ReplicaSet +metadata: + name: redis-slave + labels: + app: redis + role: slave + tier: backend +spec: + # this replicas value is default + # modify it according to your case + replicas: 2 + selector: + matchLabels: + app: redis + role: slave + tier: backend + template: + metadata: + labels: + app: redis + role: slave + tier: backend + spec: + containers: + - name: slave + image: docker.io/library/redis:5.0.5-alpine + # We are only implementing the dns option of: + # https://github.com/kubernetes/examples/blob/97c7ed0eb6555a4b667d2877f965d392e00abc45/guestbook/redis-slave/run.sh + command: [ "redis-server", "--slaveof", "redis-master", "6379" ] + resources: + requests: + cpu: 100m + memory: 100Mi + env: + - name: GET_HOSTS_FROM + value: dns + # If your cluster config does not include a dns service, then to + # instead access an environment variable to find the master + # service's host, comment out the 'value: dns' line above, and + # uncomment the line below. + # value: env + ports: + - containerPort: 6379 diff --git a/staging/src/k8s.io/kubectl/test/data/set/replication.yaml b/staging/src/k8s.io/kubectl/test/data/set/replication.yaml new file mode 100644 index 00000000000..6eff0b9b576 --- /dev/null +++ b/staging/src/k8s.io/kubectl/test/data/set/replication.yaml @@ -0,0 +1,19 @@ +apiVersion: v1 +kind: ReplicationController +metadata: + name: nginx +spec: + replicas: 3 + selector: + app: nginx + template: + metadata: + name: nginx + labels: + app: nginx + spec: + containers: + - name: nginx + image: nginx + ports: + - containerPort: 80