Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[cherry-pick] Update Kubernetes v1.18.9 dependencies (#394) #399

Merged
merged 1 commit into from
Nov 6, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/stash-postgres/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cmd/stash-postgres/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ limitations under the License.
package main

import (
v "github.com/appscode/go/version"
v "gomodules.xyz/x/version"
)

var (
Expand Down
37 changes: 28 additions & 9 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
171 changes: 94 additions & 77 deletions go.sum

Large diffs are not rendered by default.

16 changes: 6 additions & 10 deletions hack/gencrd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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{
Expand Down
2 changes: 1 addition & 1 deletion pkg/backup.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/restore.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions pkg/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
55 changes: 0 additions & 55 deletions vendor/github.com/appscode/go/encoding/json/types/array_or_int.go

This file was deleted.

This file was deleted.

33 changes: 0 additions & 33 deletions vendor/github.com/appscode/go/encoding/json/types/bool_yo.go

This file was deleted.

2 changes: 0 additions & 2 deletions vendor/github.com/appscode/go/encoding/json/types/doc.go

This file was deleted.

Loading