Skip to content

Commit 8168458

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#80558 from seans3/move-apply-util
Move pkg/kubectl/apply.go to staging
2 parents 16a820b + 309de42 commit 8168458

File tree

21 files changed

+39
-36
lines changed

21 files changed

+39
-36
lines changed

‎pkg/kubectl/BUILD‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ go_test(
4646
go_library(
4747
name = "go_default_library",
4848
srcs = [
49-
"apply.go",
5049
"conditions.go",
5150
"doc.go",
5251
"history.go",

‎pkg/kubectl/cmd/apply/BUILD‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ go_library(
1111
importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/apply",
1212
visibility = ["//visibility:public"],
1313
deps = [
14-
"//pkg/kubectl:go_default_library",
1514
"//pkg/kubectl/cmd/delete:go_default_library",
1615
"//pkg/kubectl/cmd/util:go_default_library",
1716
"//pkg/kubectl/cmd/util/editor:go_default_library",
@@ -36,6 +35,7 @@ go_library(
3635
"//staging/src/k8s.io/client-go/discovery:go_default_library",
3736
"//staging/src/k8s.io/client-go/dynamic:go_default_library",
3837
"//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library",
38+
"//staging/src/k8s.io/kubectl/pkg/util:go_default_library",
3939
"//staging/src/k8s.io/kubectl/pkg/util/templates:go_default_library",
4040
"//staging/src/k8s.io/kubectl/pkg/validation:go_default_library",
4141
"//vendor/github.com/jonboulle/clockwork:go_default_library",

‎pkg/kubectl/cmd/apply/apply.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ import (
4747
"k8s.io/klog"
4848
oapi "k8s.io/kube-openapi/pkg/util/proto"
4949
"k8s.io/kubectl/pkg/scheme"
50+
"k8s.io/kubectl/pkg/util"
5051
"k8s.io/kubectl/pkg/util/templates"
5152
"k8s.io/kubectl/pkg/validation"
52-
"k8s.io/kubernetes/pkg/kubectl"
5353
"k8s.io/kubernetes/pkg/kubectl/cmd/delete"
5454
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
5555
"k8s.io/kubernetes/pkg/kubectl/cmd/util/openapi"
@@ -446,7 +446,7 @@ func (o *ApplyOptions) Run() error {
446446
// Get the modified configuration of the object. Embed the result
447447
// as an annotation in the modified configuration, so that it will appear
448448
// in the patch sent to the server.
449-
modified, err := kubectl.GetModifiedConfiguration(info.Object, true, unstructured.UnstructuredJSONScheme)
449+
modified, err := util.GetModifiedConfiguration(info.Object, true, unstructured.UnstructuredJSONScheme)
450450
if err != nil {
451451
return cmdutil.AddSourceToErr(fmt.Sprintf("retrieving modified configuration from:\n%s\nfor:", info.String()), info.Source, err)
452452
}
@@ -461,7 +461,7 @@ func (o *ApplyOptions) Run() error {
461461

462462
// Create the resource if it doesn't exist
463463
// First, update the annotation used by kubectl apply
464-
if err := kubectl.CreateApplyAnnotation(info.Object, unstructured.UnstructuredJSONScheme); err != nil {
464+
if err := util.CreateApplyAnnotation(info.Object, unstructured.UnstructuredJSONScheme); err != nil {
465465
return cmdutil.AddSourceToErr("creating", info.Source, err)
466466
}
467467

@@ -858,7 +858,7 @@ func (p *Patcher) patchSimple(obj runtime.Object, modified []byte, source, names
858858
}
859859

860860
// Retrieve the original configuration of the object from the annotation.
861-
original, err := kubectl.GetOriginalConfiguration(obj)
861+
original, err := util.GetOriginalConfiguration(obj)
862862
if err != nil {
863863
return nil, nil, cmdutil.AddSourceToErr(fmt.Sprintf("retrieving original configuration from:\n%v\nfor:", obj), source, err)
864864
}

‎pkg/kubectl/cmd/apply/apply_set_last_applied.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ import (
3030
"k8s.io/cli-runtime/pkg/printers"
3131
"k8s.io/cli-runtime/pkg/resource"
3232
"k8s.io/kubectl/pkg/scheme"
33+
"k8s.io/kubectl/pkg/util"
3334
"k8s.io/kubectl/pkg/util/templates"
34-
"k8s.io/kubernetes/pkg/kubectl"
3535
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
3636
"k8s.io/kubernetes/pkg/kubectl/cmd/util/editor"
3737
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
@@ -171,7 +171,7 @@ func (o *SetLastAppliedOptions) Validate() error {
171171
}
172172
return cmdutil.AddSourceToErr(fmt.Sprintf("retrieving current configuration of:\n%s\nfrom server for:", info.String()), info.Source, err)
173173
}
174-
originalBuf, err := kubectl.GetOriginalConfiguration(info.Object)
174+
originalBuf, err := util.GetOriginalConfiguration(info.Object)
175175
if err != nil {
176176
return cmdutil.AddSourceToErr(fmt.Sprintf("retrieving current configuration of:\n%s\nfrom server for:", info.String()), info.Source, err)
177177
}

‎pkg/kubectl/cmd/apply/apply_view_last_applied.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ import (
2424
"github.com/spf13/cobra"
2525
"k8s.io/cli-runtime/pkg/genericclioptions"
2626
"k8s.io/cli-runtime/pkg/resource"
27+
"k8s.io/kubectl/pkg/util"
2728
"k8s.io/kubectl/pkg/util/templates"
28-
"k8s.io/kubernetes/pkg/kubectl"
2929
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
3030
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
3131
"sigs.k8s.io/yaml"
@@ -120,7 +120,7 @@ func (o *ViewLastAppliedOptions) Complete(cmd *cobra.Command, f cmdutil.Factory,
120120
return err
121121
}
122122

123-
configString, err := kubectl.GetOriginalConfiguration(info.Object)
123+
configString, err := util.GetOriginalConfiguration(info.Object)
124124
if err != nil {
125125
return err
126126
}

‎pkg/kubectl/cmd/autoscale/BUILD‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ go_library(
66
importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/autoscale",
77
visibility = ["//visibility:public"],
88
deps = [
9-
"//pkg/kubectl:go_default_library",
109
"//pkg/kubectl/cmd/util:go_default_library",
1110
"//pkg/kubectl/generate:go_default_library",
1211
"//pkg/kubectl/generate/versioned:go_default_library",
@@ -19,6 +18,7 @@ go_library(
1918
"//staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v1:go_default_library",
2019
"//staging/src/k8s.io/client-go/scale:go_default_library",
2120
"//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library",
21+
"//staging/src/k8s.io/kubectl/pkg/util:go_default_library",
2222
"//staging/src/k8s.io/kubectl/pkg/util/templates:go_default_library",
2323
"//vendor/github.com/spf13/cobra:go_default_library",
2424
"//vendor/k8s.io/klog:go_default_library",

‎pkg/kubectl/cmd/autoscale/autoscale.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ import (
3030
autoscalingv1client "k8s.io/client-go/kubernetes/typed/autoscaling/v1"
3131
"k8s.io/client-go/scale"
3232
"k8s.io/kubectl/pkg/scheme"
33+
"k8s.io/kubectl/pkg/util"
3334
"k8s.io/kubectl/pkg/util/templates"
34-
"k8s.io/kubernetes/pkg/kubectl"
3535
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
3636
"k8s.io/kubernetes/pkg/kubectl/generate"
3737
generateversioned "k8s.io/kubernetes/pkg/kubectl/generate/versioned"
@@ -258,7 +258,7 @@ func (o *AutoscaleOptions) Run() error {
258258
return printer.PrintObj(hpa, o.Out)
259259
}
260260

261-
if err := kubectl.CreateOrUpdateAnnotation(o.createAnnotation, hpa, scheme.DefaultJSONEncoder()); err != nil {
261+
if err := util.CreateOrUpdateAnnotation(o.createAnnotation, hpa, scheme.DefaultJSONEncoder()); err != nil {
262262
return err
263263
}
264264

‎pkg/kubectl/cmd/create/BUILD‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ go_library(
2323
importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/create",
2424
visibility = ["//build/visible_to:pkg_kubectl_cmd_create_CONSUMERS"],
2525
deps = [
26-
"//pkg/kubectl:go_default_library",
2726
"//pkg/kubectl/cmd/util:go_default_library",
2827
"//pkg/kubectl/cmd/util/editor:go_default_library",
2928
"//pkg/kubectl/generate:go_default_library",
@@ -50,6 +49,7 @@ go_library(
5049
"//staging/src/k8s.io/component-base/cli/flag:go_default_library",
5150
"//staging/src/k8s.io/kubectl/pkg/rawhttp:go_default_library",
5251
"//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library",
52+
"//staging/src/k8s.io/kubectl/pkg/util:go_default_library",
5353
"//staging/src/k8s.io/kubectl/pkg/util/templates:go_default_library",
5454
"//vendor/github.com/spf13/cobra:go_default_library",
5555
"//vendor/k8s.io/klog:go_default_library",

‎pkg/kubectl/cmd/create/create.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ import (
3737
"k8s.io/client-go/dynamic"
3838
"k8s.io/kubectl/pkg/rawhttp"
3939
"k8s.io/kubectl/pkg/scheme"
40+
"k8s.io/kubectl/pkg/util"
4041
"k8s.io/kubectl/pkg/util/templates"
41-
"k8s.io/kubernetes/pkg/kubectl"
4242
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
4343
"k8s.io/kubernetes/pkg/kubectl/cmd/util/editor"
4444
"k8s.io/kubernetes/pkg/kubectl/generate"
@@ -252,7 +252,7 @@ func (o *CreateOptions) RunCreate(f cmdutil.Factory, cmd *cobra.Command) error {
252252
if err != nil {
253253
return err
254254
}
255-
if err := kubectl.CreateOrUpdateAnnotation(cmdutil.GetFlagBool(cmd, cmdutil.ApplyAnnotationsFlag), info.Object, scheme.DefaultJSONEncoder()); err != nil {
255+
if err := util.CreateOrUpdateAnnotation(cmdutil.GetFlagBool(cmd, cmdutil.ApplyAnnotationsFlag), info.Object, scheme.DefaultJSONEncoder()); err != nil {
256256
return cmdutil.AddSourceToErr("creating", info.Source, err)
257257
}
258258

@@ -411,7 +411,7 @@ func (o *CreateSubcommandOptions) Run() error {
411411
return err
412412
}
413413

414-
if err := kubectl.CreateOrUpdateAnnotation(o.CreateAnnotation, obj, scheme.DefaultJSONEncoder()); err != nil {
414+
if err := util.CreateOrUpdateAnnotation(o.CreateAnnotation, obj, scheme.DefaultJSONEncoder()); err != nil {
415415
return err
416416
}
417417

‎pkg/kubectl/cmd/diff/BUILD‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ go_library(
66
importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/diff",
77
visibility = ["//visibility:public"],
88
deps = [
9-
"//pkg/kubectl:go_default_library",
109
"//pkg/kubectl/cmd/apply:go_default_library",
1110
"//pkg/kubectl/cmd/util:go_default_library",
1211
"//pkg/kubectl/cmd/util/openapi:go_default_library",
@@ -22,6 +21,7 @@ go_library(
2221
"//staging/src/k8s.io/client-go/discovery:go_default_library",
2322
"//staging/src/k8s.io/client-go/dynamic:go_default_library",
2423
"//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library",
24+
"//staging/src/k8s.io/kubectl/pkg/util:go_default_library",
2525
"//staging/src/k8s.io/kubectl/pkg/util/templates:go_default_library",
2626
"//vendor/github.com/jonboulle/clockwork:go_default_library",
2727
"//vendor/github.com/spf13/cobra:go_default_library",

0 commit comments

Comments
 (0)