kubernetes
/
kubectl
mirror of https://github.com/kubernetes/kubectl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #109033 from reylejano/patch-kubectl-ref-docs 

Updates for kubectl generated ref docs for dockershim removal

Kubernetes-commit: 83c98542aa4b09198ec3c399666b5798f314cbd2
This commit is contained in:
Kubernetes Publisher 2022-03-26 11:45:56 -07:00
parent 4da03973dd b062628db1
commit da50ec2b22
6 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
go.mod
View File

@ -31,10 +31,10 @@ require (
github.com/stretchr/testify v1.7.0 github.com/stretchr/testify v1.7.0
golang.org/x/sys v0.0.0-20220209214540-3681064d5158 golang.org/x/sys v0.0.0-20220209214540-3681064d5158
gopkg.in/yaml.v2 v2.4.0 gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.0.0-20220324210930-df53a95c65aa k8s.io/api v0.0.0-20220326170940-92515b8d1830
k8s.io/apimachinery v0.0.0-20220326050748-1a826352d1a6 k8s.io/apimachinery v0.0.0-20220326050748-1a826352d1a6
k8s.io/cli-runtime v0.0.0-20220326093049-63fe85d9feb1 k8s.io/cli-runtime v0.0.0-20220326172734-30abe835e71c
k8s.io/client-go v0.0.0-20220326091246-e0aaa37e5ac1 k8s.io/client-go v0.0.0-20220326211252-1933a66cdc6f
k8s.io/component-base v0.0.0-20220326051422-b680b3f2362c k8s.io/component-base v0.0.0-20220326051422-b680b3f2362c
k8s.io/component-helpers v0.0.0-20220324211837-3d0aa6c934c2 k8s.io/component-helpers v0.0.0-20220324211837-3d0aa6c934c2
k8s.io/klog/v2 v2.60.1 k8s.io/klog/v2 v2.60.1
@ -48,10 +48,10 @@ require (
) )
replace ( replace (
k8s.io/api => k8s.io/api v0.0.0-20220324210930-df53a95c65aa k8s.io/api => k8s.io/api v0.0.0-20220326170940-92515b8d1830
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220326050748-1a826352d1a6 k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220326050748-1a826352d1a6
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20220326093049-63fe85d9feb1 k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20220326172734-30abe835e71c
k8s.io/client-go => k8s.io/client-go v0.0.0-20220326091246-e0aaa37e5ac1 k8s.io/client-go => k8s.io/client-go v0.0.0-20220326211252-1933a66cdc6f
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20220324210542-671bd3e7b101 k8s.io/code-generator => k8s.io/code-generator v0.0.0-20220324210542-671bd3e7b101
k8s.io/component-base => k8s.io/component-base v0.0.0-20220326051422-b680b3f2362c k8s.io/component-base => k8s.io/component-base v0.0.0-20220326051422-b680b3f2362c
k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20220324211837-3d0aa6c934c2 k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20220324211837-3d0aa6c934c2

12
go.sum
View File

@ -848,14 +848,14 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
k8s.io/api v0.0.0-20220324210930-df53a95c65aa h1:NzCktMsy22Y/ddoBN/kf96kFaklITIHNfA1sRv6UofA= k8s.io/api v0.0.0-20220326170940-92515b8d1830 h1:dFdm8jHFBWGBHT25TqqHU5Cq+k6ye+YjfgtfgSj+IHU=
k8s.io/api v0.0.0-20220324210930-df53a95c65aa/go.mod h1:Ea6ReZGsqdWOZc66t7sHO58lTcUGyQcMJ3UfsqOnKfM= k8s.io/api v0.0.0-20220326170940-92515b8d1830/go.mod h1:nSB8/pJVqLZwB6bz7abk+bjQClYsL9Dmpn/WHuG819o=
k8s.io/apimachinery v0.0.0-20220326050748-1a826352d1a6 h1:6HO0jOM6IZFgU8JjScwE6mpiM6GADuTmpHOsFXYlGXc= k8s.io/apimachinery v0.0.0-20220326050748-1a826352d1a6 h1:6HO0jOM6IZFgU8JjScwE6mpiM6GADuTmpHOsFXYlGXc=
k8s.io/apimachinery v0.0.0-20220326050748-1a826352d1a6/go.mod h1:V4ECjDypP1xQpnL3N9yFzlbGZgd8tLKouJnRyAn/Zyw= k8s.io/apimachinery v0.0.0-20220326050748-1a826352d1a6/go.mod h1:V4ECjDypP1xQpnL3N9yFzlbGZgd8tLKouJnRyAn/Zyw=
k8s.io/cli-runtime v0.0.0-20220326093049-63fe85d9feb1 h1:Gorob4iRDfuV7vB932SLZeneeInnGXIDBKhNQO3yfI8= k8s.io/cli-runtime v0.0.0-20220326172734-30abe835e71c h1:LECOqpPdbv5XhTheOgafpHLJkicFJ+Kdve7foMm90MQ=
k8s.io/cli-runtime v0.0.0-20220326093049-63fe85d9feb1/go.mod h1:et77u6Ca8UQB575cSjttMCTDRokFq1Mm8IMTHWSRjHE= k8s.io/cli-runtime v0.0.0-20220326172734-30abe835e71c/go.mod h1:et77u6Ca8UQB575cSjttMCTDRokFq1Mm8IMTHWSRjHE=
k8s.io/client-go v0.0.0-20220326091246-e0aaa37e5ac1 h1:IFyvPfAIncDtQaXeiuldKRYRQDQ/xJOWyTQXynk8RPg= k8s.io/client-go v0.0.0-20220326211252-1933a66cdc6f h1:mq86asbjBB4cowyxjesP5Pwq8qPgpOai14gnwRsFol8=
k8s.io/client-go v0.0.0-20220326091246-e0aaa37e5ac1/go.mod h1:NgxzLd0Y6sHTGdJspbzYj+sGeSOWTgyy7VDKEw/sPBs= k8s.io/client-go v0.0.0-20220326211252-1933a66cdc6f/go.mod h1:yO01UVS8uGtgwCJ3u0ZzhqTnihNt8/nMc+tBhVI4cpU=
k8s.io/code-generator v0.0.0-20220324210542-671bd3e7b101/go.mod h1:PF9AME2o5S390iHxUI2/febDrY7GRb+AECnBzIWxIO0= k8s.io/code-generator v0.0.0-20220324210542-671bd3e7b101/go.mod h1:PF9AME2o5S390iHxUI2/febDrY7GRb+AECnBzIWxIO0=
k8s.io/component-base v0.0.0-20220326051422-b680b3f2362c h1:AmH3eIaVUK6hBg+Flf2USKyp6fnsuhIMEhA/Xx5GQwo= k8s.io/component-base v0.0.0-20220326051422-b680b3f2362c h1:AmH3eIaVUK6hBg+Flf2USKyp6fnsuhIMEhA/Xx5GQwo=
k8s.io/component-base v0.0.0-20220326051422-b680b3f2362c/go.mod h1:woA9HhtUZnmlsjJjnGRS0M27RhWVedDuMan33JaKeWE= k8s.io/component-base v0.0.0-20220326051422-b680b3f2362c/go.mod h1:woA9HhtUZnmlsjJjnGRS0M27RhWVedDuMan33JaKeWE=

4
pkg/cmd/create/create.go
View File

@ -83,8 +83,8 @@ var (
# Create a pod based on the JSON passed into stdin # Create a pod based on the JSON passed into stdin
cat pod.json | kubectl create -f - cat pod.json | kubectl create -f -
# Edit the data in docker-registry.yaml in JSON then create the resource using the edited data # Edit the data in registry.yaml in JSON then create the resource using the edited data
kubectl create -f docker-registry.yaml --edit -o json`)) kubectl create -f registry.yaml --edit -o json`))
) )
// NewCreateOptions returns an initialized CreateOptions instance // NewCreateOptions returns an initialized CreateOptions instance

