From 27da9cb8ae6ad6d287d70d508c24ae514ec1ef34 Mon Sep 17 00:00:00 2001 From: Matthias Wessendorf Date: Fri, 5 Jun 2020 17:04:05 +0200 Subject: [PATCH 01/10] :dizzy: Bumping image versions to 0.14.x on the CSV for eventing Signed-off-by: Matthias Wessendorf --- hack/lib/vars.bash | 3 + ...operator.v1.8.0.clusterserviceversion.yaml | 80 +++++++++++++------ 2 files changed, 59 insertions(+), 24 deletions(-) diff --git a/hack/lib/vars.bash b/hack/lib/vars.bash index 4f328bf9a7..b5750138b6 100644 --- a/hack/lib/vars.bash +++ b/hack/lib/vars.bash @@ -13,6 +13,9 @@ source "$(dirname "${BASH_SOURCE[0]}")/../../test/vendor/knative.dev/test-infra/ readonly KNATIVE_SERVING_VERSION="${KNATIVE_SERVING_VERSION:-v0.14.1}" readonly KNATIVE_EVENTING_VERSION="${KNATIVE_EVENTING_VERSION:-v0.13.0}" +readonly KNATIVE_EVENTING_OPERATOR_VERSION="${KNATIVE_EVENTING_OPERATOR_VERSION:-v0.13.3}" +readonly KNATIVE_EVENTING_VERSION="${KNATIVE_EVENTING_VERSION:-v0.14.2}" +readonly KNATIVE_EVENTING_OPERATOR_VERSION="${KNATIVE_EVENTING_OPERATOR_VERSION:-v0.14.0}" 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/serverless-operator.v1.8.0.clusterserviceversion.yaml b/olm-catalog/serverless-operator/1.8.0/serverless-operator.v1.8.0.clusterserviceversion.yaml index c19dad9d83..0c956c8142 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.0:knative-eventing-operator imagePullPolicy: IfNotPresent name: knative-eventing-operator ports: @@ -354,6 +354,7 @@ spec: - name: IMAGE_3scale-kourier-gateway value: docker.io/maistra/proxyv2-ubi8:1.0.8 - name: IMAGE_3scale-kourier-control +<<<<<<< HEAD value: registry.svc.ci.openshift.org/openshift/knative-v0.14.1:kourier - name: IMAGE_eventing-controller value: registry.svc.ci.openshift.org/openshift/knative-v0.13.0:knative-eventing-controller @@ -367,16 +368,39 @@ spec: 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 +======= + value: registry.svc.ci.openshift.org/openshift/knative-v0.13.3:kourier + - 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 +>>>>>>> d649eb7b... :dizzy: Bumping image versions to 0.14.x on the CSV for eventing - 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 +535,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.0: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 From 6c9728214b3c17de96c795ecaa5ad3411089b03c Mon Sep 17 00:00:00 2001 From: Ali Ok Date: Fri, 15 May 2020 11:19:03 +0300 Subject: [PATCH 02/10] Enable tracing for upstream eventing tests --- hack/lib/__sources__.bash | 2 +- hack/lib/tracing.bash | 90 +++++++++++++++++++++++++++++++++++++++ hack/lib/vars.bash | 3 -- hack/teardown.sh | 15 ++----- test/lib.bash | 1 + 5 files changed, 95 insertions(+), 16 deletions(-) create mode 100644 hack/lib/tracing.bash diff --git a/hack/lib/__sources__.bash b/hack/lib/__sources__.bash index 7583ab9a1a..17fe54dfcd 100644 --- a/hack/lib/__sources__.bash +++ b/hack/lib/__sources__.bash @@ -1,6 +1,6 @@ #!/usr/bin/env bash -declare -a __sources=(vars common ui scaleup namespaces catalogsource serverless) +declare -a __sources=(vars common ui scaleup namespaces catalogsource serverless tracing) for source in "${__sources[@]}"; do # shellcheck disable=SC1091,SC1090 diff --git a/hack/lib/tracing.bash b/hack/lib/tracing.bash new file mode 100644 index 0000000000..62b633eb56 --- /dev/null +++ b/hack/lib/tracing.bash @@ -0,0 +1,90 @@ +#!/usr/bin/env bash + +function install_tracing { + deploy_zipkin + enable_eventing_tracing +} + +function deploy_zipkin { + logger.info "Installing Zipkin in namespace ${ZIPKIN_NAMESPACE}" + cat < Date: Wed, 13 May 2020 11:45:10 +0300 Subject: [PATCH 03/10] Don't block namespace deletion because of completed job pods --- hack/lib/namespaces.bash | 2 +- hack/lib/serverless.bash | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hack/lib/namespaces.bash b/hack/lib/namespaces.bash index ab2502cb18..af26bb2d17 100644 --- a/hack/lib/namespaces.bash +++ b/hack/lib/namespaces.bash @@ -15,7 +15,7 @@ function delete_namespaces { for ns in "${NAMESPACES[@]}"; do if oc get ns "${ns}" >/dev/null 2>&1; then logger.info "Waiting until there are no pods in ${ns} to safely remove it..." - timeout 600 "[[ \$(oc get pods -n $ns -o jsonpath='{.items}') != '[]' ]]" + timeout 600 "[[ \$(oc get pods -n $ns --field-selector=status.phase!=Succeeded -o jsonpath='{.items}') != '[]' ]]" oc delete ns "$ns" fi done diff --git a/hack/lib/serverless.bash b/hack/lib/serverless.bash index 16314e9f2a..89512a7922 100644 --- a/hack/lib/serverless.bash +++ b/hack/lib/serverless.bash @@ -164,14 +164,14 @@ function teardown_serverless { oc delete knativeserving.operator.knative.dev knative-serving -n "${SERVING_NAMESPACE}" || return $? fi logger.info 'Ensure no knative serving pods running' - timeout 600 "[[ \$(oc get pods -n ${SERVING_NAMESPACE} -o jsonpath='{.items}') != '[]' ]]" || return 9 + timeout 600 "[[ \$(oc get pods -n ${SERVING_NAMESPACE} --field-selector=status.phase!=Succeeded -o jsonpath='{.items}') != '[]' ]]" || return 9 if oc get knativeeventing.operator.knative.dev knative-eventing -n "${EVENTING_NAMESPACE}" >/dev/null 2>&1; then logger.info 'Removing KnativeEventing CR' oc delete knativeeventing.operator.knative.dev knative-eventing -n "${EVENTING_NAMESPACE}" || return $? fi logger.info 'Ensure no knative eventing pods running' - timeout 600 "[[ \$(oc get pods -n ${EVENTING_NAMESPACE} -o jsonpath='{.items}') != '[]' ]]" || return 9 + timeout 600 "[[ \$(oc get pods -n ${EVENTING_NAMESPACE} --field-selector=status.phase!=Succeeded -o jsonpath='{.items}') != '[]' ]]" || return 9 oc delete subscription -n "${OPERATORS_NAMESPACE}" "${OPERATOR}" 2>/dev/null for ip in $(oc get installplan -n "${OPERATORS_NAMESPACE}" | grep serverless-operator | cut -f1 -d' '); do From c49cc2f6e1bfc0e5afa6107c0996ebf5ed32833e Mon Sep 17 00:00:00 2001 From: Ali Ok Date: Wed, 13 May 2020 10:04:41 +0300 Subject: [PATCH 04/10] Fix deployment names to check --- test/e2e/knative_eventing_test.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/e2e/knative_eventing_test.go b/test/e2e/knative_eventing_test.go index 1e4dccc0ed..da5571df5f 100644 --- a/test/e2e/knative_eventing_test.go +++ b/test/e2e/knative_eventing_test.go @@ -13,10 +13,13 @@ const ( var knativeControlPlaneDeploymentNames = []string{ "broker-controller", + "broker-filter", + "broker-ingress", "eventing-controller", "eventing-webhook", "imc-controller", "imc-dispatcher", + "mt-broker-controller", } func TestKnativeEventing(t *testing.T) { From 571334f22045a012af739396eed58a1657c936b1 Mon Sep 17 00:00:00 2001 From: Matthias Wessendorf Date: Tue, 9 Jun 2020 15:03:46 +0200 Subject: [PATCH 05/10] :lipstick: update to latest CRD for eventing Signed-off-by: Matthias Wessendorf --- .../1.8.0/operator_v1alpha1_knativeeventing_crd.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) 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: From b32d882f39ad1bacd75e398ec97d524696f24a99 Mon Sep 17 00:00:00 2001 From: Matthias Wessendorf Date: Tue, 9 Jun 2020 15:10:44 +0200 Subject: [PATCH 06/10] using overrides for eventing containers Signed-off-by: Matthias Wessendorf --- ...operator.v1.8.0.clusterserviceversion.yaml | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) 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 0c956c8142..526bb754d2 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 @@ -370,23 +370,23 @@ spec: value: registry.svc.ci.openshift.org/openshift/knative-v0.13.0:knative-eventing-cronjob-receive-adapter ======= value: registry.svc.ci.openshift.org/openshift/knative-v0.13.3:kourier - - name: IMAGE_eventing-controller_eventing-controller + - 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 + - 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 + - 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 + - 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 + - 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 + - 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 + - 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 + - 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 + - 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 >>>>>>> d649eb7b... :dizzy: Bumping image versions to 0.14.x on the CSV for eventing - name: IMAGE_PING_IMAGE @@ -536,23 +536,23 @@ spec: image: $IMAGE_KNATIVE_OPENSHIFT_INGRESS - name: knative-eventing-operator image: registry.svc.ci.openshift.org/openshift/knative-v0.14.0:knative-eventing-operator - - name: IMAGE_eventing-controller_eventing-controller + - 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 + - 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 + - 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 + - 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 + - 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 + - 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 + - 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 + - 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 + - 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.14.2:knative-eventing-adapter @@ -569,4 +569,4 @@ spec: - 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 - version: 1.8.0 + version: 1.8.0 \ No newline at end of file From d8d3fa824821f098faccec34422b39e69010235e Mon Sep 17 00:00:00 2001 From: Matthias Wessendorf Date: Tue, 16 Jun 2020 09:26:22 +0200 Subject: [PATCH 07/10] Updatr operator and test invoke Signed-off-by: Matthias Wessendorf --- hack/lib/vars.bash | 2 +- ...operator.v1.8.0.clusterserviceversion.yaml | 20 ++----------------- test/eventing.bash | 15 +++++++++----- 3 files changed, 13 insertions(+), 24 deletions(-) diff --git a/hack/lib/vars.bash b/hack/lib/vars.bash index 4f328bf9a7..eb82e2d6b3 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.14.1}" -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/serverless-operator.v1.8.0.clusterserviceversion.yaml b/olm-catalog/serverless-operator/1.8.0/serverless-operator.v1.8.0.clusterserviceversion.yaml index 526bb754d2..42d29cbc08 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.14.0:knative-eventing-operator + image: registry.svc.ci.openshift.org/openshift/knative-v0.14.2:knative-eventing-operator imagePullPolicy: IfNotPresent name: knative-eventing-operator ports: @@ -354,22 +354,7 @@ spec: - name: IMAGE_3scale-kourier-gateway value: docker.io/maistra/proxyv2-ubi8:1.0.8 - name: IMAGE_3scale-kourier-control -<<<<<<< HEAD value: registry.svc.ci.openshift.org/openshift/knative-v0.14.1: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 -======= - value: registry.svc.ci.openshift.org/openshift/knative-v0.13.3:kourier - 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 @@ -388,7 +373,6 @@ spec: 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 ->>>>>>> d649eb7b... :dizzy: Bumping image versions to 0.14.x on the CSV for eventing - name: IMAGE_PING_IMAGE value: registry.svc.ci.openshift.org/openshift/knative-v0.14.2:knative-eventing-adapter - name: IMAGE_JOB_RUNNER_IMAGE @@ -535,7 +519,7 @@ spec: - name: knative-openshift-ingress image: $IMAGE_KNATIVE_OPENSHIFT_INGRESS - name: knative-eventing-operator - image: registry.svc.ci.openshift.org/openshift/knative-v0.14.0:knative-eventing-operator + 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 diff --git a/test/eventing.bash b/test/eventing.bash index a01ce27fb4..fb2f88a1a6 100644 --- a/test/eventing.bash +++ b/test/eventing.bash @@ -2,19 +2,24 @@ function knative_eventing_tests { ( - local exitstatus=0 logger.info 'Running eventing tests' cd "$KNATIVE_EVENTING_HOME" || return $? image_template="registry.svc.ci.openshift.org/openshift/knative-${KNATIVE_EVENTING_VERSION}:knative-eventing-test-{{.Name}}" - go_test_e2e -timeout=90m -parallel=1 ./test/e2e \ + go_test_e2e -timeout=90m -parallel=12 ./test/e2e -brokerclass=ChannelBasedBroker -channels=messaging.knative.dev/v1alpha1:InMemoryChannel,messaging.knative.dev/v1alpha1:Channel,messaging.knative.dev/v1beta1:InMemoryChannel \ --kubeconfig "$KUBECONFIG" \ - --imagetemplate "$image_template" \ - || exitstatus=$? && true + --imagetemplate "$image_template" || failed=1 - print_test_result ${exitstatus} + oc patch cm config-br-defaults -n knative-eventing -p '{"data":{"default-br-config":"clusterDefault:\n brokerClass: MTChannelBasedBroker\n apiVersion: v1\n kind: ConfigMap\n name: config-br-default-channel\n namespace: knative-eventing\n"}}' --type=merge || failed=2 + + go_test_e2e -timeout=90m -parallel=12 ./test/e2e -brokerclass=MTChannelBasedBroker -channels=messaging.knative.dev/v1alpha1:InMemoryChannel,messaging.knative.dev/v1alpha1:Channel,messaging.knative.dev/v1beta1:InMemoryChannel \ + --kubeconfig "$KUBECONFIG" \ + --imagetemplate "$image_template" || failed=3 + + + print_test_result ${failed} return $exitstatus ) From d2e4b368b2d8b37baf5baa6a24864b1a7df49f34 Mon Sep 17 00:00:00 2001 From: Matthias Wessendorf Date: Wed, 17 Jun 2020 08:28:15 +0200 Subject: [PATCH 08/10] :whale: Updating source container image Signed-off-by: Matthias Wessendorf --- openshift/ci-operator/source-image/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openshift/ci-operator/source-image/Dockerfile b/openshift/ci-operator/source-image/Dockerfile index bcee669cf6..40004f3d9d 100644 --- a/openshift/ci-operator/source-image/Dockerfile +++ b/openshift/ci-operator/source-image/Dockerfile @@ -2,4 +2,4 @@ FROM src COPY oc /usr/bin/oc COPY serving ${GOPATH}/src/knative.dev/serving -COPY eventing ${GOPATH}/src/knative.dev/eventing +COPY --from=registry.svc.ci.openshift.org/openshift/knative-v0.14.2:knative-eventing-src ${GOPATH}/src/knative.dev/eventing/ ${GOPATH}/src/knative.dev/eventing/ \ No newline at end of file From d071a5062e22bd2ab5e086c1a3bd5b92b9b20196 Mon Sep 17 00:00:00 2001 From: Matthias Wessendorf Date: Wed, 17 Jun 2020 08:59:50 +0200 Subject: [PATCH 09/10] :whale: Updating source container image Signed-off-by: Matthias Wessendorf --- openshift/ci-operator/source-image/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openshift/ci-operator/source-image/Dockerfile b/openshift/ci-operator/source-image/Dockerfile index 40004f3d9d..41e9ea02a8 100644 --- a/openshift/ci-operator/source-image/Dockerfile +++ b/openshift/ci-operator/source-image/Dockerfile @@ -2,4 +2,4 @@ FROM src COPY oc /usr/bin/oc COPY serving ${GOPATH}/src/knative.dev/serving -COPY --from=registry.svc.ci.openshift.org/openshift/knative-v0.14.2:knative-eventing-src ${GOPATH}/src/knative.dev/eventing/ ${GOPATH}/src/knative.dev/eventing/ \ No newline at end of file +COPY --from=registry.svc.ci.openshift.org/openshift/knative-v0.14.2:knative-eventing-src /go/src/knative.dev/eventing/ /go/src/knative.dev/eventing/ \ No newline at end of file From 884645fc652611288a166d29fc9780fd4d8015b7 Mon Sep 17 00:00:00 2001 From: Matthias Wessendorf Date: Wed, 17 Jun 2020 11:13:00 +0200 Subject: [PATCH 10/10] more more fix :glasses: Signed-off-by: Matthias Wessendorf --- test/eventing.bash | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/eventing.bash b/test/eventing.bash index fb2f88a1a6..b11566362c 100644 --- a/test/eventing.bash +++ b/test/eventing.bash @@ -2,6 +2,7 @@ function knative_eventing_tests { ( + local failed=0 logger.info 'Running eventing tests' cd "$KNATIVE_EVENTING_HOME" || return $? @@ -21,6 +22,6 @@ function knative_eventing_tests { print_test_result ${failed} - return $exitstatus + return $failed ) }