diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 849b94580..b0ccf4827 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -1040,11 +1040,11 @@ }, { "ImportPath": "k8s.io/api", - "Rev": "0097618c6e4c" + "Rev": "8c6483ecf45e" }, { "ImportPath": "k8s.io/apimachinery", - "Rev": "fda713515979" + "Rev": "96c076bf1d97" }, { "ImportPath": "k8s.io/cli-runtime", @@ -1052,11 +1052,11 @@ }, { "ImportPath": "k8s.io/client-go", - "Rev": "2ed8b3081056" + "Rev": "9a82c6a51a32" }, { "ImportPath": "k8s.io/code-generator", - "Rev": "b9c3fe925685" + "Rev": "f57bba428cbd" }, { "ImportPath": "k8s.io/component-base", @@ -1080,7 +1080,7 @@ }, { "ImportPath": "k8s.io/metrics", - "Rev": "b6e3c12b3e8a" + "Rev": "efe7adfc18ed" }, { "ImportPath": "k8s.io/utils", diff --git a/go.mod b/go.mod index 18f71f6e8..c3b36dfd0 100644 --- a/go.mod +++ b/go.mod @@ -33,14 +33,14 @@ require ( golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073 gopkg.in/yaml.v2 v2.4.0 k8s.io/api v0.0.0-20210518101607-13f29098a509 - k8s.io/apimachinery v0.0.0-20210518100456-fda713515979 + k8s.io/apimachinery v0.0.0-20210518100457-96c076bf1d97 k8s.io/cli-runtime v0.0.0-20210518124922-8a120cfd4c50 - k8s.io/client-go v0.0.0-20210518102924-2ed8b3081056 + k8s.io/client-go v0.0.0-20210518102928-9a82c6a51a32 k8s.io/component-base v0.0.0-20210518111232-44faecbf614e k8s.io/component-helpers v0.0.0-20210518112016-d2cb76f2050a k8s.io/klog/v2 v2.8.0 k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e - k8s.io/metrics v0.0.0-20210518124132-b6e3c12b3e8a + k8s.io/metrics v0.0.0-20210518124134-efe7adfc18ed k8s.io/utils v0.0.0-20201110183641-67b214c5f920 sigs.k8s.io/kustomize/api v0.8.8 sigs.k8s.io/kustomize/kustomize/v4 v4.1.2 @@ -48,12 +48,12 @@ require ( ) replace ( - k8s.io/api => k8s.io/api v0.0.0-20210505141115-0097618c6e4c - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210518100456-fda713515979 + k8s.io/api => k8s.io/api v0.0.0-20210506172159-8c6483ecf45e + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210518100457-96c076bf1d97 k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20210518124922-8a120cfd4c50 - k8s.io/client-go => k8s.io/client-go v0.0.0-20210518102924-2ed8b3081056 - k8s.io/code-generator => k8s.io/code-generator v0.0.0-20210518095634-b9c3fe925685 + k8s.io/client-go => k8s.io/client-go v0.0.0-20210518102928-9a82c6a51a32 + k8s.io/code-generator => k8s.io/code-generator v0.0.0-20210518095634-f57bba428cbd k8s.io/component-base => k8s.io/component-base v0.0.0-20210518111232-44faecbf614e k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20210518112016-d2cb76f2050a - k8s.io/metrics => k8s.io/metrics v0.0.0-20210518124132-b6e3c12b3e8a + k8s.io/metrics => k8s.io/metrics v0.0.0-20210518124134-efe7adfc18ed ) diff --git a/go.sum b/go.sum index be2ba916f..542f648a2 100644 --- a/go.sum +++ b/go.sum @@ -731,15 +731,15 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= 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= -k8s.io/api v0.0.0-20210505141115-0097618c6e4c h1:QmszvJU0uDvIUanyZ0QhOYfZaILVvbkLJbRM7Ve3nts= -k8s.io/api v0.0.0-20210505141115-0097618c6e4c/go.mod h1:IgKLK42qxUHnMxdcdbEBFOo+TfTANemQTLg3gcGe8/M= -k8s.io/apimachinery v0.0.0-20210518100456-fda713515979 h1:qjGp8QxGJZSGSMQw31AFuI2za6IEfDmdJ5/cY+Eeas8= -k8s.io/apimachinery v0.0.0-20210518100456-fda713515979/go.mod h1:fBRSkoylGO2QUTae8Wb2wac6pZ83/r+tL6HFSXGbzfs= +k8s.io/api v0.0.0-20210506172159-8c6483ecf45e h1:qHyhF6qKQVHrfQmOto8W6vEj7OASwoH8x1+p0l/81Dk= +k8s.io/api v0.0.0-20210506172159-8c6483ecf45e/go.mod h1:IgKLK42qxUHnMxdcdbEBFOo+TfTANemQTLg3gcGe8/M= +k8s.io/apimachinery v0.0.0-20210518100457-96c076bf1d97 h1:hKyy5Pr8MoGjcqM5AYHQjpizciRmC8dz4N3XG4LZwuQ= +k8s.io/apimachinery v0.0.0-20210518100457-96c076bf1d97/go.mod h1:fBRSkoylGO2QUTae8Wb2wac6pZ83/r+tL6HFSXGbzfs= k8s.io/cli-runtime v0.0.0-20210518124922-8a120cfd4c50 h1:f0rVBw9d3DbPN6QLGO9++zqdlBgEW4PJYCM8MTFu1/Y= k8s.io/cli-runtime v0.0.0-20210518124922-8a120cfd4c50/go.mod h1:Wa1KFjbnEkfhs9pgjrdinm7T/xK0X8LNGM+/mF60PJY= -k8s.io/client-go v0.0.0-20210518102924-2ed8b3081056 h1:t4nxl6RpDRcvk1H0shNODINaiDEcBvGozB+ufxikbiA= -k8s.io/client-go v0.0.0-20210518102924-2ed8b3081056/go.mod h1:qBjkJPJp2FjoQFwy9eLFYI4JdHeFm0KH+j9/XQhCMi8= -k8s.io/code-generator v0.0.0-20210518095634-b9c3fe925685/go.mod h1:tHNeGA58jE3nJvZLDN0c/5k7P3NlYdjbWuJYK9QiU3s= +k8s.io/client-go v0.0.0-20210518102928-9a82c6a51a32 h1:pIQGgo4Zwcfxal6+QhaEb7qeCKzdqL1AuvN/1J0/DVY= +k8s.io/client-go v0.0.0-20210518102928-9a82c6a51a32/go.mod h1:VAUK6xq/o8PmTB8fQVPDh2Mb+05oZs9sXSh8opEUMqc= +k8s.io/code-generator v0.0.0-20210518095634-f57bba428cbd/go.mod h1:tHNeGA58jE3nJvZLDN0c/5k7P3NlYdjbWuJYK9QiU3s= k8s.io/component-base v0.0.0-20210518111232-44faecbf614e h1:+LvsEqL+o2/s3SNrTdZm22miglZOm3TPof8oO5pa2F8= k8s.io/component-base v0.0.0-20210518111232-44faecbf614e/go.mod h1:VYU6k+gXEg7lXm+XCubCKvSlHHI9l+JHRJ0Hw4nrjug= k8s.io/component-helpers v0.0.0-20210518112016-d2cb76f2050a h1:8/j0qwWx0p2tkFBK+URPu6ANIqp1MrZumZvlvfM7FwA= @@ -752,8 +752,8 @@ k8s.io/klog/v2 v2.8.0 h1:Q3gmuM9hKEjefWFFYF0Mat+YyFJvsUyYuwyNNJ5C9Ts= k8s.io/klog/v2 v2.8.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec= k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e h1:KLHHjkdQFomZy8+06csTWZ0m1343QqxZhR2LJ1OxCYM= k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw= -k8s.io/metrics v0.0.0-20210518124132-b6e3c12b3e8a h1:01yLcaLPfGgSzevU9ztgd32nQwElLCr25gsolpccSyA= -k8s.io/metrics v0.0.0-20210518124132-b6e3c12b3e8a/go.mod h1:cXYmaRRD/GrROQjsVynMeoanATNAEOEhhRNrsv/yd18= +k8s.io/metrics v0.0.0-20210518124134-efe7adfc18ed h1:i8s1TRZlGgHjZ+CFYZ6jhHcgHgi45Oqn/wifO8xvVTM= +k8s.io/metrics v0.0.0-20210518124134-efe7adfc18ed/go.mod h1:3ndxbz8IqIL7j2DlA3mPE35VhkIikhjYhpZwXlICG+U= k8s.io/utils v0.0.0-20201110183641-67b214c5f920 h1:CbnUZsM497iRC5QMVkHwyl8s2tB3g7yaSHkYPkpgelw= k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= diff --git a/pkg/explain/formatter.go b/pkg/explain/formatter.go index 76ca017e4..9f94f1206 100644 --- a/pkg/explain/formatter.go +++ b/pkg/explain/formatter.go @@ -122,7 +122,7 @@ func shouldStartNewLine(lastWord, str string) bool { return true } // preserve lines that look like they're starting lists - if bullet.MatchString(str) == true { + if bullet.MatchString(str) { return true } // otherwise combine