From a3f4e6e933d3292b3921cdc7b60d7ae019ca1580 Mon Sep 17 00:00:00 2001 From: Antoine Pelisse Date: Mon, 26 Aug 2019 09:09:40 -0700 Subject: [PATCH] Rename --experimental-* flags to --* for server-side apply --- staging/src/k8s.io/kubectl/pkg/cmd/apply/apply.go | 4 ++-- staging/src/k8s.io/kubectl/pkg/cmd/diff/diff.go | 2 +- staging/src/k8s.io/kubectl/pkg/cmd/util/helpers.go | 14 +++++++------- test/cmd/apply.sh | 12 ++++++------ 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/apply/apply.go b/staging/src/k8s.io/kubectl/pkg/cmd/apply/apply.go index 9f7a994b3c1..915f055ea43 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/apply/apply.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/apply/apply.go @@ -204,11 +204,11 @@ func (o *ApplyOptions) Complete(f cmdutil.Factory, cmd *cobra.Command) error { o.DryRun = cmdutil.GetDryRunFlag(cmd) if o.ForceConflicts && !o.ServerSideApply { - return fmt.Errorf("--experimental-force-conflicts only works with --experimental-server-side") + return fmt.Errorf("--force-conflicts only works with --server-side") } if o.DryRun && o.ServerSideApply { - return fmt.Errorf("--dry-run doesn't work with --experimental-server-side (did you mean --server-dry-run instead?)") + return fmt.Errorf("--dry-run doesn't work with --server-side (did you mean --server-dry-run instead?)") } if o.DryRun && o.ServerDryRun { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/diff/diff.go b/staging/src/k8s.io/kubectl/pkg/cmd/diff/diff.go index e64df1ddb62..f8f114a078b 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/diff/diff.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/diff/diff.go @@ -402,7 +402,7 @@ func (o *DiffOptions) Complete(f cmdutil.Factory, cmd *cobra.Command) error { o.ServerSideApply = cmdutil.GetServerSideApplyFlag(cmd) o.ForceConflicts = cmdutil.GetForceConflictsFlag(cmd) if o.ForceConflicts && !o.ServerSideApply { - return fmt.Errorf("--experimental-force-conflicts only works with --experimental-server-side") + return fmt.Errorf("--force-conflicts only works with --server-side") } if !o.ServerSideApply { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/util/helpers.go b/staging/src/k8s.io/kubectl/pkg/cmd/util/helpers.go index 9d27003e43f..0659eabf30d 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/util/helpers.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/util/helpers.go @@ -26,7 +26,7 @@ import ( "strings" "time" - "github.com/evanphx/json-patch" + jsonpatch "github.com/evanphx/json-patch" "github.com/spf13/cobra" "github.com/spf13/pflag" kerrors "k8s.io/apimachinery/pkg/api/errors" @@ -409,9 +409,9 @@ func AddDryRunFlag(cmd *cobra.Command) { } func AddServerSideApplyFlags(cmd *cobra.Command) { - cmd.Flags().Bool("experimental-server-side", false, "If true, apply runs in the server instead of the client. This is an alpha feature and flag.") - cmd.Flags().Bool("experimental-force-conflicts", false, "If true, server-side apply will force the changes against conflicts. This is an alpha feature and flag.") - cmd.Flags().String("experimental-field-manager", "kubectl", "Name of the manager used to track field ownership. This is an alpha feature and flag.") + cmd.Flags().Bool("server-side", false, "If true, apply runs in the server instead of the client.") + cmd.Flags().Bool("force-conflicts", false, "If true, server-side apply will force the changes against conflicts.") + cmd.Flags().String("field-manager", "kubectl", "Name of the manager used to track field ownership.") } func AddIncludeUninitializedFlag(cmd *cobra.Command) { @@ -488,15 +488,15 @@ func DumpReaderToFile(reader io.Reader, filename string) error { } func GetServerSideApplyFlag(cmd *cobra.Command) bool { - return GetFlagBool(cmd, "experimental-server-side") + return GetFlagBool(cmd, "server-side") } func GetForceConflictsFlag(cmd *cobra.Command) bool { - return GetFlagBool(cmd, "experimental-force-conflicts") + return GetFlagBool(cmd, "force-conflicts") } func GetFieldManagerFlag(cmd *cobra.Command) string { - return GetFlagString(cmd, "experimental-field-manager") + return GetFlagString(cmd, "field-manager") } func GetDryRunFlag(cmd *cobra.Command) bool { diff --git a/test/cmd/apply.sh b/test/cmd/apply.sh index 8b6acec44a1..99c3a9f048e 100755 --- a/test/cmd/apply.sh +++ b/test/cmd/apply.sh @@ -249,12 +249,12 @@ run_kubectl_apply_tests() { set -o errexit create_and_use_new_namespace - kube::log::status "Testing kubectl apply --experimental-server-side" + kube::log::status "Testing kubectl apply --server-side" ## kubectl apply should create the resource that doesn't exist yet # Pre-Condition: no POD exists kube::test::get_object_assert pods "{{range.items}}{{${id_field:?}}}:{{end}}" '' # Command: apply a pod "test-pod" (doesn't exist) should create this pod - kubectl apply --experimental-server-side -f hack/testdata/pod.yaml "${kube_flags[@]:?}" + kubectl apply --server-side -f hack/testdata/pod.yaml "${kube_flags[@]:?}" # Post-Condition: pod "test-pod" is created kube::test::get_object_assert 'pods test-pod' "{{${labels_field:?}.name}}" 'test-pod-label' # Clean up @@ -265,13 +265,13 @@ run_kubectl_apply_tests() { kube::test::get_object_assert pods "{{range.items}}{{${id_field:?}}}:{{end}}" '' # apply dry-run - kubectl apply --experimental-server-side --server-dry-run -f hack/testdata/pod.yaml "${kube_flags[@]:?}" + kubectl apply --server-side --server-dry-run -f hack/testdata/pod.yaml "${kube_flags[@]:?}" # No pod exists kube::test::get_object_assert pods "{{range.items}}{{${id_field:?}}}:{{end}}" '' # apply non dry-run creates the pod - kubectl apply --experimental-server-side -f hack/testdata/pod.yaml "${kube_flags[@]:?}" + kubectl apply --server-side -f hack/testdata/pod.yaml "${kube_flags[@]:?}" # apply changes - kubectl apply --experimental-server-side --server-dry-run -f hack/testdata/pod-apply.yaml "${kube_flags[@]:?}" + kubectl apply --server-side --server-dry-run -f hack/testdata/pod-apply.yaml "${kube_flags[@]:?}" # Post-Condition: label still has initial value kube::test::get_object_assert 'pods test-pod' "{{${labels_field:?}.name}}" 'test-pod-label' @@ -302,7 +302,7 @@ run_kubectl_apply_tests() { __EOF__ # Dry-run create the CR - kubectl "${kube_flags[@]:?}" apply --experimental-server-side --server-dry-run -f hack/testdata/CRD/resource.yaml "${kube_flags[@]:?}" + kubectl "${kube_flags[@]:?}" apply --server-side --server-dry-run -f hack/testdata/CRD/resource.yaml "${kube_flags[@]:?}" # Make sure that the CR doesn't exist ! kubectl "${kube_flags[@]:?}" get resource/myobj