Merge pull request #207 from meshery/dependabot/go_modules/github.com…

…/layer5io/meshkit-0.2.30 Bump github.com/layer5io/meshkit from 0.2.29 to 0.2.30
meshery · Oct 18, 2021 · d50269d · d50269d
2 parents 7a850dc + c9c111f
commit d50269d
Show file tree

Hide file tree

Showing 5 changed files with 278 additions and 199 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -25,7 +25,7 @@ jobs:
         uses: golangci/golangci-lint-action@v2
         with:
           # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
-          version: v1.32
+          version: v1.41
 
           # Optional: golangci-lint command line arguments.
           args: --skip-dirs-use-default=true

diff --git a/controllers/broker_controller.go b/controllers/broker_controller.go
@@ -46,8 +46,7 @@ type BrokerReconciler struct {
 // +kubebuilder:rbac:groups=meshery.layer5.io,resources=brokers,verbs=get;list;watch;create;update;patch;delete
 // +kubebuilder:rbac:groups=meshery.layer5.io,resources=brokers/status,verbs=get;update;patch
 
-func (r *BrokerReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
-	ctx := context.Background()
+func (r *BrokerReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
 	log := r.Log
 	log = log.WithValues("controller", "Broker")
 	log = log.WithValues("namespace", req.NamespacedName)

diff --git a/controllers/meshsync_controller.go b/controllers/meshsync_controller.go
@@ -46,8 +46,7 @@ type MeshSyncReconciler struct {
 
 // +kubebuilder:rbac:groups=meshery.layer5.io,resources=meshsyncs,verbs=get;list;watch;create;update;patch;delete
 // +kubebuilder:rbac:groups=meshery.layer5.io,resources=meshsyncs/status,verbs=get;update;patch
-func (r *MeshSyncReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
-	ctx := context.Background()
+func (r *MeshSyncReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
 	log := r.Log
 	log = log.WithValues("controller", "MeshSync")
 	log = log.WithValues("namespace", req.NamespacedName)

diff --git a/go.mod b/go.mod
@@ -14,19 +14,13 @@ require (
 	github.com/google/uuid v1.2.0 // indirect
 	github.com/gorilla/mux v1.8.0 // indirect
 	github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
-	github.com/layer5io/meshkit v0.2.29
-	github.com/lib/pq v1.9.0 // indirect
+	github.com/layer5io/meshkit v0.2.30
 	github.com/mattn/go-runewidth v0.0.9 // indirect
-	github.com/mitchellh/reflectwalk v1.0.1 // indirect
 	github.com/onsi/ginkgo v1.16.4
 	github.com/onsi/gomega v1.16.0
-	github.com/prometheus/client_golang v1.7.1 // indirect
 	github.com/rogpeppe/go-internal v1.6.2 // indirect
-	github.com/sirupsen/logrus v1.8.1 // indirect
-	golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad // indirect
-	golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1 // indirect
-	k8s.io/api v0.18.12
-	k8s.io/apimachinery v0.18.12
-	k8s.io/client-go v0.18.12
-	sigs.k8s.io/controller-runtime v0.6.4
+	k8s.io/api v0.22.2
+	k8s.io/apimachinery v0.22.2
+	k8s.io/client-go v0.22.2
+	sigs.k8s.io/controller-runtime v0.10.2
 )