Skip to content

Commit f3342aa

Browse files
committed
fix dep issue
1 parent 8b6b763 commit f3342aa

File tree

9 files changed

+149
-13
lines changed

9 files changed

+149
-13
lines changed

go.mod

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,20 @@ require (
88
github.com/evanphx/json-patch v4.5.0+incompatible
99
github.com/go-logr/logr v0.1.0
1010
github.com/go-logr/zapr v0.1.0
11-
github.com/gogo/protobuf v1.1.1 // indirect
1211
github.com/golang/groupcache v0.0.0-20180513044358-24b0969c4cb7 // indirect
12+
github.com/golangci/golangci-lint v1.15.0 // indirect
1313
github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf // indirect
1414
github.com/googleapis/gnostic v0.2.0 // indirect
1515
github.com/hashicorp/golang-lru v0.0.0-20180201235237-0fb14efe8c47 // indirect
1616
github.com/imdario/mergo v0.3.6 // indirect
1717
github.com/json-iterator/go v1.1.5 // indirect
18-
github.com/kr/pretty v0.1.0 // indirect
1918
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
2019
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
2120
github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 // indirect
2221
github.com/onsi/ginkgo v1.6.0
2322
github.com/onsi/gomega v1.4.2
2423
github.com/pborman/uuid v0.0.0-20170612153648-e790cca94e6c // indirect
24+
github.com/pkg/errors v0.8.1 // indirect
2525
github.com/prometheus/client_golang v0.9.0
2626
github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910
2727
github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e // indirect
@@ -34,9 +34,7 @@ require (
3434
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be // indirect
3535
golang.org/x/sync v0.0.0-20190423024810-112230192c58 // indirect
3636
golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2 // indirect
37-
gomodules.xyz/jsonpatch/v2 v2.0.0
3837
google.golang.org/appengine v1.1.0 // indirect
39-
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
4038
gopkg.in/fsnotify.v1 v1.4.7
4139
gopkg.in/inf.v0 v0.9.1 // indirect
4240
k8s.io/api v0.0.0-20190409021203-6e4e0e4f393b

go.sum

Lines changed: 140 additions & 2 deletions
Large diffs are not rendered by default.

pkg/webhook/admission/multi.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"fmt"
2323
"net/http"
2424

25-
"gomodules.xyz/jsonpatch/v2"
25+
"gomodules.xyz/jsonpatch"
2626
admissionv1beta1 "k8s.io/api/admission/v1beta1"
2727
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2828
"sigs.k8s.io/controller-runtime/pkg/runtime/inject"

pkg/webhook/admission/multi_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
. "github.com/onsi/ginkgo"
2323
. "github.com/onsi/gomega"
2424

25-
"gomodules.xyz/jsonpatch/v2"
25+
"gomodules.xyz/jsonpatch"
2626
admissionv1beta1 "k8s.io/api/admission/v1beta1"
2727
)
2828

pkg/webhook/admission/response.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package admission
1919
import (
2020
"net/http"
2121

22-
"gomodules.xyz/jsonpatch/v2"
22+
"gomodules.xyz/jsonpatch"
2323

2424
admissionv1beta1 "k8s.io/api/admission/v1beta1"
2525
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

pkg/webhook/admission/response_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222

2323
. "github.com/onsi/ginkgo"
2424
. "github.com/onsi/gomega"
25-
"gomodules.xyz/jsonpatch/v2"
25+
"gomodules.xyz/jsonpatch"
2626

2727
admissionv1beta1 "k8s.io/api/admission/v1beta1"
2828
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

pkg/webhook/admission/webhook.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"net/http"
2323

2424
"github.com/go-logr/logr"
25-
"gomodules.xyz/jsonpatch/v2"
25+
"gomodules.xyz/jsonpatch"
2626
admissionv1beta1 "k8s.io/api/admission/v1beta1"
2727
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2828
"k8s.io/apimachinery/pkg/runtime"

pkg/webhook/admission/webhook_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
. "github.com/onsi/ginkgo"
2424
. "github.com/onsi/gomega"
2525

26-
"gomodules.xyz/jsonpatch/v2"
26+
"gomodules.xyz/jsonpatch"
2727
admissionv1beta1 "k8s.io/api/admission/v1beta1"
2828
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2929
"k8s.io/apimachinery/pkg/runtime"

pkg/webhook/alias.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ limitations under the License.
1717
package webhook
1818

1919
import (
20-
"gomodules.xyz/jsonpatch/v2"
20+
"gomodules.xyz/jsonpatch"
2121
"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
2222
)
2323

0 commit comments

Comments
 (0)