2
pkg/cmd/create/create_configmap.go
View File

@ -137,7 +137,7 @@ func NewCmdCreateConfigMap(f cmdutil.Factory, ioStreams genericclioptions.IOStre
cmd.Flags().StringSliceVar(&o.FileSources, "from-file", o.FileSources, "Key file can be specified using its file path, in which case file basename will be used as configmap key, or optionally with a key and file path, in which case the given key will be used. Specifying a directory will iterate each named file in the directory whose basename is a valid configmap key.") cmd.Flags().StringSliceVar(&o.FileSources, "from-file", o.FileSources, "Key file can be specified using its file path, in which case file basename will be used as configmap key, or optionally with a key and file path, in which case the given key will be used. Specifying a directory will iterate each named file in the directory whose basename is a valid configmap key.")
cmd.Flags().StringArrayVar(&o.LiteralSources, "from-literal", o.LiteralSources, "Specify a key and literal value to insert in configmap (i.e. mykey=somevalue)") cmd.Flags().StringArrayVar(&o.LiteralSources, "from-literal", o.LiteralSources, "Specify a key and literal value to insert in configmap (i.e. mykey=somevalue)")
cmd.Flags().StringSliceVar(&o.EnvFileSources, "from-env-file", o.EnvFileSources, "Specify the path to a file to read lines of key=val pairs to create a configmap (i.e. a Docker .env file).") cmd.Flags().StringSliceVar(&o.EnvFileSources, "from-env-file", o.EnvFileSources, "Specify the path to a file to read lines of key=val pairs to create a configmap.")
cmd.Flags().BoolVar(&o.AppendHash, "append-hash", o.AppendHash, "Append a hash of the configmap to its name.") cmd.Flags().BoolVar(&o.AppendHash, "append-hash", o.AppendHash, "Append a hash of the configmap to its name.")
cmdutil.AddFieldManagerFlagVar(cmd, &o.FieldManager, "kubectl-create") cmdutil.AddFieldManagerFlagVar(cmd, &o.FieldManager, "kubectl-create")

2
pkg/cmd/create/create_secret.go
View File

@ -152,7 +152,7 @@ func NewCmdCreateSecretGeneric(f cmdutil.Factory, ioStreams genericclioptions.IO
cmd.Flags().StringSliceVar(&o.FileSources, "from-file", o.FileSources, "Key files can be specified using their file path, in which case a default name will be given to them, or optionally with a name and file path, in which case the given name will be used. Specifying a directory will iterate each named file in the directory that is a valid secret key.") cmd.Flags().StringSliceVar(&o.FileSources, "from-file", o.FileSources, "Key files can be specified using their file path, in which case a default name will be given to them, or optionally with a name and file path, in which case the given name will be used. Specifying a directory will iterate each named file in the directory that is a valid secret key.")
cmd.Flags().StringArrayVar(&o.LiteralSources, "from-literal", o.LiteralSources, "Specify a key and literal value to insert in secret (i.e. mykey=somevalue)") cmd.Flags().StringArrayVar(&o.LiteralSources, "from-literal", o.LiteralSources, "Specify a key and literal value to insert in secret (i.e. mykey=somevalue)")
cmd.Flags().StringSliceVar(&o.EnvFileSources, "from-env-file", o.EnvFileSources, "Specify the path to a file to read lines of key=val pairs to create a secret (i.e. a Docker .env file).") cmd.Flags().StringSliceVar(&o.EnvFileSources, "from-env-file", o.EnvFileSources, "Specify the path to a file to read lines of key=val pairs to create a secret.")
cmd.Flags().StringVar(&o.Type, "type", o.Type, i18n.T("The type of secret to create")) cmd.Flags().StringVar(&o.Type, "type", o.Type, i18n.T("The type of secret to create"))
cmd.Flags().BoolVar(&o.AppendHash, "append-hash", o.AppendHash, "Append a hash of the secret to its name.") cmd.Flags().BoolVar(&o.AppendHash, "append-hash", o.AppendHash, "Append a hash of the secret to its name.")

6
pkg/cmd/edit/edit.go
View File

@ -53,11 +53,11 @@ var (
saved copy to include the latest resource version.`)) saved copy to include the latest resource version.`))
editExample = templates.Examples(i18n.T(` editExample = templates.Examples(i18n.T(`
# Edit the service named 'docker-registry' # Edit the service named 'registry'
kubectl edit svc/docker-registry kubectl edit svc/registry
# Use an alternative editor # Use an alternative editor
KUBE_EDITOR="nano" kubectl edit svc/docker-registry KUBE_EDITOR="nano" kubectl edit svc/registry
# Edit the job 'myjob' in JSON using the v1 API format # Edit the job 'myjob' in JSON using the v1 API format
kubectl edit job.v1.batch/myjob -o json kubectl edit job.v1.batch/myjob -o json