diff --git a/hack/lib/vars.bash b/hack/lib/vars.bash index 1f0a3a5bf3..66f162244c 100644 --- a/hack/lib/vars.bash +++ b/hack/lib/vars.bash @@ -12,7 +12,7 @@ fi source "$(dirname "${BASH_SOURCE[0]}")/../../test/vendor/knative.dev/test-infra/scripts/e2e-tests.sh" readonly KNATIVE_SERVING_VERSION="${KNATIVE_SERVING_VERSION:-v0.13.3}" -readonly KNATIVE_EVENTING_VERSION="${KNATIVE_EVENTING_VERSION:-v0.13.0}" +readonly KNATIVE_EVENTING_VERSION="${KNATIVE_EVENTING_VERSION:-v0.14.2}" readonly KNATIVE_SERVING_BRANCH="${KNATIVE_SERVING_BRANCH:-release-${KNATIVE_SERVING_VERSION}}" readonly KNATIVE_SERVING_REPO="${KNATIVE_SERVING_REPO:-"https://github.com/openshift/knative-serving.git"}" diff --git a/olm-catalog/serverless-operator/1.8.0/operator_v1alpha1_knativeeventing_crd.yaml b/olm-catalog/serverless-operator/1.8.0/operator_v1alpha1_knativeeventing_crd.yaml index a1dce8524c..d5fe7d21d9 100644 --- a/olm-catalog/serverless-operator/1.8.0/operator_v1alpha1_knativeeventing_crd.yaml +++ b/olm-catalog/serverless-operator/1.8.0/operator_v1alpha1_knativeeventing_crd.yaml @@ -40,6 +40,14 @@ spec: spec: description: Spec defines the desired state of KnativeEventing properties: + config: + additionalProperties: + additionalProperties: + type: string + type: object + description: A means to override the corresponding entries in the upstream + configmaps + type: object registry: description: A means to override the corresponding deployment images in the upstream. This affects both apps/v1.Deployment and caching.internal.knative.dev/v1alpha1.Image. @@ -64,6 +72,10 @@ spec: name: description: The name of the secret. type: string + default-broker-class: + description: The default broker type to use for the brokers Knative creates. + If no value is provided, ChannelBasedBroker will be used. + type: string type: object status: properties: diff --git a/olm-catalog/serverless-operator/1.8.0/serverless-operator.v1.8.0.clusterserviceversion.yaml b/olm-catalog/serverless-operator/1.8.0/serverless-operator.v1.8.0.clusterserviceversion.yaml index 9b02eaf21e..26be2a871f 100644 --- a/olm-catalog/serverless-operator/1.8.0/serverless-operator.v1.8.0.clusterserviceversion.yaml +++ b/olm-catalog/serverless-operator/1.8.0/serverless-operator.v1.8.0.clusterserviceversion.yaml @@ -294,7 +294,7 @@ spec: fieldPath: metadata.namespace - name: METRICS_DOMAIN value: knative.dev/eventing-operator - image: registry.svc.ci.openshift.org/openshift/knative-v0.13.3:knative-eventing-operator + image: registry.svc.ci.openshift.org/openshift/knative-v0.14.2:knative-eventing-operator imagePullPolicy: IfNotPresent name: knative-eventing-operator ports: @@ -355,28 +355,36 @@ spec: value: docker.io/maistra/proxyv2-ubi8:1.0.8 - name: IMAGE_3scale-kourier-control value: registry.svc.ci.openshift.org/openshift/knative-v0.13.3:kourier - - name: IMAGE_eventing-controller - value: registry.svc.ci.openshift.org/openshift/knative-v0.13.0:knative-eventing-controller - - name: IMAGE_eventing-webhook - value: registry.svc.ci.openshift.org/openshift/knative-v0.13.0:knative-eventing-webhook - - name: IMAGE_broker-controller - value: registry.svc.ci.openshift.org/openshift/knative-v0.13.0:knative-eventing-channel-broker - - name: IMAGE_imc-controller - value: registry.svc.ci.openshift.org/openshift/knative-v0.13.0:knative-eventing-channel-controller - - name: IMAGE_imc-dispatcher - value: registry.svc.ci.openshift.org/openshift/knative-v0.13.0:knative-eventing-channel-dispatcher - - name: IMAGE_CRONJOB_RA_IMAGE - value: registry.svc.ci.openshift.org/openshift/knative-v0.13.0:knative-eventing-cronjob-receive-adapter + - name: IMAGE_eventing-controller__eventing-controller + value: registry.svc.ci.openshift.org/openshift/knative-v0.14.2:knative-eventing-controller + - name: IMAGE_eventing-webhook__eventing-webhook + value: registry.svc.ci.openshift.org/openshift/knative-v0.14.2:knative-eventing-webhook + - name: IMAGE_broker-controller__eventing-controller + value: registry.svc.ci.openshift.org/openshift/knative-v0.14.2:knative-eventing-channel-broker + - name: IMAGE_broker-filter__filter + value: registry.svc.ci.openshift.org/openshift/knative-v0.14.2:knative-eventing-mtbroker-filter + - name: IMAGE_broker-ingress__ingress + value: registry.svc.ci.openshift.org/openshift/knative-v0.14.2:knative-eventing-mtbroker-ingress + - name: IMAGE_mt-broker-controller__eventing-controller + value: registry.svc.ci.openshift.org/openshift/knative-v0.14.2:knative-eventing-mtchannel-broker + - name: IMAGE_imc-controller__controller + value: registry.svc.ci.openshift.org/openshift/knative-v0.14.2:knative-eventing-channel-controller + - name: IMAGE_imc-dispatcher__dispatcher + value: registry.svc.ci.openshift.org/openshift/knative-v0.14.2:knative-eventing-channel-dispatcher + - name: IMAGE_v0.14.0-upgrade__upgrade-brokers + value: registry.svc.ci.openshift.org/openshift/knative-v0.14.2:knative-eventing-upgrade-v0-14-0 - name: IMAGE_PING_IMAGE - value: registry.svc.ci.openshift.org/openshift/knative-v0.13.0:knative-eventing-ping + value: registry.svc.ci.openshift.org/openshift/knative-v0.14.2:knative-eventing-adapter + - name: IMAGE_JOB_RUNNER_IMAGE + value: registry.svc.ci.openshift.org/openshift/knative-v0.14.2:knative-eventing-jobrunner - name: IMAGE_APISERVER_RA_IMAGE - value: registry.svc.ci.openshift.org/openshift/knative-v0.13.0:knative-eventing-apiserver-receive-adapter + value: registry.svc.ci.openshift.org/openshift/knative-v0.14.2:knative-eventing-apiserver-receive-adapter - name: IMAGE_BROKER_INGRESS_IMAGE - value: registry.svc.ci.openshift.org/openshift/knative-v0.13.0:knative-eventing-ingress + value: registry.svc.ci.openshift.org/openshift/knative-v0.14.2:knative-eventing-broker-ingress - name: IMAGE_BROKER_FILTER_IMAGE - value: registry.svc.ci.openshift.org/openshift/knative-v0.13.0:knative-eventing-filter + value: registry.svc.ci.openshift.org/openshift/knative-v0.14.2:knative-eventing-broker-filter - name: IMAGE_DISPATCHER_IMAGE - value: registry.svc.ci.openshift.org/openshift/knative-v0.13.0:knative-eventing-channel-dispatcher + value: registry.svc.ci.openshift.org/openshift/knative-v0.14.2:knative-eventing-channel-dispatcher - name: IMAGE_KN_CLI_ARTIFACTS value: registry.svc.ci.openshift.org/openshift/knative-v0.13.2:kn-cli-artifacts - name: knative-openshift-ingress @@ -511,29 +519,37 @@ spec: - name: knative-openshift-ingress image: $IMAGE_KNATIVE_OPENSHIFT_INGRESS - name: knative-eventing-operator - image: registry.svc.ci.openshift.org/openshift/knative-v0.13.3:knative-eventing-operator - - name: IMAGE_eventing-controller - image: registry.svc.ci.openshift.org/openshift/knative-v0.13.0:knative-eventing-controller - - name: IMAGE_eventing-webhook - image: registry.svc.ci.openshift.org/openshift/knative-v0.13.0:knative-eventing-webhook - - name: IMAGE_broker-controller - image: registry.svc.ci.openshift.org/openshift/knative-v0.13.0:knative-eventing-channel-broker - - name: IMAGE_imc-controller - image: registry.svc.ci.openshift.org/openshift/knative-v0.13.0:knative-eventing-channel-controller - - name: IMAGE_imc-dispatcher - image: registry.svc.ci.openshift.org/openshift/knative-v0.13.0:knative-eventing-channel-dispatcher - - name: IMAGE_CRONJOB_RA_IMAGE - image: registry.svc.ci.openshift.org/openshift/knative-v0.13.0:knative-eventing-cronjob-receive-adapter + image: registry.svc.ci.openshift.org/openshift/knative-v0.14.2:knative-eventing-operator + - name: IMAGE_eventing-controller__eventing-controller + image: registry.svc.ci.openshift.org/openshift/knative-v0.14.2:knative-eventing-controller + - name: IMAGE_eventing-webhook__eventing-webhook + image: registry.svc.ci.openshift.org/openshift/knative-v0.14.2:knative-eventing-webhook + - name: IMAGE_broker-controller__eventing-controller + image: registry.svc.ci.openshift.org/openshift/knative-v0.14.2:knative-eventing-channel-broker + - name: IMAGE_broker-filter__filter + image: registry.svc.ci.openshift.org/openshift/knative-v0.14.2:knative-eventing-mtbroker-filter + - name: IMAGE_broker-ingress__ingress + image: registry.svc.ci.openshift.org/openshift/knative-v0.14.2:knative-eventing-mtbroker-ingress + - name: IMAGE_mt-broker-controller__eventing-controller + image: registry.svc.ci.openshift.org/openshift/knative-v0.14.2:knative-eventing-mtchannel-broker + - name: IMAGE_imc-controller__controller + image: registry.svc.ci.openshift.org/openshift/knative-v0.14.2:knative-eventing-channel-controller + - name: IMAGE_imc-dispatcher__dispatcher + image: registry.svc.ci.openshift.org/openshift/knative-v0.14.2:knative-eventing-channel-dispatcher + - name: IMAGE_v0.14.0-upgrade__upgrade-brokers + image: registry.svc.ci.openshift.org/openshift/knative-v0.14.2:knative-eventing-upgrade-v0-14-0 - name: IMAGE_PING_IMAGE - image: registry.svc.ci.openshift.org/openshift/knative-v0.13.0:knative-eventing-ping + image: registry.svc.ci.openshift.org/openshift/knative-v0.14.2:knative-eventing-adapter + - name: IMAGE_JOB_RUNNER_IMAGE + image: registry.svc.ci.openshift.org/openshift/knative-v0.14.2:knative-eventing-jobrunner - name: IMAGE_APISERVER_RA_IMAGE - image: registry.svc.ci.openshift.org/openshift/knative-v0.13.0:knative-eventing-apiserver-receive-adapter + image: registry.svc.ci.openshift.org/openshift/knative-v0.14.2:knative-eventing-apiserver-receive-adapter - name: IMAGE_BROKER_INGRESS_IMAGE - image: registry.svc.ci.openshift.org/openshift/knative-v0.13.0:knative-eventing-ingress + image: registry.svc.ci.openshift.org/openshift/knative-v0.14.2:knative-eventing-broker-ingress - name: IMAGE_BROKER_FILTER_IMAGE - image: registry.svc.ci.openshift.org/openshift/knative-v0.13.0:knative-eventing-filter + image: registry.svc.ci.openshift.org/openshift/knative-v0.14.2:knative-eventing-broker-filter - name: IMAGE_DISPATCHER_IMAGE - image: registry.svc.ci.openshift.org/openshift/knative-v0.13.0:knative-eventing-channel-dispatcher + image: registry.svc.ci.openshift.org/openshift/knative-v0.14.2:knative-eventing-channel-dispatcher - name: IMAGE_KN_CLI_ARTIFACTS image: registry.svc.ci.openshift.org/openshift/knative-v0.13.2:kn-cli-artifacts replaces: serverless-operator.v1.7.0