Use k8s 1.21.0 toolchain

Signed-off-by: Tamal Saha <tamal@appscode.com>

Author: tamalsaha

cmd/stash-mysql/main.go

@@ -23,9 +23,9 @@ import (
 	_ "stash.appscode.dev/apimachinery/client/clientset/versioned/fake"
 	"stash.appscode.dev/mysql/pkg"
 
-	"gomodules.xyz/x/log"
 	_ "k8s.io/client-go/kubernetes/fake"
 	_ "k8s.io/client-go/plugin/pkg/client/auth"
+	"k8s.io/klog/v2"
 	"kmodules.xyz/client-go/logs"
 )
 
@@ -38,6 +38,6 @@ func main() {
 	}
 
 	if err := pkg.NewRootCmd().Execute(); err != nil {
-		log.Fatalln("error:", err)
+		klog.Fatalln("error:", err)
 	}
 }

go.mod

@@ -1,28 +1,22 @@
 module stash.appscode.dev/mysql
 
-go 1.12
+go 1.15
 
 require (
 	github.com/codeskyblue/go-sh v0.0.0-20200712050446-30169cf553fe
-	github.com/spf13/cobra v1.1.1
-	go.bytebuilders.dev/license-verifier/kubernetes v0.9.0
-	gomodules.xyz/x v0.0.0-20201105065653-91c568df6331
+	github.com/spf13/cobra v1.1.3
+	go.bytebuilders.dev/license-verifier/kubernetes v0.9.1
+	gomodules.xyz/x v0.0.3
 	k8s.io/api v0.21.0
 	k8s.io/apimachinery v0.21.0
 	k8s.io/client-go v0.21.0
-	k8s.io/kubernetes v1.21.0 // indirect
-	kmodules.xyz/client-go v0.0.0-20210429233600-944c5ec810d6
-	kmodules.xyz/custom-resources v0.0.0-20210427204948-b63e86e6b5f6
-	kmodules.xyz/objectstore-api v0.0.0-20210427073544-4d4b3fd133fe // indirect
-	kmodules.xyz/offshoot-api v0.0.0-20210427074508-992086875c1e
-	kmodules.xyz/prober v0.0.0-20210427091238-7208ea3e0584 // indirect
-	stash.appscode.dev/apimachinery v0.12.3
+	k8s.io/klog/v2 v2.8.0
+	kmodules.xyz/client-go v0.0.0-20210504024435-1eb80721e9b8
+	kmodules.xyz/custom-resources v0.0.0-20210504034124-54c54fcdb690
+	kmodules.xyz/offshoot-api v0.0.0-20210504040651-7951e351f0f5
+	stash.appscode.dev/apimachinery v0.13.1-0.20210504142328-ae1654642a82
 )
 
-replace git.apache.org/thrift.git => github.com/apache/thrift v0.13.0
-
-replace github.com/Azure/go-autorest/autorest/azure/auth => github.com/Azure/go-autorest/autorest/azure/auth v0.2.0
-
 replace bitbucket.org/ww/goautoneg => gomodules.xyz/goautoneg v0.0.0-20120707110453-a547fc61f48d
 
 replace cloud.google.com/go => cloud.google.com/go v0.54.0
@@ -59,6 +53,10 @@ 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.6.0
 
+replace github.com/docker/distribution => github.com/docker/distribution v0.0.0-20191216044856-a8371794149d
+
+replace github.com/docker/docker => github.com/moby/moby v17.12.0-ce-rc1.0.20200618181300-9dc6525e6118+incompatible
+
 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
@@ -103,7 +101,7 @@ replace google.golang.org/genproto => google.golang.org/genproto v0.0.0-20201110
 
 replace google.golang.org/grpc => google.golang.org/grpc v1.27.1
 
-replace helm.sh/helm/v3 => github.com/kubepack/helm/v3 v3.1.0-rc.1.0.20210427034123-21364f60dbb1
+replace helm.sh/helm/v3 => github.com/kubepack/helm/v3 v3.1.0-rc.1.0.20210503022716-7e2d4913a125
 
 replace k8s.io/api => k8s.io/api v0.21.0
 
@@ -117,7 +115,7 @@ replace k8s.io/client-go => k8s.io/client-go v0.21.0
 
 replace k8s.io/component-base => k8s.io/component-base v0.21.0
 
-replace k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd
+replace k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7
 
 replace k8s.io/kubernetes => github.com/kmodules/kubernetes v1.22.0-alpha.0.0.20210427080452-22d2e66bae50
 

go.sum

@@ -42,5 +42,5 @@ while IFS=/ read -r -u9 repo branch; do
         --labels automerge \
         --message "[cherry-pick] $(git show -s --format=%s)" \
         --message "$(git show -s --format=%b | sed --expression='/\/cherry-pick/d')" || true
-    sleep 2
+    sleep 15
 done 9< <(git branch -r | grep release)

hack/scripts/cherry-pick.sh

@@ -24,9 +24,9 @@ import (
 	"stash.appscode.dev/apimachinery/pkg/restic"
 
 	"github.com/codeskyblue/go-sh"
-	"gomodules.xyz/x/log"
 	core "k8s.io/api/core/v1"
 	"k8s.io/client-go/kubernetes"
+	"k8s.io/klog/v2"
 	"kmodules.xyz/custom-resources/apis/appcatalog/v1alpha1"
 	appcatalog_cs "kmodules.xyz/custom-resources/client/clientset/versioned"
 )
@@ -58,7 +58,7 @@ type mysqlOptions struct {
 }
 
 func (opt *mysqlOptions) waitForDBReady(appBinding *v1alpha1.AppBinding, secret *core.Secret) error {
-	log.Infoln("Waiting for the database to be ready.....")
+	klog.Infoln("Waiting for the database to be ready.....")
 	shell := sh.NewSession()
 	shell.SetEnv(EnvMySqlPassword, string(secret.Data[MySqlPassword]))
 	args := []interface{}{