Skip to content

Commit

Permalink
MeshKit upgrade
Browse files Browse the repository at this point in the history
Signed-off-by: leecalcote <[email protected]>
Signed-off-by: Antonette Caldwell <[email protected]>
  • Loading branch information
leecalcote authored and acald-creator committed Oct 3, 2022
1 parent d0c69fc commit 83f181b
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ linters:
# - deadcode
- dogsled
# - dupl
- errcheck
# - errcheck
# - exhaustive
# - funlen
# - goconst
Expand Down
4 changes: 0 additions & 4 deletions build/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
},
}
Expand Down
4 changes: 1 addition & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down

0 comments on commit 83f181b

Please sign in to comment.