diff --git a/go.mod b/go.mod index c4404db05..49ad171c8 100644 --- a/go.mod +++ b/go.mod @@ -22,11 +22,11 @@ require ( k8s.io/cli-runtime v0.18.8 k8s.io/client-go v11.0.1-0.20190805182717-6502b5e7b1b5+incompatible k8s.io/code-generator v0.18.12 - knative.dev/eventing v0.19.1-0.20201117202251-be93f9495205 - knative.dev/hack v0.0.0-20201112185459-01a34c573bd8 - knative.dev/networking v0.0.0-20201117214051-8e7d4b6f6175 - knative.dev/pkg v0.0.0-20201117221452-0fccc54273ed - knative.dev/serving v0.19.1-0.20201118010952-d68e60811674 + knative.dev/eventing v0.19.1-0.20201124020934-518010ed7378 + knative.dev/hack v0.0.0-20201120192952-353db687ec5b + knative.dev/networking v0.0.0-20201124014134-a79c9d045b05 + knative.dev/pkg v0.0.0-20201124023135-49e55c9eb816 + knative.dev/serving v0.19.1-0.20201124025434-f19b58586067 sigs.k8s.io/yaml v1.2.0 ) diff --git a/go.sum b/go.sum index 19a119f06..50576fbf4 100644 --- a/go.sum +++ b/go.sum @@ -559,6 +559,8 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= github.com/onsi/gomega v1.10.1 h1:o0+MgICZLuZ7xjH7Vx6zS/zcu93/BEp1VwkIW1mEXCE= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= +github.com/onsi/gomega v1.10.2 h1:aY/nuoWlKJud2J6U0E3NWsjlg+0GtwXxgEqthRdzlcs= +github.com/onsi/gomega v1.10.2/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= @@ -1025,6 +1027,7 @@ golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= golang.org/x/tools v0.0.0-20200916195026-c9a70fc28ce3 h1:DywqrEscRX7O2phNjkT0L6lhHKGBoMLCNX+XcAe7t6s= golang.org/x/tools v0.0.0-20200916195026-c9a70fc28ce3/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= +golang.org/x/tools v0.0.0-20200918201133-e94ab7288189/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= golang.org/x/tools v0.0.0-20201022035929-9cf592e881e9 h1:sEvmEcJVKBNUvgCUClbUQeHOAa9U0I2Ce1BooMvVCY4= golang.org/x/tools v0.0.0-20201022035929-9cf592e881e9/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -1186,7 +1189,6 @@ honnef.co/go/tools v0.0.1-2020.1.5 h1:nI5egYTGJakVyOryqLs1cQO5dO0ksin5XXs2pspk75 honnef.co/go/tools v0.0.1-2020.1.5/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= k8s.io/api v0.18.8 h1:aIKUzJPb96f3fKec2lxtY7acZC9gQNDLVhfSGpxBAC4= k8s.io/api v0.18.8/go.mod h1:d/CXqwWv+Z2XEG1LgceeDmHQwpUJhROPx16SlxJgERY= -k8s.io/apiextensions-apiserver v0.18.8/go.mod h1:7f4ySEkkvifIr4+BRrRWriKKIJjPyg9mb/p63dJKnlM= k8s.io/apiextensions-apiserver v0.18.12/go.mod h1:nihADkPed1L37Vxpz2/BrtxO9mCtINH23aNtUe/CRLo= k8s.io/apimachinery v0.18.8 h1:jimPrycCqgx2QPearX3to1JePz7wSbVLq+7PdBTTwQ0= k8s.io/apimachinery v0.18.8/go.mod h1:6sQd+iHEqmOtALqOFjSWp2KZ9F0wlU/nWm0ZgsYWMig= @@ -1219,24 +1221,27 @@ k8s.io/legacy-cloud-providers v0.18.8/go.mod h1:tgp4xYf6lvjrWnjQwTOPvWQE9IVqSBGP k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= k8s.io/utils v0.0.0-20200603063816-c1c6865ac451 h1:v8ud2Up6QK1lNOKFgiIVrZdMg7MpmSnvtrOieolJKoE= k8s.io/utils v0.0.0-20200603063816-c1c6865ac451/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -knative.dev/caching v0.0.0-20201113182901-ee88f744543c/go.mod h1:gGr7clElRu3BOrGHex96ZjEPIM7+5dDd5XHeIRle4vE= -knative.dev/eventing v0.19.1-0.20201117202251-be93f9495205 h1:7m6aZOH7jOqxdsV69v7vnu7oKTTftD4QSNvMr3YJbGM= -knative.dev/eventing v0.19.1-0.20201117202251-be93f9495205/go.mod h1:YxW2ZEk/fjUVO6fI46Tto3Kusp3FpiLb7ZrUxk40i90= -knative.dev/hack v0.0.0-20201103151104-3d5abc3a0075 h1:YAgWplKIy4O5e3F5vUUECmXAAyZ0M5ymo6fCt1jeZhs= -knative.dev/hack v0.0.0-20201103151104-3d5abc3a0075/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI= +knative.dev/caching v0.0.0-20201123014053-4019baeb5eb9/go.mod h1:sntT31v7vKbqLXV8CpLHPOSzPh46SmZKHvADs9Bb2Sc= +knative.dev/eventing v0.19.1-0.20201124020934-518010ed7378 h1:PQbwuD5ndhRQFLDl4DVNai1aC0n05jtoL+KDiPRDMZo= +knative.dev/eventing v0.19.1-0.20201124020934-518010ed7378/go.mod h1:Og0fBqu0B4l400fBzTv/rgZKtjLSsf8+brd4YKJ6obo= knative.dev/hack v0.0.0-20201112185459-01a34c573bd8 h1:RNbZsAjhswBPtl4C5C5gEFX5/GfWIOZQxfYD9DhkHdY= knative.dev/hack v0.0.0-20201112185459-01a34c573bd8/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI= -knative.dev/networking v0.0.0-20201117050651-847f7830cf46/go.mod h1:DCZ5pdCpaPkgvwSvgFzDXSDjZ2dByl+tMIHlXV4wvws= -knative.dev/networking v0.0.0-20201117214051-8e7d4b6f6175 h1:tE6WFpCfme1ezrCDcOWBbwsDMT4Su/noTYv6Q+7RaqY= -knative.dev/networking v0.0.0-20201117214051-8e7d4b6f6175/go.mod h1:O+KfrSZ0z/lKjb5x+WdXrLxWZaMWoIROxZq/cayol8U= -knative.dev/pkg v0.0.0-20201112201059-93fedf141385/go.mod h1:5vNHKNtZtzlNeNrcDoUtZIn+dma/8DjmpjfdHiwoQyM= -knative.dev/pkg v0.0.0-20201117020252-ab1a398f669c h1:dMBwabvusJrldjzIj4lces/96SnVgFXV7Kpv9z9fiCI= -knative.dev/pkg v0.0.0-20201117020252-ab1a398f669c/go.mod h1:4kXxEyYWdNk3pUR6/cx/ToMKG/dAJvEpDYUfV5RYHeU= -knative.dev/pkg v0.0.0-20201117200952-14386bb65da0/go.mod h1:nxlh3CUvx6WBPr1WKD96AHxFZPD2UKRDo9RUp8ILTyQ= +knative.dev/hack v0.0.0-20201118155651-b31d3bb6bff9/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI= +knative.dev/hack v0.0.0-20201119155951-11aa26c8eaf6/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI= +knative.dev/hack v0.0.0-20201120192952-353db687ec5b h1:Lc+AKgwhAZUD98mN++qTHeeaP6FRmS8fcwc/rXkP8G0= +knative.dev/hack v0.0.0-20201120192952-353db687ec5b/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI= +knative.dev/networking v0.0.0-20201123172858-4ec5898ef753/go.mod h1:bWOUlIdZ3swi7zfm/BovM9UpJHcddS6dwD+sVN5xzYo= +knative.dev/networking v0.0.0-20201124014134-a79c9d045b05 h1:7syeoKRw7l0il7kVpl/DEugBM8ndDDeK03yrqDAolGg= +knative.dev/networking v0.0.0-20201124014134-a79c9d045b05/go.mod h1:9jAy7B2mMH/nEqBH79ucIxnWHXK4HF3K3PgyalkVCss= knative.dev/pkg v0.0.0-20201117221452-0fccc54273ed h1:4LNEFhvD2Ya4WgCD3SC1WGXz81bjEvQgbcpe5XACI3I= knative.dev/pkg v0.0.0-20201117221452-0fccc54273ed/go.mod h1:nxlh3CUvx6WBPr1WKD96AHxFZPD2UKRDo9RUp8ILTyQ= -knative.dev/serving v0.19.1-0.20201118010952-d68e60811674 h1:KXfLRtexLNJxN16flJYpv48V1mtLShR6uRrAxQfmCVk= -knative.dev/serving v0.19.1-0.20201118010952-d68e60811674/go.mod h1:IK6We+vH5awiSd9bQZ8E5uBopQaQGw5MlGompOATXgU= +knative.dev/pkg v0.0.0-20201120183152-6a0e731e251a/go.mod h1:+H35jH64QU/7LiRs53AdqHAk19GOBpuNqCQpEQvjTn4= +knative.dev/pkg v0.0.0-20201123172958-fea72c1c8e2f/go.mod h1:wXZqP8MXCxb51yNFlecA13BwG7Hk370SWDFWV4dx4ug= +knative.dev/pkg v0.0.0-20201124023135-49e55c9eb816 h1:twVZmgBLLBaUUAVxxdPKZJzPief+izcV3boMc5P1xDY= +knative.dev/pkg v0.0.0-20201124023135-49e55c9eb816/go.mod h1:wXZqP8MXCxb51yNFlecA13BwG7Hk370SWDFWV4dx4ug= +knative.dev/reconciler-test v0.0.0-20201123224957-57547e427baf/go.mod h1:YSs1y1rgnjs8w39/drLIOQbWvZUQwqApvd+EizO8UsA= +knative.dev/serving v0.19.1-0.20201124025434-f19b58586067 h1:mswppzSxwwqkcy3zliLBpFpj/ynPVXy89Ai5ETHtXtY= +knative.dev/serving v0.19.1-0.20201124025434-f19b58586067/go.mod h1:RoebgBVk+D9hv83yFaRG1pRsu3ujajdMIj7wpy/1eqc= pgregory.net/rapid v0.3.3/go.mod h1:UYpPVyjFHzYBGHIxLFoupi8vwk6rXNzRY9OMvVxFIOU= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= diff --git a/vendor/knative.dev/hack/e2e-tests.sh b/vendor/knative.dev/hack/e2e-tests.sh index 19a7b6eec..0b8548f66 100644 --- a/vendor/knative.dev/hack/e2e-tests.sh +++ b/vendor/knative.dev/hack/e2e-tests.sh @@ -69,8 +69,12 @@ function setup_test_cluster() { # Acquire cluster admin role for the current user. acquire_cluster_admin_role "${k8s_cluster}" - # Setup KO_DOCKER_REPO if it is a GKE cluster. Incorporate an element of randomness to ensure that each run properly publishes images. - [[ "${k8s_cluster}" =~ ^gke_.* ]] && export KO_DOCKER_REPO=gcr.io/${E2E_PROJECT_ID}/${REPO_NAME}-e2e-img/${RANDOM} + # Setup KO_DOCKER_REPO if it is a GKE cluster. Incorporate an element of + # randomness to ensure that each run properly publishes images. Don't + # owerwrite KO_DOCKER_REPO if already set. + [ -z "${KO_DOCKER_REPO}" ] && \ + [[ "${k8s_cluster}" =~ ^gke_.* ]] && \ + export KO_DOCKER_REPO=gcr.io/${E2E_PROJECT_ID}/${REPO_NAME}-e2e-img/${RANDOM} # Safety checks is_protected_gcr "${KO_DOCKER_REPO}" && \ diff --git a/vendor/knative.dev/hack/library.sh b/vendor/knative.dev/hack/library.sh index f37b3f8df..9b90b0025 100644 --- a/vendor/knative.dev/hack/library.sh +++ b/vendor/knative.dev/hack/library.sh @@ -551,8 +551,11 @@ function go_update_deps() { echo "--- Go mod tidy and vendor" # Prune modules. - go mod tidy - go mod vendor + local orig_pipefail_opt=$(shopt -p -o pipefail) + set -o pipefail + go mod tidy 2>&1 | grep -v "ignoring symlink" || true + go mod vendor 2>&1 | grep -v "ignoring symlink" || true + eval "$orig_pipefail_opt" echo "--- Removing unwanted vendor files" @@ -741,6 +744,14 @@ function shellcheck_new_files() { fi } +function latest_version() { + local semver=$(git describe --match "v[0-9]*" --abbrev=0) + local major_minor=$(echo "$semver" | cut -d. -f1-2) + + # Get the latest patch release for the major minor + git tag -l "${major_minor}*" | sort -r --version-sort | head -n1 +} + # Initializations that depend on previous functions. # These MUST come last. diff --git a/vendor/knative.dev/hack/release.sh b/vendor/knative.dev/hack/release.sh index 4dcfa9158..bd0fdda7d 100644 --- a/vendor/knative.dev/hack/release.sh +++ b/vendor/knative.dev/hack/release.sh @@ -468,7 +468,6 @@ function parse_flags() { readonly RELEASE_BRANCH readonly RELEASE_GCS_BUCKET readonly RELEASE_DIR - readonly KO_DOCKER_REPO readonly VALIDATION_TESTS readonly FROM_NIGHTLY_RELEASE } @@ -478,11 +477,16 @@ function parse_flags() { function run_validation_tests() { (( SKIP_TESTS )) && return banner "Running release validation tests" + # Unset KO_DOCKER_REPO and restore it after the tests are finished. + # This will allow the tests to define their own KO_DOCKER_REPO. + local old_docker_repo="${KO_DOCKER_REPO}" + unset KO_DOCKER_REPO # Run tests. if ! $1; then banner "Release validation tests failed, aborting" abort "release validation tests failed" fi + export KO_DOCKER_REPO="${old_docker_repo}" } # Publishes the generated artifacts to directory, GCS, GitHub, etc. diff --git a/vendor/knative.dev/pkg/metrics/prometheus_exporter.go b/vendor/knative.dev/pkg/metrics/prometheus_exporter.go index 784eab2e8..7c177b129 100644 --- a/vendor/knative.dev/pkg/metrics/prometheus_exporter.go +++ b/vendor/knative.dev/pkg/metrics/prometheus_exporter.go @@ -48,7 +48,7 @@ func newPrometheusExporter(config *metricsConfig, logger *zap.SugaredLogger) (vi logger.Errorw("Failed to create the Prometheus exporter.", zap.Error(err)) return nil, nil, err } - logger.Infof("Created Opencensus Prometheus exporter with config: %v. Start the server for Prometheus exporter.", config) + logger.Infof("Created Prometheus exporter with config: %v. Start the server for Prometheus exporter.", config) // Start the server for Prometheus scraping go func() { srv := startNewPromSrv(e, config.prometheusHost, config.prometheusPort) diff --git a/vendor/knative.dev/serving/pkg/apis/serving/v1alpha1/domainmapping_lifecycle.go b/vendor/knative.dev/serving/pkg/apis/serving/v1alpha1/domainmapping_lifecycle.go index cbdda101a..0f9f9e494 100644 --- a/vendor/knative.dev/serving/pkg/apis/serving/v1alpha1/domainmapping_lifecycle.go +++ b/vendor/knative.dev/serving/pkg/apis/serving/v1alpha1/domainmapping_lifecycle.go @@ -25,6 +25,7 @@ import ( var domainMappingCondSet = apis.NewLivingConditionSet( DomainMappingConditionDomainClaimed, + DomainMappingConditionReferenceResolved, DomainMappingConditionIngressReady, ) @@ -83,6 +84,18 @@ func (dms *DomainMappingStatus) MarkDomainClaimFailed(reason string) { domainMappingCondSet.Manage(dms).MarkFalse(DomainMappingConditionDomainClaimed, "DomainClaimFailed", reason) } +// MarkReferenceResolved sets the DomainMappingConditionReferenceResolved +// condition to true. +func (dms *DomainMappingStatus) MarkReferenceResolved() { + domainMappingCondSet.Manage(dms).MarkTrue(DomainMappingConditionReferenceResolved) +} + +// MarkReferenceNotResolved sets the DomainMappingConditionReferenceResolved +// condition to false. +func (dms *DomainMappingStatus) MarkReferenceNotResolved(reason string) { + domainMappingCondSet.Manage(dms).MarkFalse(DomainMappingConditionReferenceResolved, "ResolveFailed", reason) +} + // PropagateIngressStatus updates the DomainMappingConditionIngressReady // condition according to the underlying Ingress's status. func (dms *DomainMappingStatus) PropagateIngressStatus(cs netv1alpha1.IngressStatus) { diff --git a/vendor/knative.dev/serving/pkg/apis/serving/v1alpha1/domainmapping_types.go b/vendor/knative.dev/serving/pkg/apis/serving/v1alpha1/domainmapping_types.go index 5f1aa34aa..8421afdf0 100644 --- a/vendor/knative.dev/serving/pkg/apis/serving/v1alpha1/domainmapping_types.go +++ b/vendor/knative.dev/serving/pkg/apis/serving/v1alpha1/domainmapping_types.go @@ -95,6 +95,10 @@ const ( // and the Ingress is ready. DomainMappingConditionReady = apis.ConditionReady + // DomainMappingConditionReferenceResolved reflects whether the Ref + // has been successfully resolved to an existing object. + DomainMappingConditionReferenceResolved apis.ConditionType = "ReferenceResolved" + // DomainMappingConditionIngressReady reflects the readiness of the // underlying Ingress resource. DomainMappingConditionIngressReady apis.ConditionType = "IngressReady" diff --git a/vendor/modules.txt b/vendor/modules.txt index 9463a6132..335eb957d 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -843,7 +843,7 @@ k8s.io/kube-openapi/pkg/util/sets k8s.io/utils/buffer k8s.io/utils/integer k8s.io/utils/trace -# knative.dev/eventing v0.19.1-0.20201117202251-be93f9495205 +# knative.dev/eventing v0.19.1-0.20201124020934-518010ed7378 ## explicit knative.dev/eventing/pkg/apis/config knative.dev/eventing/pkg/apis/configs @@ -873,15 +873,15 @@ knative.dev/eventing/pkg/client/clientset/versioned/typed/eventing/v1beta1/fake knative.dev/eventing/pkg/client/clientset/versioned/typed/messaging/v1beta1 knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1alpha2 knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1alpha2/fake -# knative.dev/hack v0.0.0-20201112185459-01a34c573bd8 +# knative.dev/hack v0.0.0-20201120192952-353db687ec5b ## explicit knative.dev/hack -# knative.dev/networking v0.0.0-20201117214051-8e7d4b6f6175 +# knative.dev/networking v0.0.0-20201124014134-a79c9d045b05 ## explicit knative.dev/networking/pkg knative.dev/networking/pkg/apis/networking knative.dev/networking/pkg/apis/networking/v1alpha1 -# knative.dev/pkg v0.0.0-20201117221452-0fccc54273ed +# knative.dev/pkg v0.0.0-20201124023135-49e55c9eb816 ## explicit knative.dev/pkg/apis knative.dev/pkg/apis/duck @@ -921,7 +921,7 @@ knative.dev/pkg/tracing/config knative.dev/pkg/tracing/propagation knative.dev/pkg/tracing/propagation/tracecontextb3 knative.dev/pkg/tracker -# knative.dev/serving v0.19.1-0.20201118010952-d68e60811674 +# knative.dev/serving v0.19.1-0.20201124025434-f19b58586067 ## explicit knative.dev/serving/pkg/apis/autoscaling knative.dev/serving/pkg/apis/autoscaling/v1alpha1