diff --git a/Gopkg.lock b/Gopkg.lock index 7d9f8ab9..824058e2 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -966,7 +966,7 @@ [[projects]] branch = "master" - digest = "1:50ad80e619992aab730865192c7ea1f17359a14548760bb8360180eb0797f514" + digest = "1:b9bf9be301ffbfd00981299321bddf3801a6f8c402e65bfd8411eae34f604aa8" name = "knative.dev/pkg" packages = [ "apis", @@ -985,18 +985,18 @@ "metrics/metricskey", ] pruneopts = "T" - revision = "87875e3b427a09be8c6c688811a54c43ea8be1b1" + revision = "32ea8458157368451b8e0383aafdacdf5ec061c8" [[projects]] branch = "master" - digest = "1:becb98d0dc7f7201c23df580e99e64253d79cf8894fa77bce76cfbf69009557d" + digest = "1:8bd3cae999736fca901bdd918ab9e9a899f39446701a296ade11ca44ae0a741e" name = "knative.dev/test-infra" packages = [ "scripts", "tools/dep-collector", ] pruneopts = "UT" - revision = "b09617df210766782b2b8f164476ac3887c2baec" + revision = "64615f92c4ebdd4e4423015ffc0db45877660a0d" [[projects]] digest = "1:8730e0150dfb2b7e173890c8b9868e7a273082ef8e39f4940e3506a481cf895c" diff --git a/vendor/knative.dev/pkg/Gopkg.lock b/vendor/knative.dev/pkg/Gopkg.lock index 3f615e1e..004d0727 100644 --- a/vendor/knative.dev/pkg/Gopkg.lock +++ b/vendor/knative.dev/pkg/Gopkg.lock @@ -1323,14 +1323,14 @@ [[projects]] branch = "master" - digest = "1:fdc3106893e9ad75a8615d1326df00899c519ea71684092b4a10b3260f3c0c15" + digest = "1:becb98d0dc7f7201c23df580e99e64253d79cf8894fa77bce76cfbf69009557d" name = "knative.dev/test-infra" packages = [ "scripts", "tools/dep-collector", ] pruneopts = "UT" - revision = "ae2eca5b05181add212724579f1d85d3b104cdd7" + revision = "b09617df210766782b2b8f164476ac3887c2baec" [[projects]] digest = "1:8730e0150dfb2b7e173890c8b9868e7a273082ef8e39f4940e3506a481cf895c" diff --git a/vendor/knative.dev/pkg/apis/duck/v1alpha1/addressable_types.go b/vendor/knative.dev/pkg/apis/duck/v1alpha1/addressable_types.go index 4b39edf7..d0a81db8 100644 --- a/vendor/knative.dev/pkg/apis/duck/v1alpha1/addressable_types.go +++ b/vendor/knative.dev/pkg/apis/duck/v1alpha1/addressable_types.go @@ -82,7 +82,13 @@ func (*Addressable) GetFullType() duck.Populatable { // ConvertUp implements apis.Convertible func (a *Addressable) ConvertUp(ctx context.Context, to apis.Convertible) error { - url := a.URL + var url *apis.URL + if a.URL != nil { + url = a.URL + } else if a.Hostname != "" { + u := a.GetURL() + url = &u + } switch sink := to.(type) { case *v1.Addressable: sink.URL = url.DeepCopy() diff --git a/vendor/knative.dev/test-infra/scripts/README.md b/vendor/knative.dev/test-infra/scripts/README.md index 2e7ef3a1..87286fc2 100644 --- a/vendor/knative.dev/test-infra/scripts/README.md +++ b/vendor/knative.dev/test-infra/scripts/README.md @@ -308,8 +308,8 @@ This is a helper script for Knative release scripts. To use it: `knative-nightly/` will be used. It is empty if `--publish` was not passed. - `RELEASE_DIR`: contains the directory to store the manifests if - `--release-dir` was passed. Defaults to empty value, but if - `--nopublish` was passed then points to the repository root directory. + `--release-dir` was passed. Defaults to empty value, but if `--nopublish` + was passed then points to the repository root directory. - `BUILD_COMMIT_HASH`: the commit short hash for the current repo. If the current git tree is dirty, it will have `-dirty` appended to it. - `BUILD_YYYYMMDD`: current UTC date in `YYYYMMDD` format. diff --git a/vendor/knative.dev/test-infra/scripts/library.sh b/vendor/knative.dev/test-infra/scripts/library.sh index 0c921580..d2715650 100755 --- a/vendor/knative.dev/test-infra/scripts/library.sh +++ b/vendor/knative.dev/test-infra/scripts/library.sh @@ -135,8 +135,8 @@ function wait_until_pods_running() { local failed_pod="" for i in {1..150}; do # timeout after 5 minutes local pods="$(kubectl get pods --no-headers -n $1 2>/dev/null)" - # All pods must be running - local not_running_pods=$(echo "${pods}" | grep -v Running | grep -v Completed) + # All pods must be running (ignore ImagePull error to allow the pod to retry) + local not_running_pods=$(echo "${pods}" | grep -v Running | grep -v Completed | grep -v ErrImagePull | grep -v ImagePullBackOff) if [[ -n "${pods}" ]] && [[ -z "${not_running_pods}" ]]; then # All Pods are running or completed. Verify the containers on each Pod. local all_ready=1