diff --git a/go.mod b/go.mod index 419e6550..9424014d 100644 --- a/go.mod +++ b/go.mod @@ -17,6 +17,6 @@ require ( k8s.io/client-go v0.18.12 k8s.io/code-generator v0.18.12 k8s.io/kube-openapi v0.0.0-20200410145947-bcb3869e6f29 - knative.dev/hack v0.0.0-20201112185459-01a34c573bd8 + knative.dev/hack v0.0.0-20201118155651-b31d3bb6bff9 knative.dev/pkg v0.0.0-20201117221452-0fccc54273ed ) diff --git a/go.sum b/go.sum index cc4b1d88..d5910bd2 100644 --- a/go.sum +++ b/go.sum @@ -1133,6 +1133,8 @@ k8s.io/utils v0.0.0-20200603063816-c1c6865ac451 h1:v8ud2Up6QK1lNOKFgiIVrZdMg7Mpm k8s.io/utils v0.0.0-20200603063816-c1c6865ac451/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= 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/hack v0.0.0-20201118155651-b31d3bb6bff9 h1:OgYL1cATsWTS6kztSOuQqhmYfcn6ZdpPAQQ6TKCx00I= +knative.dev/hack v0.0.0-20201118155651-b31d3bb6bff9/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI= knative.dev/pkg v0.0.0-20201117221452-0fccc54273ed h1:4LNEFhvD2Ya4WgCD3SC1WGXz81bjEvQgbcpe5XACI3I= knative.dev/pkg v0.0.0-20201117221452-0fccc54273ed/go.mod h1:nxlh3CUvx6WBPr1WKD96AHxFZPD2UKRDo9RUp8ILTyQ= pgregory.net/rapid v0.3.3/go.mod h1:UYpPVyjFHzYBGHIxLFoupi8vwk6rXNzRY9OMvVxFIOU= diff --git a/vendor/knative.dev/hack/library.sh b/vendor/knative.dev/hack/library.sh index f37b3f8d..29554a8b 100644 --- a/vendor/knative.dev/hack/library.sh +++ b/vendor/knative.dev/hack/library.sh @@ -410,26 +410,28 @@ function start_latest_knative_serving() { } # Install Knative Eventing in the current cluster. -# Parameters: $1 - Knative Eventing manifest. +# Parameters: $1 - Knative Eventing crds manifest. +# $2 - Knative Eventing core manifest. function start_knative_eventing() { header "Starting Knative Eventing" subheader "Installing Knative Eventing" echo "Installing Eventing CRDs from $1" - kubectl apply --selector knative.dev/crd-install=true -f "$1" - echo "Installing the rest of eventing components from $1" kubectl apply -f "$1" + echo "Installing Eventing core components from $2" + kubectl apply -f "$2" wait_until_pods_running knative-eventing || return 1 } # Install the stable release Knative/eventing in the current cluster. # Parameters: $1 - Knative Eventing version number, e.g. 0.6.0. function start_release_knative_eventing() { - start_knative_eventing "https://storage.googleapis.com/knative-releases/eventing/previous/v$1/eventing.yaml" + start_knative_eventing "https://storage.googleapis.com/knative-releases/eventing/previous/v$1/eventing-crds.yaml" \ + "https://storage.googleapis.com/knative-releases/eventing/previous/v$1/eventing-core.yaml" } # Install the latest stable Knative Eventing in the current cluster. function start_latest_knative_eventing() { - start_knative_eventing "${KNATIVE_EVENTING_RELEASE}" + start_knative_eventing "${KNATIVE_EVENTING_RELEASE_CRDS}" "${KNATIVE_EVENTING_RELEASE_CORE}" } # Install Knative Eventing extension in the current cluster. @@ -751,5 +753,6 @@ readonly REPO_NAME_FORMATTED="Knative $(capitalize "${REPO_NAME//-/ }")" readonly KNATIVE_SERVING_RELEASE_CRDS="$(get_latest_knative_yaml_source "serving" "serving-crds")" readonly KNATIVE_SERVING_RELEASE_CORE="$(get_latest_knative_yaml_source "serving" "serving-core")" readonly KNATIVE_NET_ISTIO_RELEASE="$(get_latest_knative_yaml_source "net-istio" "net-istio")" -readonly KNATIVE_EVENTING_RELEASE="$(get_latest_knative_yaml_source "eventing" "eventing")" +readonly KNATIVE_EVENTING_RELEASE_CRDS="$(get_latest_knative_yaml_source "eventing" "eventing-crds")" +readonly KNATIVE_EVENTING_RELEASE_CORE="$(get_latest_knative_yaml_source "eventing" "eventing-core")" readonly KNATIVE_EVENTING_SUGAR_CONTROLLER_RELEASE="$(get_latest_knative_yaml_source "eventing" "eventing-sugar-controller")" diff --git a/vendor/modules.txt b/vendor/modules.txt index f561a5c2..b829a84f 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -739,7 +739,7 @@ k8s.io/kube-openapi/pkg/util/sets k8s.io/utils/buffer k8s.io/utils/integer k8s.io/utils/trace -# knative.dev/hack v0.0.0-20201112185459-01a34c573bd8 +# knative.dev/hack v0.0.0-20201118155651-b31d3bb6bff9 ## explicit knative.dev/hack # knative.dev/pkg v0.0.0-20201117221452-0fccc54273ed