Skip to content
This repository has been archived by the owner on Sep 5, 2024. It is now read-only.

Commit

Permalink
Merge pull request #1061 from StrongMonkey/fix-webhook
Browse files Browse the repository at this point in the history 
Fix webhook
  • Loading branch information
@StrongMonkey
StrongMonkey authored Oct 8, 2020
2 parents b9da6cb + 8b0e191 commit af7ad68
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Dockerfile.dapper
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM golang:1.13.3-alpine3.10

ARG DAPPER_HOST_ARCH
ENV ARCH $DAPPER_HOST_ARCH
ENV K3S_VERSION v0.10.2
ENV K3S_VERSION v1.18.9+k3s1
ENV KUBECTL_VERSION v1.16.2
ENV GO111MODULE off

Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ replace (
github.com/hashicorp/vault => github.com/hashicorp/vault v1.3.2
github.com/jaguilar/vt100 => github.com/tonistiigi/vt100 v0.0.0-20190402012908-ad4c4a574305
github.com/jetstack/cert-manager v0.11.0 => github.com/rancher/cert-manager v0.5.1-0.20191021233300-3a070253aeda
github.com/linkerd/linkerd2 => github.com/StrongMonkey/linkerd2 v0.0.0-20191021165729-976fad67457a
github.com/linkerd/linkerd2 => github.com/StrongMonkey/linkerd2 v0.5.1-0.20201008181831-07ef85ee9b6f
github.com/pseudomuto/protoc-gen-doc => github.com/pseudomuto/protoc-gen-doc v1.0.0
github.com/wercker/stern v1.11.0 => github.com/rancher/stern v0.0.0-20191213223518-59c2bf84f705
golang.org/x/crypto v0.0.0-20190129210102-0709b304e793 => golang.org/x/crypto v0.0.0-20180904163835-0709b304e793
Expand Down
2 changes: 2 additions & 0 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,8 @@ github.com/StrongMonkey/linkerd2 v0.0.0-20191021165729-976fad67457a h1:kvyMlzSGU
github.com/StrongMonkey/linkerd2 v0.0.0-20191021165729-976fad67457a/go.mod h1:C+pkr4rp/oOlvvsQMOZGHWRaZJfXxsLXIHL8MALgJjA=
github.com/StrongMonkey/linkerd2 v0.5.1-0.20200529213430-ec8d2bb70324 h1:BYRNQzPquUfZza1P4kMF/rc9tjcsQFb4cprWYWQFsfo=
github.com/StrongMonkey/linkerd2 v0.5.1-0.20200529213430-ec8d2bb70324/go.mod h1:5xd7QHQsrFsLXzXcAPViEO3RFCB4cHEFOYCXaCOo5oA=
github.com/StrongMonkey/linkerd2 v0.5.1-0.20201008181831-07ef85ee9b6f h1:iLaecQC5bW1RFpLNdLLMAmPA/lyZbikXwbOx212y17I=
github.com/StrongMonkey/linkerd2 v0.5.1-0.20201008181831-07ef85ee9b6f/go.mod h1:C+pkr4rp/oOlvvsQMOZGHWRaZJfXxsLXIHL8MALgJjA=
github.com/ahmetb/gen-crd-api-reference-docs v0.1.5 h1:OU+AFpBEhyclrQGx4I6zpCx5WvXiKqvFeeOASOmhKCY=
github.com/ahmetb/gen-crd-api-reference-docs v0.1.5/go.mod h1:P/XzJ+c2+khJKNKABcm2biRwk2QAuwbLf8DlXuaL7WM=
github.com/airbrake/gobrake v3.6.1+incompatible/go.mod h1:wM4gu3Cn0W0K7GUuVWnlXZU11AGBXMILnrdOU8Kn00o=
Expand Down
2 changes: 1 addition & 1 deletion vendor/github.com/linkerd/linkerd2/pkg/tls/ca.go
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/modules.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,7 @@ github.com/json-iterator/go
github.com/k0kubun/pp
# github.com/konsorten/go-windows-terminal-sequences v1.0.2
github.com/konsorten/go-windows-terminal-sequences
# github.com/linkerd/linkerd2 v0.0.0-20191010175117-1039d8254738 => github.com/StrongMonkey/linkerd2 v0.0.0-20191021165729-976fad67457a
# github.com/linkerd/linkerd2 v0.0.0-20191010175117-1039d8254738 => github.com/StrongMonkey/linkerd2 v0.5.1-0.20201008181831-07ef85ee9b6f
github.com/linkerd/linkerd2/controller/gen/apis/serviceprofile
github.com/linkerd/linkerd2/controller/gen/apis/serviceprofile/v1alpha2
github.com/linkerd/linkerd2/controller/gen/client/clientset/versioned
Expand Down

0 comments on commit af7ad68

Please sign in to comment.