diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/explain/explain.go b/staging/src/k8s.io/kubectl/pkg/cmd/explain/explain.go index 7c4394b4d89..7965250bb20 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/explain/explain.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/explain/explain.go @@ -76,8 +76,7 @@ type ExplainOptions struct { Mapper meta.RESTMapper Schema openapi.Resources - // Name of the template to use with the openapiv3 template renderer. If - // `EnableOpenAPIV3` is disabled, this does nothing + // Name of the template to use with the openapiv3 template renderer. OutputFormat string // Client capable of fetching openapi documents from the user's cluster diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/explain/explain_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/explain/explain_test.go index 22dd7c97155..b63dbfd1daa 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/explain/explain_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/explain/explain_test.go @@ -185,9 +185,7 @@ func TestExplainOpenAPIV3(t *testing.T) { } cases = append(cases, explainV2Cases...) - cmdtesting.WithAlphaEnvs([]cmdutil.FeatureGate{cmdutil.ExplainOpenapiV3}, t, func(t *testing.T) { - runExplainTestCases(t, cases) - }) + runExplainTestCases(t, cases) } func runExplainTestCases(t *testing.T, cases []explainTestCase) { 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 096f3008d3a..43f72f54e3a 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/util/helpers.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/util/helpers.go @@ -426,7 +426,6 @@ type FeatureGate string const ( ApplySet FeatureGate = "KUBECTL_APPLYSET" - ExplainOpenapiV3 FeatureGate = "KUBECTL_EXPLAIN_OPENAPIV3" CmdPluginAsSubcommand FeatureGate = "KUBECTL_ENABLE_CMD_SHADOW" InteractiveDelete FeatureGate = "KUBECTL_INTERACTIVE_DELETE" )