Skip to content

Commit f3f50b4

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#110510 from dims/switch-to-github.com/MakeNowJust/heredoc-v1.0.0-and-avoid-SHA
Switch to v1.0.0 of github.com/MakeNowJust/heredoc (avoid SHA)
2 parents 19814d9 + 3990685 commit f3f50b4

File tree

9 files changed

+28
-22
lines changed

9 files changed

+28
-22
lines changed

‎LICENSES/vendor/github.com/MakeNowJust/heredoc/LICENSE

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ require (
138138
github.com/Azure/go-autorest/autorest/validation v0.1.0 // indirect
139139
github.com/Azure/go-autorest/logger v0.2.1 // indirect
140140
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
141-
github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd // indirect
141+
github.com/MakeNowJust/heredoc v1.0.0 // indirect
142142
github.com/NYTimes/gziphandler v1.1.1 // indirect
143143
github.com/PuerkitoBio/purell v1.1.1 // indirect
144144
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
@@ -284,7 +284,7 @@ replace (
284284
github.com/BurntSushi/xgb => github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802
285285
github.com/GoogleCloudPlatform/k8s-cloud-provider => github.com/GoogleCloudPlatform/k8s-cloud-provider v1.16.1-0.20210702024009-ea6160c1d0e3
286286
github.com/JeffAshton/win_pdh => github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab
287-
github.com/MakeNowJust/heredoc => github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd
287+
github.com/MakeNowJust/heredoc => github.com/MakeNowJust/heredoc v1.0.0
288288
github.com/Microsoft/go-winio => github.com/Microsoft/go-winio v0.4.17
289289
github.com/Microsoft/hcsshim => github.com/Microsoft/hcsshim v0.8.22
290290
github.com/NYTimes/gziphandler => github.com/NYTimes/gziphandler v1.1.1

‎go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ github.com/GoogleCloudPlatform/k8s-cloud-provider v1.16.1-0.20210702024009-ea616
3535
github.com/GoogleCloudPlatform/k8s-cloud-provider v1.16.1-0.20210702024009-ea6160c1d0e3/go.mod h1:8XasY4ymP2V/tn2OOV9ZadmiTE1FIB/h3W+yNlPttKw=
3636
github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab h1:UKkYhof1njT1/xq4SEg5z+VpTgjmNeHwPGRQl7takDI=
3737
github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab/go.mod h1:3VYc5hodBMJ5+l/7J4xAyMeuM2PNuepvHlGs8yilUCA=
38-
github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd h1:sjQovDkwrZp8u+gxLtPgKGjk5hCxuy2hrRejBTA9xFU=
39-
github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd/go.mod h1:64YHyfSL2R96J44Nlwm39UHepQbyR5q10x7iYa1ks2E=
38+
github.com/MakeNowJust/heredoc v1.0.0 h1:cXCdzVdstXyiTqTvfqk9SDHpKNjxuom+DOlyEeQ4pzQ=
39+
github.com/MakeNowJust/heredoc v1.0.0/go.mod h1:mG5amYoWBHf8vpLOuehzbGGw0EHxpZZ6lCpQ4fNJ8LE=
4040
github.com/Microsoft/go-winio v0.4.17 h1:iT12IBVClFevaf8PuVyi3UmZOVh4OqnaLxDTW2O6j3w=
4141
github.com/Microsoft/go-winio v0.4.17/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84=
4242
github.com/Microsoft/hcsshim v0.8.22 h1:CulZ3GW8sNJExknToo+RWD+U+6ZM5kkNfuxywSDPd08=

‎staging/src/k8s.io/kubectl/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ module k8s.io/kubectl
55
go 1.18
66

77
require (
8-
github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd
8+
github.com/MakeNowJust/heredoc v1.0.0
99
github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5
1010
github.com/davecgh/go-spew v1.1.1
1111
github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd

‎staging/src/k8s.io/kubectl/go.sum

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/MakeNowJust/heredoc/LICENSE

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/MakeNowJust/heredoc/README.md

+6-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/MakeNowJust/heredoc/heredoc.go

+9-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/modules.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud/mock
5555
# github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab => github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab
5656
## explicit
5757
github.com/JeffAshton/win_pdh
58-
# github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd => github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd
59-
## explicit
58+
# github.com/MakeNowJust/heredoc v1.0.0 => github.com/MakeNowJust/heredoc v1.0.0
59+
## explicit; go 1.12
6060
github.com/MakeNowJust/heredoc
6161
# github.com/Microsoft/go-winio v0.4.17 => github.com/Microsoft/go-winio v0.4.17
6262
## explicit; go 1.12
@@ -2569,7 +2569,7 @@ sigs.k8s.io/yaml
25692569
# github.com/BurntSushi/xgb => github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802
25702570
# github.com/GoogleCloudPlatform/k8s-cloud-provider => github.com/GoogleCloudPlatform/k8s-cloud-provider v1.16.1-0.20210702024009-ea6160c1d0e3
25712571
# github.com/JeffAshton/win_pdh => github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab
2572-
# github.com/MakeNowJust/heredoc => github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd
2572+
# github.com/MakeNowJust/heredoc => github.com/MakeNowJust/heredoc v1.0.0
25732573
# github.com/Microsoft/go-winio => github.com/Microsoft/go-winio v0.4.17
25742574
# github.com/Microsoft/hcsshim => github.com/Microsoft/hcsshim v0.8.22
25752575
# github.com/NYTimes/gziphandler => github.com/NYTimes/gziphandler v1.1.1

0 commit comments

Comments
 (0)