Merge pull request #72923 from saschagrunert/dedent-update

Update dedent to latest release

Godeps/Godeps.json

@@ -2431,6 +2431,11 @@
 			"ImportPath": "github.com/liggitt/tabwriter",
 			"Rev": "89fcab3d43de07060e4fd4c1547430ed57e87f24"
 		},
+		{
+			"ImportPath": "github.com/lithammer/dedent",
+			"Comment": "v1.1.0",
+			"Rev": "8478954c3bc893cf36c5ee7c822266b993a3b3ee"
+		},
 		{
 			"ImportPath": "github.com/magiconair/properties",
 			"Comment": "v1.7.0-4-g61b492c03cf472",
@@ -2997,11 +3002,6 @@
 			"Comment": "v0.1.0-196-g09693a8743ba5e",
 			"Rev": "09693a8743ba5ee58c58c1b1e8a4abd17af00d45"
 		},
-		{
-			"ImportPath": "github.com/renstrom/dedent",
-			"Comment": "v1.0.0-3-g020d11c3b9c0c7",
-			"Rev": "020d11c3b9c0c7a3c2efcc8e5cf5b9ef7bcea21f"
-		},
 		{
 			"ImportPath": "github.com/robfig/cron",
 			"Comment": "v1-53-gdf38d32658d878",

Godeps/LICENSES

@@ -74644,6 +74644,35 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ================================================================================
 
 
+================================================================================
+= vendor/github.com/lithammer/dedent licensed under: =
+
+The MIT License (MIT)
+
+Copyright (c) 2018 Peter Lithammer
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+= vendor/github.com/lithammer/dedent/LICENSE 2f1370f16b018459285c6972a934ba0e
+================================================================================
+
+
 ================================================================================
 = vendor/github.com/magiconair/properties licensed under: =
 
@@ -88459,35 +88488,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ================================================================================
 
 
-================================================================================
-= vendor/github.com/renstrom/dedent licensed under: =
-
-The MIT License (MIT)
-
-Copyright (c) 2015 Peter Renström
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-= vendor/github.com/renstrom/dedent/LICENSE 285693e07a6e1fd790cb3f3b8b5127db
-================================================================================
-
-
 ================================================================================
 = vendor/github.com/Rican7/retry licensed under: =
 

cmd/kubeadm/.import-restrictions

@@ -164,7 +164,7 @@
 				"github.com/prometheus/procfs",
 				"github.com/PuerkitoBio/purell",
 				"github.com/PuerkitoBio/urlesc",
-				"github.com/renstrom/dedent",
+				"github.com/lithammer/dedent",
 				"github.com/russross/blackfriday",
 				"github.com/shurcooL/sanitized_anchor_name",
 				"github.com/sirupsen/logrus",

cmd/kubeadm/app/cmd/BUILD

@@ -65,8 +65,8 @@ go_library(
         "//staging/src/k8s.io/client-go/util/cert:go_default_library",
         "//staging/src/k8s.io/cluster-bootstrap/token/api:go_default_library",
         "//staging/src/k8s.io/cluster-bootstrap/token/util:go_default_library",
+        "//vendor/github.com/lithammer/dedent:go_default_library",
         "//vendor/github.com/pkg/errors:go_default_library",
-        "//vendor/github.com/renstrom/dedent:go_default_library",
         "//vendor/github.com/spf13/cobra:go_default_library",
         "//vendor/github.com/spf13/pflag:go_default_library",
         "//vendor/k8s.io/klog:go_default_library",
@@ -106,8 +106,8 @@ go_test(
         "//staging/src/k8s.io/client-go/kubernetes/fake:go_default_library",
         "//staging/src/k8s.io/client-go/testing:go_default_library",
         "//staging/src/k8s.io/client-go/tools/clientcmd:go_default_library",
+        "//vendor/github.com/lithammer/dedent:go_default_library",
         "//vendor/github.com/pkg/errors:go_default_library",
-        "//vendor/github.com/renstrom/dedent:go_default_library",
         "//vendor/github.com/spf13/cobra:go_default_library",
         "//vendor/k8s.io/utils/exec:go_default_library",
         "//vendor/k8s.io/utils/exec/testing:go_default_library",

cmd/kubeadm/app/cmd/cmd.go

@@ -19,7 +19,7 @@ package cmd
 import (
 	"io"
 
-	"github.com/renstrom/dedent"
+	"github.com/lithammer/dedent"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 	"k8s.io/kubernetes/cmd/kubeadm/app/cmd/alpha"

cmd/kubeadm/app/cmd/completion.go

@@ -20,8 +20,8 @@ import (
 	"bytes"
 	"io"
 
+	"github.com/lithammer/dedent"
 	"github.com/pkg/errors"
-	"github.com/renstrom/dedent"
 	"github.com/spf13/cobra"
 	"k8s.io/klog"
 

cmd/kubeadm/app/cmd/config.go

@@ -23,8 +23,8 @@ import (
 	"io/ioutil"
 	"strings"
 
+	"github.com/lithammer/dedent"
 	"github.com/pkg/errors"
-	"github.com/renstrom/dedent"
 	"github.com/spf13/cobra"
 	flag "github.com/spf13/pflag"
 	"k8s.io/klog"

cmd/kubeadm/app/cmd/config_test.go

@@ -28,7 +28,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/renstrom/dedent"
+	"github.com/lithammer/dedent"
 	"github.com/spf13/cobra"
 	kubeadmapiv1beta1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta1"
 	"k8s.io/kubernetes/cmd/kubeadm/app/componentconfigs"

cmd/kubeadm/app/cmd/init.go

@@ -25,8 +25,8 @@ import (
 	"strings"
 	"text/template"
 
+	"github.com/lithammer/dedent"
 	"github.com/pkg/errors"
-	"github.com/renstrom/dedent"
 	"github.com/spf13/cobra"
 	flag "github.com/spf13/pflag"
 	"k8s.io/apimachinery/pkg/util/sets"

cmd/kubeadm/app/cmd/join.go

@@ -24,8 +24,8 @@ import (
 	"path/filepath"
 	"text/template"
 
+	"github.com/lithammer/dedent"
 	"github.com/pkg/errors"
-	"github.com/renstrom/dedent"
 	"github.com/spf13/cobra"
 	flag "github.com/spf13/pflag"
 	"k8s.io/apimachinery/pkg/util/sets"

cmd/kubeadm/app/cmd/phases/BUILD

@@ -48,8 +48,8 @@ go_library(
         "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library",
         "//staging/src/k8s.io/client-go/kubernetes:go_default_library",
+        "//vendor/github.com/lithammer/dedent:go_default_library",
         "//vendor/github.com/pkg/errors:go_default_library",
-        "//vendor/github.com/renstrom/dedent:go_default_library",
         "//vendor/github.com/spf13/pflag:go_default_library",
         "//vendor/k8s.io/klog:go_default_library",
         "//vendor/k8s.io/utils/exec:go_default_library",

cmd/kubeadm/app/cmd/phases/waitcontrolplane.go

@@ -23,8 +23,8 @@ import (
 	"text/template"
 	"time"
 
+	"github.com/lithammer/dedent"
 	"github.com/pkg/errors"
-	"github.com/renstrom/dedent"
 	clientset "k8s.io/client-go/kubernetes"
 	"k8s.io/klog"
 	kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm"

cmd/kubeadm/app/cmd/reset.go

@@ -25,8 +25,8 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/lithammer/dedent"
 	"github.com/pkg/errors"
-	"github.com/renstrom/dedent"
 	"github.com/spf13/cobra"
 	"k8s.io/apimachinery/pkg/util/sets"
 	clientset "k8s.io/client-go/kubernetes"

cmd/kubeadm/app/cmd/reset_test.go

@@ -23,7 +23,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/renstrom/dedent"
+	"github.com/lithammer/dedent"
 
 	clientsetfake "k8s.io/client-go/kubernetes/fake"
 	kubeadmapiv1beta1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta1"

cmd/kubeadm/app/cmd/token.go

@@ -24,8 +24,8 @@ import (
 	"text/tabwriter"
 	"time"
 
+	"github.com/lithammer/dedent"
 	"github.com/pkg/errors"
-	"github.com/renstrom/dedent"
 	"github.com/spf13/cobra"
 	"k8s.io/klog"
 

cmd/kubeadm/app/phases/kubeconfig/BUILD

@@ -54,6 +54,6 @@ go_test(
         "//cmd/kubeadm/test/kubeconfig:go_default_library",
         "//staging/src/k8s.io/client-go/tools/clientcmd:go_default_library",
         "//staging/src/k8s.io/client-go/tools/clientcmd/api:go_default_library",
-        "//vendor/github.com/renstrom/dedent:go_default_library",
+        "//vendor/github.com/lithammer/dedent:go_default_library",
     ],
 )

cmd/kubeadm/app/phases/kubeconfig/kubeconfig_test.go

@@ -27,7 +27,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/renstrom/dedent"
+	"github.com/lithammer/dedent"
 
 	"k8s.io/client-go/tools/clientcmd"
 	clientcmdapi "k8s.io/client-go/tools/clientcmd/api"

cmd/kubeadm/app/preflight/BUILD

@@ -48,8 +48,8 @@ go_test(
         "//cmd/kubeadm/app/constants:go_default_library",
         "//cmd/kubeadm/app/util/runtime:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library",
+        "//vendor/github.com/lithammer/dedent:go_default_library",
         "//vendor/github.com/pkg/errors:go_default_library",
-        "//vendor/github.com/renstrom/dedent:go_default_library",
         "//vendor/k8s.io/utils/exec:go_default_library",
         "//vendor/k8s.io/utils/exec/testing:go_default_library",
     ],

cmd/kubeadm/app/preflight/checks_test.go

@@ -23,8 +23,8 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/lithammer/dedent"
 	"github.com/pkg/errors"
-	"github.com/renstrom/dedent"
 
 	"net/http"
 	"os"

cmd/kubeadm/app/util/config/BUILD

@@ -65,8 +65,8 @@ go_test(
         "//staging/src/k8s.io/apimachinery/pkg/util/version:go_default_library",
         "//staging/src/k8s.io/client-go/kubernetes:go_default_library",
         "//staging/src/k8s.io/client-go/kubernetes/fake:go_default_library",
+        "//vendor/github.com/lithammer/dedent:go_default_library",
         "//vendor/github.com/pmezard/go-difflib/difflib:go_default_library",
-        "//vendor/github.com/renstrom/dedent:go_default_library",
     ],
 )
 

cmd/kubeadm/app/util/config/common_test.go

@@ -22,7 +22,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/renstrom/dedent"
+	"github.com/lithammer/dedent"
 
 	kubeadmapiv1beta1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta1"
 	"k8s.io/kubernetes/cmd/kubeadm/app/constants"

cmd/kubeadm/test/BUILD

@@ -16,7 +16,7 @@ go_library(
         "//cmd/kubeadm/app/util/certs:go_default_library",
         "//cmd/kubeadm/app/util/config:go_default_library",
         "//cmd/kubeadm/app/util/pkiutil:go_default_library",
-        "//vendor/github.com/renstrom/dedent:go_default_library",
+        "//vendor/github.com/lithammer/dedent:go_default_library",
     ],
 )
 

cmd/kubeadm/test/cmd/BUILD

@@ -37,8 +37,8 @@ go_test(
         "//cmd/kubeadm/app/phases/certs:go_default_library",
         "//cmd/kubeadm/app/util/pkiutil:go_default_library",
         "//cmd/kubeadm/test:go_default_library",
+        "//vendor/github.com/lithammer/dedent:go_default_library",
         "//vendor/github.com/pkg/errors:go_default_library",
-        "//vendor/github.com/renstrom/dedent:go_default_library",
         "//vendor/sigs.k8s.io/yaml:go_default_library",
     ],
 )

cmd/kubeadm/test/cmd/init_test.go

@@ -21,8 +21,8 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/lithammer/dedent"
 	"github.com/pkg/errors"
-	"github.com/renstrom/dedent"
 	"k8s.io/kubernetes/cmd/kubeadm/app/constants"
 	"k8s.io/kubernetes/cmd/kubeadm/app/phases/certs"
 	"k8s.io/kubernetes/cmd/kubeadm/app/util/pkiutil"

cmd/kubeadm/test/util.go

@@ -24,7 +24,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/renstrom/dedent"
+	"github.com/lithammer/dedent"
 
 	kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm"
 	kubeadmapiv1beta1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta1"

pkg/kubectl/cmd/cp/BUILD

@@ -13,7 +13,7 @@ go_library(
         "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library",
         "//staging/src/k8s.io/client-go/kubernetes:go_default_library",
         "//staging/src/k8s.io/client-go/rest:go_default_library",
-        "//vendor/github.com/renstrom/dedent:go_default_library",
+        "//vendor/github.com/lithammer/dedent:go_default_library",
         "//vendor/github.com/spf13/cobra:go_default_library",
     ],
 )

pkg/kubectl/cmd/cp/cp.go

@@ -37,7 +37,7 @@ import (
 
 	"bytes"
 
-	"github.com/renstrom/dedent"
+	"github.com/lithammer/dedent"
 	"github.com/spf13/cobra"
 )
 

pkg/kubectl/cmd/rollout/BUILD

@@ -42,7 +42,7 @@ go_library(
         "//staging/src/k8s.io/client-go/dynamic:go_default_library",
         "//staging/src/k8s.io/client-go/tools/cache:go_default_library",
         "//staging/src/k8s.io/client-go/tools/watch:go_default_library",
-        "//vendor/github.com/renstrom/dedent:go_default_library",
+        "//vendor/github.com/lithammer/dedent:go_default_library",
         "//vendor/github.com/spf13/cobra:go_default_library",
     ],
 )

pkg/kubectl/cmd/rollout/rollout.go

@@ -17,7 +17,7 @@ limitations under the License.
 package rollout
 
 import (
-	"github.com/renstrom/dedent"
+	"github.com/lithammer/dedent"
 	"github.com/spf13/cobra"
 
 	"k8s.io/cli-runtime/pkg/genericclioptions"

pkg/proxy/healthcheck/BUILD

@@ -20,7 +20,7 @@ go_library(
         "//staging/src/k8s.io/apimachinery/pkg/util/clock:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library",
         "//staging/src/k8s.io/client-go/tools/record:go_default_library",
-        "//vendor/github.com/renstrom/dedent:go_default_library",
+        "//vendor/github.com/lithammer/dedent:go_default_library",
         "//vendor/k8s.io/klog:go_default_library",
     ],
 )

pkg/proxy/healthcheck/healthcheck.go

@@ -25,7 +25,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/renstrom/dedent"
+	"github.com/lithammer/dedent"
 	"k8s.io/klog"
 
 	"k8s.io/api/core/v1"

vendor/BUILD

@@ -296,6 +296,7 @@ filegroup(
         "//vendor/github.com/libopenstorage/openstorage/pkg/units:all-srcs",
         "//vendor/github.com/libopenstorage/openstorage/volume:all-srcs",
         "//vendor/github.com/liggitt/tabwriter:all-srcs",
+        "//vendor/github.com/lithammer/dedent:all-srcs",
         "//vendor/github.com/magiconair/properties:all-srcs",
         "//vendor/github.com/mailru/easyjson/buffer:all-srcs",
         "//vendor/github.com/mailru/easyjson/jlexer:all-srcs",
@@ -341,7 +342,6 @@ filegroup(
         "//vendor/github.com/prometheus/procfs:all-srcs",
         "//vendor/github.com/quobyte/api:all-srcs",
         "//vendor/github.com/rancher/go-rancher/client:all-srcs",
-        "//vendor/github.com/renstrom/dedent:all-srcs",
         "//vendor/github.com/robfig/cron:all-srcs",
         "//vendor/github.com/rubiojr/go-vhd/vhd:all-srcs",
         "//vendor/github.com/russross/blackfriday:all-srcs",

vendor/github.com/lithammer/dedent/.travis.yml

@@ -0,0 +1,11 @@
+language: go
+
+go:
+  - "1.6"
+  - "1.7"
+  - "1.8"
+  - "1.9"
+  - "1.10"
+  - "1.11"
+
+sudo: false

vendor/github.com/lithammer/dedent/BUILD

@@ -3,8 +3,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library")
 go_library(
     name = "go_default_library",
     srcs = ["dedent.go"],
-    importmap = "k8s.io/kubernetes/vendor/github.com/renstrom/dedent",
+    importmap = "k8s.io/kubernetes/vendor/github.com/lithammer/dedent",
-    importpath = "github.com/renstrom/dedent",
+    importpath = "github.com/lithammer/dedent",
     visibility = ["//visibility:public"],
 )
 

vendor/github.com/lithammer/dedent/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 Peter Renström
+Copyright (c) 2018 Peter Lithammer
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

vendor/github.com/lithammer/dedent/README.md

@@ -1,7 +1,7 @@
 # Dedent
 
-[![Build Status](https://travis-ci.org/renstrom/dedent.svg?branch=master)](https://travis-ci.org/renstrom/dedent)
+[![Build Status](https://travis-ci.org/lithammer/dedent.svg?branch=master)](https://travis-ci.org/lithammer/dedent)
-[![Godoc](https://img.shields.io/badge/godoc-reference-blue.svg?style=flat)](https://godoc.org/github.com/renstrom/dedent)
+[![Godoc](https://img.shields.io/badge/godoc-reference-blue.svg?style=flat)](https://godoc.org/github.com/lithammer/dedent)
 
 Removes common leading whitespace from multiline strings. Inspired by [`textwrap.dedent`](https://docs.python.org/3/library/textwrap.html#textwrap.dedent) in Python.
 
@@ -13,19 +13,20 @@ Imagine the following snippet that prints a multiline string. You want the inden
 package main
 
 import (
-    "fmt"
+	"fmt"
 
-    "github.com/renstrom/dedent"
+	"github.com/lithammer/dedent"
 )
 
 func main() {
-    s := `Lorem ipsum dolor sit amet,
+	s := `
-        consectetur adipiscing elit.
+		Lorem ipsum dolor sit amet,
-        Curabitur justo tellus, facilisis nec efficitur dictum,
+		consectetur adipiscing elit.
-        fermentum vitae ligula. Sed eu convallis sapien.`
+		Curabitur justo tellus, facilisis nec efficitur dictum,
-    fmt.Println(dedent.Dedent(s))
+		fermentum vitae ligula. Sed eu convallis sapien.`
-    fmt.Println("-------------")
+	fmt.Println(Dedent(s))
-    fmt.Println(s)
+	fmt.Println("-------------")
+	fmt.Println(s)
 }
 ```
 
@@ -39,10 +40,11 @@ consectetur adipiscing elit.
 Curabitur justo tellus, facilisis nec efficitur dictum,
 fermentum vitae ligula. Sed eu convallis sapien.
 -------------
-Lorem ipsum dolor sit amet,
+
-        consectetur adipiscing elit.
+		Lorem ipsum dolor sit amet,
-        Curabitur justo tellus, facilisis nec efficitur dictum,
+		consectetur adipiscing elit.
-        fermentum vitae ligula. Sed eu convallis sapien.
+		Curabitur justo tellus, facilisis nec efficitur dictum,
+		fermentum vitae ligula. Sed eu convallis sapien.
 ```
 
 ## License

vendor/github.com/lithammer/dedent/go.mod

@@ -0,0 +1 @@
+module github.com/lithammer/dedent

vendor/github.com/renstrom/dedent/.travis.yml

@@ -1,11 +0,0 @@
-language: go
-
-go:
-  - 1.0
-  - 1.1
-  - 1.2
-  - 1.3
-  - 1.4
-  - 1.5
-
-sudo: false