Skip to content

Commit

Permalink
Merge pull request #142 from layer5io/kumarabd/feature/labs
Browse files Browse the repository at this point in the history
fixes for smi
  • Loading branch information
leecalcote authored Oct 29, 2020
2 parents 11e2c6a + 72565e4 commit 33dac29
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 320 deletions.
6 changes: 1 addition & 5 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,13 @@ require (
github.com/ghodss/yaml v1.0.0
github.com/golang/protobuf v1.4.2
github.com/gophercloud/gophercloud v0.4.0 // indirect
github.com/layer5io/gokit v0.1.12
github.com/layer5io/learn-layer5/smi-conformance v0.0.0-20200916172547-79cf11334bd7
github.com/layer5io/gokit v0.1.16
github.com/onsi/ginkgo v1.13.0 // indirect
github.com/pkg/errors v0.9.1
github.com/sirupsen/logrus v1.6.0
golang.org/x/net v0.0.0-20200927032502-5d4f70055728
google.golang.org/grpc v1.32.0
helm.sh/helm/v3 v3.3.1
istio.io/client-go v0.0.0-20200708142230-d7730fd90478
k8s.io/api v0.18.8
k8s.io/apimachinery v0.18.8
k8s.io/client-go v0.18.8
rsc.io/letsencrypt v0.0.3 // indirect
)
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -516,11 +516,11 @@ github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 h1:SOEGU9fKiNWd/HOJuq
github.com/lann/builder v0.0.0-20180802200727-47ae307949d0/go.mod h1:dXGbAdH5GtBTC4WfIxhKZfyBF/HBFgRZSWwZ9g/He9o=
github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 h1:P6pPBnrTSX3DEVR4fDembhRWSsG5rVo6hYhAB/ADZrk=
github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0/go.mod h1:vmVJ0l/dxyfGW6FmdpVm2joNMFikkuWg0EoCKLGUMNw=
github.com/layer5io/gokit v0.1.12 h1:QGfoOHfiOpvPaCg1sGFM8ZuatXsgCkWGPD7GVVVQMyY=
github.com/layer5io/gokit v0.1.12/go.mod h1:kqwXJ5JZqHv74UCH1pVyDdpLT8muaUyRVu58WWu6wcY=
github.com/layer5io/gokit v0.1.16 h1:EHwYsDi7jBKXIZI4Fes9yMPiTDo+5IyXIwAC9nw5JH4=
github.com/layer5io/gokit v0.1.16/go.mod h1:teEDjx0chMsXpV1ZvIkGM3Q7qi+aCstzan/OWoZgmvU=
github.com/layer5io/kuttl v0.4.1-0.20200723152044-916f10574334/go.mod h1:UmrVd7x+bNVKrpmKgTtfRiTKHZeNPcMjQproJ0vGwhE=
github.com/layer5io/learn-layer5/smi-conformance v0.0.0-20200916172547-79cf11334bd7 h1:jglAwWM8pbUN43HL3tpFYPkWLFNpj1/ZsJISdqKhavg=
github.com/layer5io/learn-layer5/smi-conformance v0.0.0-20200916172547-79cf11334bd7/go.mod h1:LpewBZnN0QDRcC2fDiBVK+iByfFyf2HJM1B2h0rTMZo=
github.com/layer5io/learn-layer5/smi-conformance v0.0.0-20201022191033-40468652a54f h1:ZwVdDIb9RRXCRfRNUGOgwcyn5WrjfJi7NV64SwQ0Gvo=
github.com/layer5io/learn-layer5/smi-conformance v0.0.0-20201022191033-40468652a54f/go.mod h1:LpewBZnN0QDRcC2fDiBVK+iByfFyf2HJM1B2h0rTMZo=
github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
github.com/lib/pq v1.7.0 h1:h93mCPfUSkaul3Ka/VG8uZdmW1uMHDGxzu0NWHuJmHY=
Expand Down
32 changes: 0 additions & 32 deletions istio/smi/error.go

This file was deleted.

278 changes: 0 additions & 278 deletions istio/smi/smi.go

This file was deleted.

2 changes: 1 addition & 1 deletion istio/smi_conformance.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"encoding/json"
"fmt"

"github.com/layer5io/meshery-istio/istio/smi"
"github.com/layer5io/gokit/smi"
"github.com/layer5io/meshery-istio/meshes"
)

Expand Down

0 comments on commit 33dac29

Please sign in to comment.