Skip to content

Commit

Permalink
Merge pull request kubernetes#110510 from dims/switch-to-github.com/M…
Browse files Browse the repository at this point in the history 
…akeNowJust/heredoc-v1.0.0-and-avoid-SHA

Switch to v1.0.0 of github.com/MakeNowJust/heredoc (avoid SHA)
  • Loading branch information
@k8s-ci-robot
k8s-ci-robot authored Jun 10, 2022
2 parents 19814d9 + 3990685 commit f3f50b4
Show file tree
Hide file tree
Showing 9 changed files with 28 additions and 22 deletions.
4 changes: 2 additions & 2 deletions LICENSES/vendor/github.com/MakeNowJust/heredoc/LICENSE
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ require (
github.com/Azure/go-autorest/autorest/validation v0.1.0 // indirect
github.com/Azure/go-autorest/logger v0.2.1 // indirect
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd // indirect
github.com/MakeNowJust/heredoc v1.0.0 // indirect
github.com/NYTimes/gziphandler v1.1.1 // indirect
github.com/PuerkitoBio/purell v1.1.1 // indirect
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
Expand Down Expand Up @@ -284,7 +284,7 @@ replace (
github.com/BurntSushi/xgb => github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802
github.com/GoogleCloudPlatform/k8s-cloud-provider => github.com/GoogleCloudPlatform/k8s-cloud-provider v1.16.1-0.20210702024009-ea6160c1d0e3
github.com/JeffAshton/win_pdh => github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab
github.com/MakeNowJust/heredoc => github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd
github.com/MakeNowJust/heredoc => github.com/MakeNowJust/heredoc v1.0.0
github.com/Microsoft/go-winio => github.com/Microsoft/go-winio v0.4.17
github.com/Microsoft/hcsshim => github.com/Microsoft/hcsshim v0.8.22
github.com/NYTimes/gziphandler => github.com/NYTimes/gziphandler v1.1.1
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ github.com/GoogleCloudPlatform/k8s-cloud-provider v1.16.1-0.20210702024009-ea616
github.com/GoogleCloudPlatform/k8s-cloud-provider v1.16.1-0.20210702024009-ea6160c1d0e3/go.mod h1:8XasY4ymP2V/tn2OOV9ZadmiTE1FIB/h3W+yNlPttKw=
github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab h1:UKkYhof1njT1/xq4SEg5z+VpTgjmNeHwPGRQl7takDI=
github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab/go.mod h1:3VYc5hodBMJ5+l/7J4xAyMeuM2PNuepvHlGs8yilUCA=
github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd h1:sjQovDkwrZp8u+gxLtPgKGjk5hCxuy2hrRejBTA9xFU=
github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd/go.mod h1:64YHyfSL2R96J44Nlwm39UHepQbyR5q10x7iYa1ks2E=
github.com/MakeNowJust/heredoc v1.0.0 h1:cXCdzVdstXyiTqTvfqk9SDHpKNjxuom+DOlyEeQ4pzQ=
github.com/MakeNowJust/heredoc v1.0.0/go.mod h1:mG5amYoWBHf8vpLOuehzbGGw0EHxpZZ6lCpQ4fNJ8LE=
github.com/Microsoft/go-winio v0.4.17 h1:iT12IBVClFevaf8PuVyi3UmZOVh4OqnaLxDTW2O6j3w=
github.com/Microsoft/go-winio v0.4.17/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84=
github.com/Microsoft/hcsshim v0.8.22 h1:CulZ3GW8sNJExknToo+RWD+U+6ZM5kkNfuxywSDPd08=
Expand Down
2 changes: 1 addition & 1 deletion staging/src/k8s.io/kubectl/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ module k8s.io/kubectl
go 1.18

require (
github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd
github.com/MakeNowJust/heredoc v1.0.0
github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5
github.com/davecgh/go-spew v1.1.1
github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd
Expand Down
4 changes: 2 additions & 2 deletions staging/src/k8s.io/kubectl/go.sum
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/github.com/MakeNowJust/heredoc/LICENSE
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 6 additions & 7 deletions vendor/github.com/MakeNowJust/heredoc/README.md
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 9 additions & 2 deletions vendor/github.com/MakeNowJust/heredoc/heredoc.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions vendor/modules.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud/mock
# github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab => github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab
## explicit
github.com/JeffAshton/win_pdh
# github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd => github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd
## explicit
# github.com/MakeNowJust/heredoc v1.0.0 => github.com/MakeNowJust/heredoc v1.0.0
## explicit; go 1.12
github.com/MakeNowJust/heredoc
# github.com/Microsoft/go-winio v0.4.17 => github.com/Microsoft/go-winio v0.4.17
## explicit; go 1.12
Expand Down Expand Up @@ -2569,7 +2569,7 @@ sigs.k8s.io/yaml
# github.com/BurntSushi/xgb => github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802
# github.com/GoogleCloudPlatform/k8s-cloud-provider => github.com/GoogleCloudPlatform/k8s-cloud-provider v1.16.1-0.20210702024009-ea6160c1d0e3
# github.com/JeffAshton/win_pdh => github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab
# github.com/MakeNowJust/heredoc => github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd
# github.com/MakeNowJust/heredoc => github.com/MakeNowJust/heredoc v1.0.0
# github.com/Microsoft/go-winio => github.com/Microsoft/go-winio v0.4.17
# github.com/Microsoft/hcsshim => github.com/Microsoft/hcsshim v0.8.22
# github.com/NYTimes/gziphandler => github.com/NYTimes/gziphandler v1.1.1
Expand Down

0 comments on commit f3f50b4

Please sign in to comment.