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.

Sign up for GitHub

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

Jump to bottom

Bump github.com/layer5io/meshkit from 0.2.29 to 0.2.30 #207

Merged
merged 9 commits into from
Oct 18, 2021
Merged

Bump github.com/layer5io/meshkit from 0.2.29 to 0.2.30 #207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0d23d4f
Bump github.com/layer5io/meshkit from 0.2.29 to 0.2.30
dependabot[bot] Oct 10, 2021
ba69ba8
Update controller Reconcile function signature
panyuenlau Oct 11, 2021
fc527c4
Upgrade controller-runtime and Kubernetes dependencies
panyuenlau Oct 11, 2021
907aa6c
temporarily enable CI for PRs against non-master branches
DelusionalOptimist Oct 11, 2021
a5ee620
Revert "temporarily enable CI for PRs against non-master branches"
DelusionalOptimist Oct 11, 2021
070a9f4
Merge pull request #208 from panyuenlau/dependabot/go_modules/github.…
DelusionalOptimist Oct 17, 2021
ee0c6e5
Merge branch 'master' into dependabot/go_modules/github.com/layer5io/…
leecalcote Oct 18, 2021
01af85f
golintci upgrade
leecalcote Oct 18, 2021
c9c111f
Merge branch 'master' into dependabot/go_modules/github.com/layer5io/…
leecalcote Oct 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions controllers/broker_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 1 addition & 2 deletions controllers/meshsync_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
16 changes: 5 additions & 11 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)