From 83f181b9948980e48fe706833262bcc9f136b73a Mon Sep 17 00:00:00 2001 From: leecalcote Date: Sun, 2 Oct 2022 23:00:12 -0500 Subject: [PATCH] MeshKit upgrade Signed-off-by: leecalcote Signed-off-by: Antonette Caldwell --- .golangci.yml | 2 +- build/config.go | 4 ---- go.mod | 4 +--- go.sum | 4 ++-- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index c9e76d0..b71e082 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -79,7 +79,7 @@ linters: # - deadcode - dogsled # - dupl - - errcheck + # - errcheck # - exhaustive # - funlen # - goconst diff --git a/build/config.go b/build/config.go index 7a6c986..6dddb5d 100644 --- a/build/config.go +++ b/build/config.go @@ -33,10 +33,6 @@ func NewConfig(version string) manifests.Config { SpecPath: "spec.versions[0].schema.openAPIV3Schema.properties.spec"}, false), ExtractCrds: func(manifest string) []string { crds := strings.Split(manifest, "---") - // trim the spaces - for _, crd := range crds { - crd = strings.TrimSpace(crd) - } return crds }, } diff --git a/go.mod b/go.mod index 43a038b..8d9644b 100644 --- a/go.mod +++ b/go.mod @@ -3,19 +3,17 @@ module github.com/layer5io/meshery-traefik-mesh go 1.19 replace ( - //github.com/docker/docker => github.com/moby/moby v17.12.0-ce-rc1.0.20200618181300-9dc6525e6118+incompatible github.com/kudobuilder/kuttl => github.com/layer5io/kuttl v0.4.1-0.20200723152044-916f10574334 github.com/spf13/afero => github.com/spf13/afero v1.5.1 // Until viper bug is resolved #1161 go.opentelemetry.io/otel v1.3.0 => go.opentelemetry.io/otel v0.11.0 go.opentelemetry.io/otel/sdk v1.3.0 => go.opentelemetry.io/otel/sdk v0.11.0 gopkg.in/ini.v1 => github.com/go-ini/ini v1.62.0 -//golang.org/x/sys => golang.org/x/sys v0.0.0-20200826173525-f9321e4c35a6 ) require ( github.com/google/uuid v1.3.0 github.com/layer5io/meshery-adapter-library v0.5.10 - github.com/layer5io/meshkit v0.6.0 + github.com/layer5io/meshkit v0.6.2 github.com/layer5io/service-mesh-performance v0.3.4 gopkg.in/yaml.v2 v2.4.0 ) diff --git a/go.sum b/go.sum index 937de2f..c46777a 100644 --- a/go.sum +++ b/go.sum @@ -576,8 +576,8 @@ github.com/layer5io/learn-layer5/smi-conformance v0.0.0-20210317075357-06b4f88b3 github.com/layer5io/learn-layer5/smi-conformance v0.0.0-20210317075357-06b4f88b3e34/go.mod h1:BQPLwdJt7v7y0fXIejI4whR9zMyX07Wjt5xrbgEmHLw= github.com/layer5io/meshery-adapter-library v0.5.10 h1:Qgr6vDx2s10mkhtk7Mnz5I73m/9yf2yyjCkPMeB4jmA= github.com/layer5io/meshery-adapter-library v0.5.10/go.mod h1:Sg6WNN82uRo2kiFDEMc/LM/AJ/Pu6ZmBZGbFxZuC7zc= -github.com/layer5io/meshkit v0.6.0 h1:gDMG5k43WpaM5YgVTZFCz0zH8tmtw27z5/eiuFx5jeo= -github.com/layer5io/meshkit v0.6.0/go.mod h1:1yyleAJTOzSzTA44u3cg764Yk0+pvCUwb/KikLkjea8= +github.com/layer5io/meshkit v0.6.2 h1:QUDIuem9XN8atTfoBokuHbHyRpfpycZs6+iwbccRDlE= +github.com/layer5io/meshkit v0.6.2/go.mod h1:RRrfwtykKlT6sbAnfoXq3Fib70YQpCCAxrc9/2dhnLw= github.com/layer5io/service-mesh-performance v0.3.2-0.20210122142912-a94e0658b021/go.mod h1:W153amv8aHAeIWxO7b7d7Vibt9RhaEVh4Uh+RG+BumQ= github.com/layer5io/service-mesh-performance v0.3.4 h1:aw/elsx0wkry7SyiQRIj31wW7TPCP4YfhINdNOLXVg8= github.com/layer5io/service-mesh-performance v0.3.4/go.mod h1:W153amv8aHAeIWxO7b7d7Vibt9RhaEVh4Uh+RG+BumQ=