Skip to content

Commit

Permalink
integrate operator CLI into istioctl (istio#15795)
Browse files Browse the repository at this point in the history
* Add `manifest` and `profile` subcommands to istioctl

This PR adds the istio.io/operator dependency to istio/istio along
with its transitive set of dependencies.

This PR also fixes inject_test.go with the updated k8s.io/helm
packages. strvals.ParseIntoString() function now parses boolean types
into their string equivalent, e.g. true => "true" instead of
preserving the original type. This breaks later template expansion in
some unit tests. Switch to strvals.ParseInto() which preserves the
underlying type.

* fix prometheus mixer unit tests
  • Loading branch information
ayj authored and istio-testing committed Aug 9, 2019
1 parent dd78e2a commit d1fcaf4
Show file tree
Hide file tree
Showing 774 changed files with 124,304 additions and 5,048 deletions.
66 changes: 19 additions & 47 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,7 @@ require (
contrib.go.opencensus.io/exporter/stackdriver v0.6.0
contrib.go.opencensus.io/exporter/zipkin v0.1.1
fortio.org/fortio v1.3.0
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect
github.com/Azure/go-autorest v11.1.0+incompatible // indirect
github.com/DataDog/datadog-go v2.2.0+incompatible
github.com/Masterminds/semver v1.4.0 // indirect
github.com/Masterminds/sprig v2.14.1+incompatible // indirect
github.com/Microsoft/go-winio v0.4.12 // indirect
github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect
Expand All @@ -42,20 +39,15 @@ require (
github.com/davecgh/go-spew v1.1.1
github.com/dchest/siphash v1.1.0 // indirect
github.com/denisenkom/go-mssqldb v0.0.0-20190423183735-731ef375ac02 // indirect
github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect
github.com/docker/distribution v2.7.1+incompatible // indirect
github.com/docker/docker v1.13.1
github.com/docker/go-connections v0.4.0
github.com/docker/go-units v0.4.0 // indirect
github.com/docker/spdystream v0.0.0-20170912183627-bc6354cbbc29 // indirect
github.com/dropbox/godropbox v0.0.0-20190501155911-5749d3b71cbe // indirect
github.com/duosecurity/duo_api_golang v0.0.0-20190308151101-6c680f768e74 // indirect
github.com/elazarl/go-bindata-assetfs v1.0.0 // indirect
github.com/elazarl/goproxy v0.0.0-20190421051319-9d40249d3c2f // indirect
github.com/elazarl/goproxy/ext v0.0.0-20190421051319-9d40249d3c2f // indirect
github.com/emicklei/go-restful v2.6.0+incompatible
github.com/emicklei/go-restful v2.9.3+incompatible
github.com/envoyproxy/go-control-plane v0.8.5
github.com/evanphx/json-patch v3.0.0+incompatible
github.com/evanphx/json-patch v4.2.0+incompatible
github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 // indirect
github.com/facebookgo/stackerr v0.0.0-20150612192056-c2fcf88613f4 // indirect
github.com/fatih/structs v1.1.0 // indirect
Expand All @@ -67,30 +59,22 @@ require (
github.com/go-logfmt/logfmt v0.4.0 // indirect
github.com/go-redis/redis v6.10.2+incompatible
github.com/go-sql-driver/mysql v1.4.1 // indirect
github.com/gobwas/glob v0.2.3 // indirect
github.com/gocql/gocql v0.0.0-20190423091413-b99afaf3b163 // indirect
github.com/gogo/protobuf v1.2.2-0.20190730201129-28a6bbf47e48
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
github.com/golang/groupcache v0.0.0-20180203143532-66deaeb636df // indirect
github.com/golang/protobuf v1.3.0
github.com/golang/protobuf v1.3.1
github.com/golang/sync v0.0.0-20180314180146-1d60e4601c6f
github.com/google/btree v1.0.0 // indirect
github.com/google/cel-go v0.2.0
github.com/google/go-cmp v0.3.0
github.com/google/go-github v15.0.0+incompatible
github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135 // indirect
github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf // indirect
github.com/google/uuid v0.0.0-20161128191214-064e2069ce9c
github.com/google/uuid v1.1.1
github.com/googleapis/gax-go v2.0.0+incompatible
github.com/googleapis/gax-go/v2 v2.0.4
github.com/googleapis/gnostic v0.1.0 // indirect
github.com/gophercloud/gophercloud v0.0.0-20180327194212-2daf3049f2a9 // indirect
github.com/gorilla/mux v1.7.1
github.com/gorilla/websocket v1.2.0
github.com/gotestyourself/gotestyourself v2.2.0+incompatible // indirect
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
github.com/grpc-ecosystem/go-grpc-middleware v0.0.0-20180323085839-aed189ae50cf
github.com/grpc-ecosystem/go-grpc-prometheus v0.0.0-20160910222444-6b7015e65d36
github.com/gorilla/mux v1.7.2
github.com/gorilla/websocket v1.4.0
github.com/grpc-ecosystem/go-grpc-middleware v1.0.0
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20171214222146-0e7658f8ee99
github.com/hashicorp/consul v1.3.0
github.com/hashicorp/go-hclog v0.9.0 // indirect
Expand All @@ -100,51 +84,41 @@ require (
github.com/hashicorp/go-plugin v1.0.0 // indirect
github.com/hashicorp/go-rootcerts v0.0.0-20160503143440-6bb64b370b90 // indirect
github.com/hashicorp/go-uuid v1.0.1 // indirect
github.com/hashicorp/go-version v1.2.0 // indirect
github.com/hashicorp/memberlist v0.1.3 // indirect
github.com/hashicorp/serf v0.8.1 // indirect
github.com/hashicorp/vault v0.10.0
github.com/howeyc/fsnotify v0.9.0
github.com/huandu/xstrings v1.0.0 // indirect
github.com/imdario/mergo v0.3.5 // indirect
github.com/jefferai/jsonx v1.0.0 // indirect
github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8 // indirect
github.com/json-iterator/go v0.0.0-20180914014843-2433035e5132 // indirect
github.com/juju/errors v0.0.0-20190207033735-e65537c515d7 // indirect
github.com/juju/loggo v0.0.0-20190212223446-d976af380377 // indirect
github.com/juju/testing v0.0.0-20190429233213-dfc56b8c09fc // indirect
github.com/keybase/go-crypto v0.0.0-20190416182011-b785b22cc757 // indirect
github.com/kr/pretty v0.1.0 // indirect
github.com/lestrrat-go/jwx v0.9.0
github.com/lib/pq v1.1.1 // indirect
github.com/mitchellh/copystructure v1.0.0
github.com/mitchellh/go-homedir v0.0.0-20161203194507-b8bc1bf76747
github.com/mitchellh/go-testing-interface v1.0.0 // indirect
github.com/mitchellh/reflectwalk v1.0.1 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 // indirect
github.com/natefinch/lumberjack v2.0.0+incompatible
github.com/onsi/ginkgo v1.8.0 // indirect
github.com/onsi/gomega v1.5.0
github.com/open-policy-agent/opa v0.8.2
github.com/opencontainers/go-digest v1.0.0-rc1 // indirect
github.com/opencontainers/image-spec v1.0.1 // indirect
github.com/opencontainers/runc v0.1.1 // indirect
github.com/openshift/api v0.0.0-20190322043348-8741ff068a47
github.com/opentracing/opentracing-go v1.0.2
github.com/openzipkin/zipkin-go v0.1.6
github.com/ory/dockertest v3.3.4+incompatible // indirect
github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
github.com/pborman/uuid v0.0.0-20170612153648-e790cca94e6c // indirect
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
github.com/philhofer/fwd v1.0.0 // indirect
github.com/pkg/errors v0.8.1
github.com/pmezard/go-difflib v1.0.0
github.com/pquerna/cachecontrol v0.0.0-20180306154005-525d0eb5f91d // indirect
github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829
github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f
github.com/prometheus/common v0.2.0
github.com/prometheus/prom2json v1.1.0
github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90
github.com/prometheus/common v0.4.0
github.com/prometheus/prom2json v1.2.1
github.com/ryanuber/go-glob v0.0.0-20160226084822-572520ed46db // indirect
github.com/satori/go.uuid v1.2.0
github.com/sethgrid/pester v0.0.0-20180227223404-ed9870dad317 // indirect
Expand All @@ -166,32 +140,30 @@ require (
go.uber.org/atomic v1.4.0
go.uber.org/multierr v1.1.0
go.uber.org/zap v1.10.0
golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c
golang.org/x/net v0.0.0-20190613194153-d28f0bde5980
golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4
golang.org/x/tools v0.0.0-20190328211700-ab21143f2384
google.golang.org/api v0.3.1
google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107
google.golang.org/api v0.4.0
google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb
google.golang.org/grpc v1.21.0
gopkg.in/d4l3k/messagediff.v1 v1.2.1
gopkg.in/ini.v1 v1.42.0 // indirect
gopkg.in/logfmt.v0 v0.3.0 // indirect
gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce // indirect
gopkg.in/ory-am/dockertest.v3 v3.3.4 // indirect
gopkg.in/square/go-jose.v2 v2.0.0-20180411045311-89060dee6a84
gopkg.in/square/go-jose.v2 v2.3.1
gopkg.in/stack.v1 v1.7.0 // indirect
gopkg.in/yaml.v2 v2.2.2
gotest.tools v2.2.0+incompatible // indirect
istio.io/api v0.0.0-20190808183217-0e77ec002365
istio.io/gogo-genproto v0.0.0-20190731221249-06e20ada0df2
istio.io/operator v0.0.0-20190809164250-eab4c2437592
istio.io/pkg v0.0.0-20190731230704-fcbac27d69d5
k8s.io/api v0.0.0-20190222213804-5cb15d344471
k8s.io/apiextensions-apiserver v0.0.0-20190221221350-bfb440be4b87
k8s.io/apimachinery v0.0.0-20190221213512-86fb29eff628
k8s.io/cli-runtime v0.0.0-20190221101700-11047e25a94a
k8s.io/client-go v10.0.0+incompatible
k8s.io/helm v2.9.1+incompatible
k8s.io/klog v0.3.0 // indirect
k8s.io/kube-openapi v0.0.0-20180216212618-50ae88d24ede // indirect
k8s.io/helm v2.13.1+incompatible
sigs.k8s.io/yaml v1.1.0
)
Loading

0 comments on commit d1fcaf4

Please sign in to comment.