diff --git a/Gopkg.lock b/Gopkg.lock index d7ce91d..4f0b987 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -123,17 +123,6 @@ pruneopts = "UT" revision = "3a771d992973f24aa725d07868b467d1ddfceafb" -[[projects]] - branch = "master" - digest = "1:7310ec5042e3a0dd73ed9f23f812e73ce0ae88d08039e4473472ebba20bf2996" - name = "github.com/bxcodec/faker" - packages = [ - ".", - "support/slice", - ] - pruneopts = "UT" - revision = "bf89c38ff1742f295e15df0bd5e8b3e81da95855" - [[projects]] branch = "master" digest = "1:95e08278c876d185ba67533f045e9e63b3c9d02cbd60beb0f4dbaa2344a13ac2" @@ -228,7 +217,7 @@ version = "v1.12.0" [[projects]] - digest = "1:47d2eab2d709f99ed4eb0c4994c7d8cdf4e0dc1627cbced538de02c40d7cbb46" + digest = "1:e2d9a059a120aa2d731b81d92a6f7c460d6577324a1036c46d7e9e28f532615c" name = "github.com/envoyproxy/go-control-plane" packages = [ "envoy/api/v2", @@ -242,8 +231,16 @@ "envoy/type", ] pruneopts = "UT" - revision = "0ad6fa1cf0b9b6ca8f3617a7188a568e81f40b87" - version = "v0.6.9" + revision = "c7e2a120463a2209c6a0871d778f4eab96457e6b" + version = "v0.8.1" + +[[projects]] + digest = "1:743f8008a7fed04ef0d52261aef346766bbd5b3e360b90296d85289f8ef5c2e2" + name = "github.com/envoyproxy/protoc-gen-validate" + packages = ["validate"] + pruneopts = "UT" + revision = "9eff07ddfcb4001aa1aab280648153f46e1a8ddc" + version = "v0.1.0" [[projects]] digest = "1:f1f2bd73c025d24c3b93abf6364bccb802cf2fdedaa44360804c67800e8fab8d" @@ -743,14 +740,6 @@ revision = "5c8c8bd35d3832f5d134ae1e1e375b69a4d25242" version = "v1.0.1" -[[projects]] - digest = "1:dfe5159383dfcd370555c35374ac99022906f987b55cc65a830fb9ced970b4b1" - name = "github.com/lyft/protoc-gen-validate" - packages = ["validate"] - pruneopts = "UT" - revision = "930a67cf7ba41b9d9436ad7a1be70a5d5ff6e1fc" - version = "v0.0.6" - [[projects]] branch = "master" digest = "1:84a5a2b67486d5d67060ac393aa255d05d24ed5ee41daecd5635ec22657b6492" @@ -1041,7 +1030,7 @@ version = "v1.0.0" [[projects]] - digest = "1:a8019ff2f27a9226ea0b45107ddce1e161e99f0fa88efea6239f188778b98545" + digest = "1:8f24c086ff5e1d982486bf14b4e8a6ca9cf36d3b751ed202dd865290755a5882" name = "github.com/solo-io/gloo" packages = [ "install/helm/gloo/generate", @@ -1067,13 +1056,14 @@ "projects/gloo/pkg/api/v1/plugins/rest", "projects/gloo/pkg/api/v1/plugins/retries", "projects/gloo/pkg/api/v1/plugins/static", + "projects/gloo/pkg/api/v1/plugins/stats", "projects/gloo/pkg/api/v1/plugins/transformation", "projects/gloo/pkg/bootstrap", "projects/gloo/pkg/defaults", ] pruneopts = "UT" - revision = "b299683584939bd52f85279556037c6b67c19dab" - version = "v0.13.29" + revision = "c1794e77ca6473990aaf3394ca0a41fa6f6fe94e" + version = "v0.14.2" [[projects]] digest = "1:699918466a9758902a14923851a7fbd230500f93da6982dae7c79959afb0a664" @@ -1109,9 +1099,16 @@ version = "v0.8.16" [[projects]] - digest = "1:c886cb30b84598c711f6431ce44feb921ffa3534f6193dddc655835c983c0807" + digest = "1:e31ff9161d32979778477e5b08aba2618465c533d44f715387df26afa25b9e6c" name = "github.com/solo-io/solo-kit" packages = [ + "api/external/kubernetes/configmap", + "api/external/kubernetes/customresourcedefinition", + "api/external/kubernetes/deployment", + "api/external/kubernetes/namespace", + "api/external/kubernetes/pod", + "api/external/kubernetes/service", + "pkg/api/external/kubernetes/service", "pkg/api/v1/clients", "pkg/api/v1/clients/common", "pkg/api/v1/clients/configmap", @@ -1137,6 +1134,7 @@ "pkg/api/v1/reconcile", "pkg/api/v1/reporter", "pkg/api/v1/resources", + "pkg/api/v1/resources/common/kubernetes", "pkg/api/v1/resources/core", "pkg/code-generator", "pkg/code-generator/cmd", @@ -1158,8 +1156,8 @@ "test/tests/typed", ] pruneopts = "UT" - revision = "f40d30112db04fbd2cc4ba85f9df66af3607f344" - version = "v0.9.6" + revision = "d0edbeb14aaaaa8066db72d95911782a9c51b3ba" + version = "v0.9.13" [[projects]] digest = "1:3e39bafd6c2f4bf3c76c3bfd16a2e09e016510ad5db90dc02b88e2f565d6d595" @@ -2196,7 +2194,6 @@ "github.com/solo-io/solo-kit/pkg/code-generator/cmd", "github.com/solo-io/solo-kit/pkg/code-generator/docgen/options", "github.com/solo-io/solo-kit/pkg/errors", - "github.com/solo-io/solo-kit/pkg/utils/kubeutils", "github.com/solo-io/solo-kit/test/helpers", "github.com/solo-io/solo-kit/test/tests/typed", "github.com/spf13/cobra", diff --git a/Gopkg.toml b/Gopkg.toml index b121959..5b6c892 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -49,7 +49,7 @@ [[constraint]] name = "github.com/solo-io/gloo" - version = "0.13.25" + version = "0.14.1" [[override]] name = "github.com/hashicorp/consul" diff --git a/changelog/v0.2.8/dep-update.yaml b/changelog/v0.2.8/dep-update.yaml new file mode 100644 index 0000000..3f34d9f --- /dev/null +++ b/changelog/v0.2.8/dep-update.yaml @@ -0,0 +1,6 @@ +changelog: + - type: DEPENDENCY_BUMP + dependencyOwner: solo-io + dependencyRepo: gloo + dependencyTag: v0.14.1 + description: Update gloo to version v0.14.1 diff --git a/cli/pkg/cmd/resolvermap/resolvermap_register.go b/cli/pkg/cmd/resolvermap/resolvermap_register.go index d940eec..5265aa5 100644 --- a/cli/pkg/cmd/resolvermap/resolvermap_register.go +++ b/cli/pkg/cmd/resolvermap/resolvermap_register.go @@ -3,7 +3,7 @@ package resolvermap import ( "fmt" - glooV1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1" + gloov1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1" "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/plugins/rest" "github.com/solo-io/go-utils/cliutils" "github.com/solo-io/solo-kit/pkg/api/v1/clients" @@ -69,15 +69,17 @@ func registerResolver(opts *options.Options) error { GlooResolver: &v1.GlooResolver{ ResponseTemplate: responseTemplate, RequestTemplate: requestTemplate, - Action: &glooV1.RouteAction{ - Destination: &glooV1.RouteAction_Single{ - Single: &glooV1.Destination{ - Upstream: core.ResourceRef{ - Name: opts.ResolverMap.Upstream, - Namespace: opts.Metadata.Namespace, + Action: &gloov1.RouteAction{ + Destination: &gloov1.RouteAction_Single{ + Single: &gloov1.Destination{ + DestinationType: &gloov1.Destination_Upstream{ + Upstream: &core.ResourceRef{ + Name: opts.ResolverMap.Upstream, + Namespace: opts.Metadata.Namespace, + }, }, - DestinationSpec: &glooV1.DestinationSpec{ - DestinationType: &glooV1.DestinationSpec_Rest{ + DestinationSpec: &gloov1.DestinationSpec{ + DestinationType: &gloov1.DestinationSpec_Rest{ Rest: &rest.DestinationSpec{ FunctionName: opts.ResolverMap.Function, }, diff --git a/pkg/translator/translator.go b/pkg/translator/translator.go index 5b4f2c6..5d42783 100644 --- a/pkg/translator/translator.go +++ b/pkg/translator/translator.go @@ -53,7 +53,7 @@ func Translate(writeNamespace string, snap *v1.ApiSnapshot, resourceErrs reporte }, }, // TODO(ilackarms / yuval-k): decide if we need ssl for connecting to sidecar - SslConfiguations: nil, + SslConfigurations: nil, }, }, } diff --git a/test/testdata/utils.go b/test/testdata/utils.go index c6c58d0..610c002 100644 --- a/test/testdata/utils.go +++ b/test/testdata/utils.go @@ -1,7 +1,7 @@ package testdata import ( - glooV1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1" + gloov1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1" "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/plugins/rest" "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" v1 "github.com/solo-io/sqoop/pkg/api/v1" @@ -27,14 +27,16 @@ func StarWarsResolverMap() *v1.ResolverMap { resolverMap := translator.GenerateResolverMapSkeleton(resolverMetadata, StarWarsSchema) resolverMap.Types["Query"].Fields["hero"].Resolver = &v1.FieldResolver_GlooResolver{ GlooResolver: &v1.GlooResolver{ - Action: &glooV1.RouteAction{ - Destination: &glooV1.RouteAction_Single{ - Single: &glooV1.Destination{ - Upstream: core.ResourceRef{ - Name: "starwars-rest", + Action: &gloov1.RouteAction{ + Destination: &gloov1.RouteAction_Single{ + Single: &gloov1.Destination{ + DestinationType: &gloov1.Destination_Upstream{ + Upstream: &core.ResourceRef{ + Name: "starwars-rest", + }, }, - DestinationSpec: &glooV1.DestinationSpec{ - DestinationType: &glooV1.DestinationSpec_Rest{ + DestinationSpec: &gloov1.DestinationSpec{ + DestinationType: &gloov1.DestinationSpec_Rest{ Rest: &rest.DestinationSpec{ FunctionName: "GetHero", }, @@ -50,14 +52,16 @@ func StarWarsResolverMap() *v1.ResolverMap { RequestTemplate: &v1.RequestTemplate{ Body: `{"id": {{ index .Args "id" }}}`, }, - Action: &glooV1.RouteAction{ - Destination: &glooV1.RouteAction_Single{ - Single: &glooV1.Destination{ - Upstream: core.ResourceRef{ - Name: "starwars-rest", + Action: &gloov1.RouteAction{ + Destination: &gloov1.RouteAction_Single{ + Single: &gloov1.Destination{ + DestinationType: &gloov1.Destination_Upstream{ + Upstream: &core.ResourceRef{ + Name: "starwars-rest", + }, }, - DestinationSpec: &glooV1.DestinationSpec{ - DestinationType: &glooV1.DestinationSpec_Rest{ + DestinationSpec: &gloov1.DestinationSpec{ + DestinationType: &gloov1.DestinationSpec_Rest{ Rest: &rest.DestinationSpec{ FunctionName: "GetCharacter", }, @@ -73,14 +77,16 @@ func StarWarsResolverMap() *v1.ResolverMap { RequestTemplate: &v1.RequestTemplate{ Body: `{"id": {{ index .Args "id" }}}`, }, - Action: &glooV1.RouteAction{ - Destination: &glooV1.RouteAction_Single{ - Single: &glooV1.Destination{ - Upstream: core.ResourceRef{ - Name: "starwars-rest", + Action: &gloov1.RouteAction{ + Destination: &gloov1.RouteAction_Single{ + Single: &gloov1.Destination{ + DestinationType: &gloov1.Destination_Upstream{ + Upstream: &core.ResourceRef{ + Name: "starwars-rest", + }, }, - DestinationSpec: &glooV1.DestinationSpec{ - DestinationType: &glooV1.DestinationSpec_Rest{ + DestinationSpec: &gloov1.DestinationSpec{ + DestinationType: &gloov1.DestinationSpec_Rest{ Rest: &rest.DestinationSpec{ FunctionName: "GetCharacter", }, @@ -96,14 +102,16 @@ func StarWarsResolverMap() *v1.ResolverMap { RequestTemplate: &v1.RequestTemplate{ Body: `{{ marshal (index .Parent "friend_ids") }}`, }, - Action: &glooV1.RouteAction{ - Destination: &glooV1.RouteAction_Single{ - Single: &glooV1.Destination{ - Upstream: core.ResourceRef{ - Name: "starwars-rest", + Action: &gloov1.RouteAction{ + Destination: &gloov1.RouteAction_Single{ + Single: &gloov1.Destination{ + DestinationType: &gloov1.Destination_Upstream{ + Upstream: &core.ResourceRef{ + Name: "starwars-rest", + }, }, - DestinationSpec: &glooV1.DestinationSpec{ - DestinationType: &glooV1.DestinationSpec_Rest{ + DestinationSpec: &gloov1.DestinationSpec{ + DestinationType: &gloov1.DestinationSpec_Rest{ Rest: &rest.DestinationSpec{ FunctionName: "GetCharacters", },