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

Merge pull request #105817 from yylt/edit 

Fix edit command

Kubernetes-commit: bafa87c553b1ad2700eaa0b3808aa7c6b6ce1a90
This commit is contained in:
Kubernetes Publisher 2021-11-08 09:15:20 -08:00
parent 8165f83007 0198d9185e
commit dcaed3efc2
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
go.mod
View File

@ -33,8 +33,8 @@ require (
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.0.0-20211104203923-7979b39b3911
k8s.io/apimachinery v0.0.0-20211105203412-d7e096fd217f
k8s.io/cli-runtime v0.0.0-20211108165902-21ae53e572f9
k8s.io/client-go v0.0.0-20211105164225-9b0b23a8ade2
k8s.io/cli-runtime v0.0.0-20211108165905-e2852b1c304a
k8s.io/client-go v0.0.0-20211108163918-6d69eb8ad66c
k8s.io/component-base v0.0.0-20211104205040-9025b85fb213
k8s.io/component-helpers v0.0.0-20211104004528-10364a9c8a37
k8s.io/klog/v2 v2.30.0
@ -49,8 +49,8 @@ require (
replace (
k8s.io/api => k8s.io/api v0.0.0-20211104203923-7979b39b3911
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20211105203412-d7e096fd217f
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20211108165902-21ae53e572f9
k8s.io/client-go => k8s.io/client-go v0.0.0-20211105164225-9b0b23a8ade2
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20211108165905-e2852b1c304a
k8s.io/client-go => k8s.io/client-go v0.0.0-20211108163918-6d69eb8ad66c
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20211104003136-1003036828ea
k8s.io/component-base => k8s.io/component-base v0.0.0-20211104205040-9025b85fb213
k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20211104004528-10364a9c8a37

8
go.sum
View File

@ -906,10 +906,10 @@ k8s.io/api v0.0.0-20211104203923-7979b39b3911 h1:KKASx2y52X9MofhS6vOnUdLGgz+CH8/
k8s.io/api v0.0.0-20211104203923-7979b39b3911/go.mod h1:Y3aSuR3Z7RwvAGbnpQ1+oBIWgAIxvlHcaUCVUzOgpuo=
k8s.io/apimachinery v0.0.0-20211105203412-d7e096fd217f h1:GhfOaNapo86CszGIgYEv2kO136l13jxtg9Ollcge114=
k8s.io/apimachinery v0.0.0-20211105203412-d7e096fd217f/go.mod h1:NdmIf2dMPBkkSfPmCDRbThro3RAWWypv6x+CttBbMto=
k8s.io/cli-runtime v0.0.0-20211108165902-21ae53e572f9 h1:+9ZEMePg9x+Ans59DtAKNnkuitMLMXpkEzgWoUhmzjU=
k8s.io/cli-runtime v0.0.0-20211108165902-21ae53e572f9/go.mod h1:HGu9DUMeaRZcvx8Ovo5SpEtTfyulkwXomYGOFyT5+5k=
k8s.io/client-go v0.0.0-20211105164225-9b0b23a8ade2 h1:xSziulz0lPNAGwDShPbAl/GDC0WhcT0SXBSgupRuvwA=
k8s.io/client-go v0.0.0-20211105164225-9b0b23a8ade2/go.mod h1:g16LjnowDDsmCFt4UWsyD8NLjDvW3fPe9yrv0R1cGeE=
k8s.io/cli-runtime v0.0.0-20211108165905-e2852b1c304a h1:0fPd31iSEWBaSsLPXlaM8YoELl/uoo/LTxlaO/tk5lg=
k8s.io/cli-runtime v0.0.0-20211108165905-e2852b1c304a/go.mod h1:zGbRQnsWoPMohRlVcpwAwYR3uDIKg3XOzzCgsGcGxQQ=
k8s.io/client-go v0.0.0-20211108163918-6d69eb8ad66c h1:s5vCBULsOhcAM2PYOAkWd80073+znVOFarjt6tBBZZI=
k8s.io/client-go v0.0.0-20211108163918-6d69eb8ad66c/go.mod h1:02q+oqOEJnuqNoUa0/UqLsGM+YH6Wb845RmkUjcgtd0=
k8s.io/code-generator v0.0.0-20211104003136-1003036828ea/go.mod h1:wgD40ts/jbentZZcVvzzscrjJ2IoTSNJXfeVJxytQvU=
k8s.io/component-base v0.0.0-20211104205040-9025b85fb213 h1:lyyB2OygJtIIBbgpRR2dKm5aue0Aqax/LJDvXBst1bI=
k8s.io/component-base v0.0.0-20211104205040-9025b85fb213/go.mod h1:GiuGF3WbM9lKQ32U85f+z0vIRD1J3vAg3My8kBvmbOA=

4
pkg/cmd/util/helpers.go
View File

@ -725,7 +725,9 @@ func ManualStrip(file []byte) []byte {
stripped := []byte{}
lines := bytes.Split(file, []byte("\n"))
for i, line := range lines {
if bytes.HasPrefix(bytes.TrimSpace(line), []byte("#")) {
trimline := bytes.TrimSpace(line)
if bytes.HasPrefix(trimline, []byte("#")) && !bytes.HasPrefix(trimline, []byte("#!")) {
continue
}
stripped = append(stripped, line...)