Update Kubernetes v1.18.9 dependencies (#394)

/cherry-pick Signed-off-by: 1gtm <[email protected]> Signed-off-by: Tamal Saha <[email protected]>
stashed · Nov 6, 2020 · b04d8a8 · b04d8a8
1 parent 3e2db91
commit b04d8a8
Show file tree

Hide file tree

Showing 76 changed files with 532 additions and 2,781 deletions.
diff --git a/cmd/stash-postgres/main.go b/cmd/stash-postgres/main.go
@@ -23,7 +23,7 @@ import (
 	_ "stash.appscode.dev/apimachinery/client/clientset/versioned/fake"
 	"stash.appscode.dev/postgres/pkg"
 
-	"github.com/appscode/go/log"
+	"gomodules.xyz/x/log"
 	_ "k8s.io/client-go/kubernetes/fake"
 	_ "k8s.io/client-go/plugin/pkg/client/auth"
 	"kmodules.xyz/client-go/logs"

diff --git a/cmd/stash-postgres/version.go b/cmd/stash-postgres/version.go
@@ -17,7 +17,7 @@ limitations under the License.
 package main
 
 import (
-	v "github.com/appscode/go/version"
+	v "gomodules.xyz/x/version"
 )
 
 var (

diff --git a/go.mod b/go.mod
@@ -3,30 +3,29 @@ module stash.appscode.dev/postgres
 go 1.12
 
 require (
-	github.com/appscode/go v0.0.0-20200928211031-cc0c23082d91
-	github.com/codeskyblue/go-sh v0.0.0-20190412065543-76bd3d59ff27
+	github.com/codeskyblue/go-sh v0.0.0-20200712050446-30169cf553fe
 	github.com/go-openapi/spec v0.19.8
 	github.com/gogo/protobuf v1.3.1
 	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
 	github.com/google/gofuzz v1.1.0
-	github.com/spf13/cobra v0.0.5
+	github.com/spf13/cobra v1.1.1
 	github.com/yudai/gojsondiff v1.0.0
 	go.bytebuilders.dev/license-verifier/kubernetes v0.3.0
+	gomodules.xyz/runtime v0.0.0-20201104200926-d838b09dda8b
+	gomodules.xyz/x v0.0.0-20201105065653-91c568df6331
 	k8s.io/api v0.18.9
 	k8s.io/apiextensions-apiserver v0.18.9
 	k8s.io/apimachinery v0.18.9
 	k8s.io/client-go v0.18.9
 	k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6
-	kmodules.xyz/client-go v0.0.0-20201027113349-01a6d453d836
+	kmodules.xyz/client-go v0.0.0-20201105071625-0b277310b9b8
 	kmodules.xyz/crd-schema-fuzz v0.0.0-20200922204806-c1426cd7fcf4
-	kmodules.xyz/custom-resources v0.0.0-20201008012351-6d8090f759d4
-	kmodules.xyz/offshoot-api v0.0.0-20201027212804-f5e6dc573558
+	kmodules.xyz/custom-resources v0.0.0-20201105075444-3c6af51b4f79
+	kmodules.xyz/offshoot-api v0.0.0-20201105074700-8675f5f686f2
 	sigs.k8s.io/yaml v1.2.0
-	stash.appscode.dev/apimachinery v0.11.3-0.20201012035827-8f31689080d6
+	stash.appscode.dev/apimachinery v0.11.6-0.20201106214826-132a511faa97
 )
 
-// release-1.18
-
 replace bitbucket.org/ww/goautoneg => gomodules.xyz/goautoneg v0.0.0-20120707110453-a547fc61f48d
 
 replace cloud.google.com/go => cloud.google.com/go v0.49.0
@@ -57,6 +56,26 @@ replace github.com/Azure/go-autorest/logger => github.com/Azure/go-autorest/logg
 
 replace github.com/Azure/go-autorest/tracing => github.com/Azure/go-autorest/tracing v0.5.0
 
+replace github.com/go-openapi/analysis => github.com/go-openapi/analysis v0.19.5
+
+replace github.com/go-openapi/errors => github.com/go-openapi/errors v0.19.2
+
+replace github.com/go-openapi/jsonpointer => github.com/go-openapi/jsonpointer v0.19.3
+
+replace github.com/go-openapi/jsonreference => github.com/go-openapi/jsonreference v0.19.3
+
+replace github.com/go-openapi/loads => github.com/go-openapi/loads v0.19.4
+
+replace github.com/go-openapi/runtime => github.com/go-openapi/runtime v0.19.4
+
+replace github.com/go-openapi/spec => github.com/go-openapi/spec v0.19.3
+
+replace github.com/go-openapi/strfmt => github.com/go-openapi/strfmt v0.19.3
+
+replace github.com/go-openapi/swag => github.com/go-openapi/swag v0.19.5
+
+replace github.com/go-openapi/validate => github.com/go-openapi/validate v0.19.5
+
 replace github.com/gogo/protobuf => github.com/gogo/protobuf v1.3.1
 
 replace github.com/golang/protobuf => github.com/golang/protobuf v1.3.2

diff --git a/go.sum b/go.sum
diff --git a/hack/gencrd/main.go b/hack/gencrd/main.go
@@ -24,9 +24,9 @@ import (
 	"stash.appscode.dev/postgres/apis/installer/install"
 	api "stash.appscode.dev/postgres/apis/installer/v1alpha1"
 
-	gort "github.com/appscode/go/runtime"
 	"github.com/go-openapi/spec"
 	"github.com/golang/glog"
+	gort "gomodules.xyz/runtime"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/serializer"
 	"k8s.io/kube-openapi/pkg/common"
@@ -48,17 +48,13 @@ func generateSwaggerJson() {
 			Title:   "Stash",
 			Version: "v0",
 			Contact: &spec.ContactInfo{
-				ContactInfoProps: spec.ContactInfoProps{
-					Name:  "AppsCode Inc.",
-					URL:   "https://appscode.com",
-					Email: "[email protected]",
-				},
+				Name:  "AppsCode Inc.",
+				URL:   "https://appscode.com",
+				Email: "[email protected]",
 			},
 			License: &spec.License{
-				LicenseProps: spec.LicenseProps{
-					Name: "Apache 2.0",
-					URL:  "https://www.apache.org/licenses/LICENSE-2.0.html",
-				},
+				Name: "Apache 2.0",
+				URL:  "https://www.apache.org/licenses/LICENSE-2.0.html",
 			},
 		},
 		OpenAPIDefinitions: []common.GetOpenAPIDefinitions{

diff --git a/pkg/backup.go b/pkg/backup.go
@@ -27,9 +27,9 @@ import (
 	"stash.appscode.dev/apimachinery/pkg/restic"
 	api_util "stash.appscode.dev/apimachinery/pkg/util"
 
-	"github.com/appscode/go/flags"
 	"github.com/spf13/cobra"
 	license "go.bytebuilders.dev/license-verifier/kubernetes"
+	"gomodules.xyz/x/flags"
 	core "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"

diff --git a/pkg/restore.go b/pkg/restore.go
@@ -24,9 +24,9 @@ import (
 	api_v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1"
 	"stash.appscode.dev/apimachinery/pkg/restic"
 
-	"github.com/appscode/go/flags"
 	"github.com/spf13/cobra"
 	license "go.bytebuilders.dev/license-verifier/kubernetes"
+	"gomodules.xyz/x/flags"
 	core "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"

diff --git a/pkg/root.go b/pkg/root.go
@@ -21,9 +21,9 @@ import (
 
 	"stash.appscode.dev/apimachinery/client/clientset/versioned/scheme"
 
-	"github.com/appscode/go/flags"
-	v "github.com/appscode/go/version"
 	"github.com/spf13/cobra"
+	"gomodules.xyz/x/flags"
+	v "gomodules.xyz/x/version"
 	clientsetscheme "k8s.io/client-go/kubernetes/scheme"
 	"kmodules.xyz/client-go/logs"
 	"kmodules.xyz/client-go/tools/cli"

diff --git a/pkg/util.go b/pkg/util.go
@@ -22,8 +22,8 @@ import (
 	stash "stash.appscode.dev/apimachinery/client/clientset/versioned"
 	"stash.appscode.dev/apimachinery/pkg/restic"
 
-	"github.com/appscode/go/log"
 	"github.com/codeskyblue/go-sh"
+	"gomodules.xyz/x/log"
 	core "k8s.io/api/core/v1"
 	"k8s.io/client-go/kubernetes"
 	meta_util "kmodules.xyz/client-go/meta"

diff --git a/vendor/github.com/appscode/go/encoding/json/types/array_or_int.go b/vendor/github.com/appscode/go/encoding/json/types/array_or_int.go
diff --git a/vendor/github.com/appscode/go/encoding/json/types/array_or_string.go b/vendor/github.com/appscode/go/encoding/json/types/array_or_string.go
diff --git a/vendor/github.com/appscode/go/encoding/json/types/bool_yo.go b/vendor/github.com/appscode/go/encoding/json/types/bool_yo.go
diff --git a/vendor/github.com/appscode/go/encoding/json/types/doc.go b/vendor/github.com/appscode/go/encoding/json/types/doc.go