From 30c1a0fea84137e70ca73d21bf39cb72d3f11d5d Mon Sep 17 00:00:00 2001 From: mattmoor-sockpuppet Date: Fri, 30 Aug 2019 07:12:51 -0700 Subject: [PATCH] Auto-update dependencies (#85) Produced via: `dep ensure -update knative.dev/test-infra knative.dev/pkg` /assign mattmoor --- Gopkg.lock | 6 +++--- vendor/knative.dev/pkg/Gopkg.lock | 4 ++-- vendor/knative.dev/pkg/test/ingress/ingress.go | 10 +++++----- vendor/knative.dev/pkg/test/spoof/spoof.go | 4 ++-- vendor/knative.dev/pkg/third_party/mako/README.md | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index 0fbdf96c..5bb868e9 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -927,7 +927,7 @@ [[projects]] branch = "master" - digest = "1:41481f052bf6423d8d190b1c77f1409535c660decc1ccc284f2a70fe910bc2b7" + digest = "1:c695f3415658f521f10bd3c3ed7f9a86433eafb2ca554ba64c2160d05c9633b0" name = "knative.dev/pkg" packages = [ "apis", @@ -946,7 +946,7 @@ "metrics/metricskey", ] pruneopts = "T" - revision = "c1d6e0d59837e7fc5084fb374786dd1f88cf5d88" + revision = "0c1c6db1df9ea2343a6dbf1290e4325682fcf85d" [[projects]] branch = "master" @@ -957,7 +957,7 @@ "tools/dep-collector", ] pruneopts = "UT" - revision = "89eac9b9bdd8897c246cbd9383e19e3be23146d3" + revision = "90a447afb0f4562ff89ac2975334aefcf864d21d" [solve-meta] analyzer-name = "dep" diff --git a/vendor/knative.dev/pkg/Gopkg.lock b/vendor/knative.dev/pkg/Gopkg.lock index 8aa32a82..895ac986 100644 --- a/vendor/knative.dev/pkg/Gopkg.lock +++ b/vendor/knative.dev/pkg/Gopkg.lock @@ -1243,7 +1243,7 @@ [[projects]] branch = "master" - digest = "1:aa89a7d5efa637489243514d2fb2babe11b03e3f523db43cdf074147928f529f" + digest = "1:4da19f1792b6cfdb27f86853678ae81024580b33320e0a947369908584c37681" name = "knative.dev/test-infra" packages = [ "scripts", @@ -1253,7 +1253,7 @@ "tools/dep-collector", ] pruneopts = "UT" - revision = "d7182fdc8d03f19b78b96e4aa3e94d831facf4d0" + revision = "89eac9b9bdd8897c246cbd9383e19e3be23146d3" [[projects]] digest = "1:8730e0150dfb2b7e173890c8b9868e7a273082ef8e39f4940e3506a481cf895c" diff --git a/vendor/knative.dev/pkg/test/ingress/ingress.go b/vendor/knative.dev/pkg/test/ingress/ingress.go index abca19be..af298a99 100644 --- a/vendor/knative.dev/pkg/test/ingress/ingress.go +++ b/vendor/knative.dev/pkg/test/ingress/ingress.go @@ -31,8 +31,8 @@ const ( istioIngressName = "istio-ingressgateway" ) -// GetIngressEndpoint gets the endpoint IP or hostname to use for the service. -func GetIngressEndpoint(kubeClientset *kubernetes.Clientset) (*string, error) { +// GetIngressEndpoint gets the ingress public IP or hostname. +func GetIngressEndpoint(kubeClientset *kubernetes.Clientset) (string, error) { ingressName := istioIngressName if gatewayOverride := os.Getenv("GATEWAY_OVERRIDE"); gatewayOverride != "" { ingressName = gatewayOverride @@ -44,13 +44,13 @@ func GetIngressEndpoint(kubeClientset *kubernetes.Clientset) (*string, error) { ingress, err := kubeClientset.CoreV1().Services(ingressNamespace).Get(ingressName, metav1.GetOptions{}) if err != nil { - return nil, err + return "", err } endpoint, err := EndpointFromService(ingress) if err != nil { - return nil, err + return "", err } - return &endpoint, nil + return endpoint, nil } // EndpointFromService extracts the endpoint from the service's ingress. diff --git a/vendor/knative.dev/pkg/test/spoof/spoof.go b/vendor/knative.dev/pkg/test/spoof/spoof.go index 60ffefca..125a37a9 100644 --- a/vendor/knative.dev/pkg/test/spoof/spoof.go +++ b/vendor/knative.dev/pkg/test/spoof/spoof.go @@ -119,7 +119,7 @@ func ResolveEndpoint(kubeClientset *kubernetes.Clientset, domain string, resolva // If the domain is resolvable, we can use it directly when we make requests. endpoint := domain if !resolvable { - e := &endpointOverride + e := endpointOverride if endpointOverride == "" { var err error // If the domain that the Route controller is configured to assign to Route.Status.Domain @@ -129,7 +129,7 @@ func ResolveEndpoint(kubeClientset *kubernetes.Clientset, domain string, resolva return "", err } } - endpoint = *e + endpoint = e } return endpoint, nil } diff --git a/vendor/knative.dev/pkg/third_party/mako/README.md b/vendor/knative.dev/pkg/third_party/mako/README.md index 73531cfb..fca53fd6 100644 --- a/vendor/knative.dev/pkg/third_party/mako/README.md +++ b/vendor/knative.dev/pkg/third_party/mako/README.md @@ -1,5 +1,5 @@ -This is used by the Mako stub sidecar in test/mako/stub-sidecar. Once that -code is removed, this can also be removed. +This is used by the Mako stub sidecar in test/mako/stub-sidecar. Once that code +is removed, this can also be removed. It's here because Mako's quickstore service proto is under an internal directory, and Go refuses to import packages marked internal.