Merge pull request #289 from mengqiy/appscodejsonpatch

🐛 switch to use appscode/jsonpatch
kubernetes-sigs · Jan 9, 2019 · b44385d · b44385d
2 parents d681ff8 + 8de5508
commit b44385d
Show file tree

Hide file tree

Showing 13 changed files with 195 additions and 81 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/pkg/patch/patch.go b/pkg/patch/patch.go
@@ -21,7 +21,7 @@ import (
 	"fmt"
 	"reflect"
 
-	"github.com/mattbaird/jsonpatch"
+	"github.com/appscode/jsonpatch"
 
 	"k8s.io/apimachinery/pkg/runtime"
 )

diff --git a/pkg/webhook/admission/response_test.go b/pkg/webhook/admission/response_test.go
@@ -20,7 +20,7 @@ import (
 	"errors"
 	"net/http"
 
-	"github.com/mattbaird/jsonpatch"
+	"github.com/appscode/jsonpatch"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 

diff --git a/pkg/webhook/admission/types/types.go b/pkg/webhook/admission/types/types.go
@@ -17,7 +17,7 @@ limitations under the License.
 package types
 
 import (
-	"github.com/mattbaird/jsonpatch"
+	"github.com/appscode/jsonpatch"
 
 	admissionv1beta1 "k8s.io/api/admission/v1beta1"
 	"k8s.io/apimachinery/pkg/runtime"

diff --git a/pkg/webhook/admission/webhook.go b/pkg/webhook/admission/webhook.go
@@ -26,7 +26,7 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/mattbaird/jsonpatch"
+	"github.com/appscode/jsonpatch"
 
 	admissionv1beta1 "k8s.io/api/admission/v1beta1"
 	admissionregistrationv1beta1 "k8s.io/api/admissionregistration/v1beta1"

diff --git a/pkg/webhook/admission/webhook_test.go b/pkg/webhook/admission/webhook_test.go
@@ -25,7 +25,7 @@ import (
 	"net/http"
 	"net/http/httptest"
 
-	"github.com/mattbaird/jsonpatch"
+	"github.com/appscode/jsonpatch"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 

diff --git a/...git.luolix.top/mattbaird/jsonpatch/.gitignore → .../github.com/appscode/jsonpatch/.gitignore b/...git.luolix.top/mattbaird/jsonpatch/.gitignore → .../github.com/appscode/jsonpatch/.gitignore
diff --git a/vendor/github.com/appscode/jsonpatch/.travis.yml b/vendor/github.com/appscode/jsonpatch/.travis.yml
diff --git a/...or/github.com/mattbaird/jsonpatch/LICENSE → vendor/github.com/appscode/jsonpatch/LICENSE b/...or/github.com/mattbaird/jsonpatch/LICENSE → vendor/github.com/appscode/jsonpatch/LICENSE
diff --git a/.../github.com/mattbaird/jsonpatch/README.md → ...r/github.com/appscode/jsonpatch/README.md b/.../github.com/mattbaird/jsonpatch/README.md → ...r/github.com/appscode/jsonpatch/README.md
diff --git a/vendor/github.com/appscode/jsonpatch/go.mod b/vendor/github.com/appscode/jsonpatch/go.mod
diff --git a/vendor/github.com/appscode/jsonpatch/go.sum b/vendor/github.com/appscode/jsonpatch/go.sum