Fix unable to deploy KafkaSink without Broker component (#716)

Signed-off-by: Pierangelo Di Pilato <[email protected]> Co-authored-by: Pierangelo Di Pilato <[email protected]>
knative-extensions · Mar 9, 2021 · 8daeb77 · 8daeb77
1 parent 4934e2f
commit 8daeb77
Show file tree

Hide file tree

Showing 14 changed files with 23 additions and 4 deletions.
diff --git a/...g/100-config-kafka-broker-data-plane.yaml → ...r/100-config-kafka-broker-data-plane.yaml b/...g/100-config-kafka-broker-data-plane.yaml → ...r/100-config-kafka-broker-data-plane.yaml
diff --git a/data-plane/config/broker/100-config-logging.yaml b/data-plane/config/broker/100-config-logging.yaml
@@ -0,0 +1 @@
+../100-config-logging.yaml
diff --git a/data-plane/config/broker/200-data-plane-cluster-role.yaml b/data-plane/config/broker/200-data-plane-cluster-role.yaml
@@ -0,0 +1 @@
+../200-data-plane-cluster-role.yaml
diff --git a/data-plane/config/broker/200-data-plane-service-account.yaml b/data-plane/config/broker/200-data-plane-service-account.yaml
@@ -0,0 +1 @@
+../200-data-plane-service-account.yaml
diff --git a/data-plane/config/broker/201-data-plane-cluster-role-binding.yaml b/data-plane/config/broker/201-data-plane-cluster-role-binding.yaml
@@ -0,0 +1 @@
+../201-data-plane-cluster-role-binding.yaml
diff --git a/...plane/config/template/500-dispatcher.yaml → ...onfig/broker/template/500-dispatcher.yaml b/...plane/config/template/500-dispatcher.yaml → ...onfig/broker/template/500-dispatcher.yaml
diff --git a/data-plane/config/template/500-receiver.yaml → .../config/broker/template/500-receiver.yaml b/data-plane/config/template/500-receiver.yaml → .../config/broker/template/500-receiver.yaml
diff --git a/data-plane/config/sink/100-config-logging.yaml b/data-plane/config/sink/100-config-logging.yaml
@@ -0,0 +1 @@
+../100-config-logging.yaml
diff --git a/data-plane/config/sink/200-data-plane-cluster-role.yaml b/data-plane/config/sink/200-data-plane-cluster-role.yaml
@@ -0,0 +1 @@
+../200-data-plane-cluster-role.yaml
diff --git a/data-plane/config/sink/200-data-plane-service-account.yaml b/data-plane/config/sink/200-data-plane-service-account.yaml
@@ -0,0 +1 @@
+../200-data-plane-service-account.yaml
diff --git a/data-plane/config/sink/201-data-plane-cluster-role-binding.yaml b/data-plane/config/sink/201-data-plane-cluster-role-binding.yaml
@@ -0,0 +1 @@
+../201-data-plane-cluster-role-binding.yaml
diff --git a/hack/data-plane.sh b/hack/data-plane.sh
@@ -28,15 +28,16 @@ readonly UUID=${UUID:-${TAG:-latest}}
 
 readonly DATA_PLANE_DIR=data-plane
 readonly DATA_PLANE_CONFIG_DIR=${DATA_PLANE_DIR}/config
-readonly SINK_DATA_PLANE_CONFIG_DIR=${DATA_PLANE_CONFIG_DIR}/sink
 
 # Broker config
-readonly KAFKA_BROKER_DATA_PLANE_CONFIG_TEMPLATE_DIR=${DATA_PLANE_CONFIG_DIR}/template # no trailing slash
+readonly BROKER_DATA_PLANE_CONFIG_DIR=${DATA_PLANE_CONFIG_DIR}/broker
+readonly KAFKA_BROKER_DATA_PLANE_CONFIG_TEMPLATE_DIR=${BROKER_DATA_PLANE_CONFIG_DIR}/template # no trailing slash
 readonly KAFKA_BROKER_DISPATCHER_TEMPLATE_FILE=${KAFKA_BROKER_DATA_PLANE_CONFIG_TEMPLATE_DIR}/500-dispatcher.yaml
 readonly KAFKA_BROKER_RECEIVER_TEMPLATE_FILE=${KAFKA_BROKER_DATA_PLANE_CONFIG_TEMPLATE_DIR}/500-receiver.yaml
 
 # Sink config
-readonly KAFKA_SINK_DATA_PLANE_CONFIG_TEMPLATE_DIR=${DATA_PLANE_CONFIG_DIR}/sink/template
+readonly SINK_DATA_PLANE_CONFIG_DIR=${DATA_PLANE_CONFIG_DIR}/sink
+readonly KAFKA_SINK_DATA_PLANE_CONFIG_TEMPLATE_DIR=${SINK_DATA_PLANE_CONFIG_DIR}/template
 readonly KAFKA_SINK_RECEIVER_TEMPLATE_FILE=${KAFKA_SINK_DATA_PLANE_CONFIG_TEMPLATE_DIR}/500-receiver.yaml
 
 readonly receiver="${KNATIVE_KAFKA_BROKER_RECEIVER:-knative-kafka-broker-receiver}"
@@ -130,7 +131,7 @@ function k8s() {
   echo "receiver image   ---> ${KNATIVE_KAFKA_BROKER_RECEIVER_IMAGE}"
   echo "receiver image   ---> ${KNATIVE_KAFKA_SINK_RECEIVER_IMAGE}"
 
-  ko resolve ${KO_FLAGS} --strict -f ${DATA_PLANE_CONFIG_DIR} | "${LABEL_YAML_CMD[@]}" >>"${EVENTING_KAFKA_BROKER_ARTIFACT}"
+  ko resolve ${KO_FLAGS} --strict -f ${BROKER_DATA_PLANE_CONFIG_DIR} | "${LABEL_YAML_CMD[@]}" >>"${EVENTING_KAFKA_BROKER_ARTIFACT}"
   ko resolve ${KO_FLAGS} --strict -f ${SINK_DATA_PLANE_CONFIG_DIR} | "${LABEL_YAML_CMD[@]}" >>"${EVENTING_KAFKA_SINK_ARTIFACT}"
 
   sed "s|\${KNATIVE_KAFKA_BROKER_DISPATCHER_IMAGE}|${KNATIVE_KAFKA_BROKER_DISPATCHER_IMAGE}|g" ${KAFKA_BROKER_DISPATCHER_TEMPLATE_FILE} |

diff --git a/test/e2e-common.sh b/test/e2e-common.sh
@@ -155,3 +155,11 @@ function export_logs_continuously() {
     kubectl logs -n ${SYSTEM_NAMESPACE} -f -l=app="$deployment" >"$ARTIFACTS/${SYSTEM_NAMESPACE}/$deployment" 2>&1 &
   done
 }
+
+function save_release_artifacts() {
+  # Copy our release artifacts into artifacts, so that release artifacts of a PR can be tested and reviewed without
+  # building the project from source.
+  cp "${EVENTING_KAFKA_BROKER_ARTIFACT}" "${ARTIFACTS}/${EVENTING_KAFKA_BROKER_ARTIFACT}" || return $?
+  cp "${EVENTING_KAFKA_SINK_ARTIFACT}" "${ARTIFACTS}/${EVENTING_KAFKA_SINK_ARTIFACT}" || return $?
+  cp "${EVENTING_KAFKA_CONTROL_PLANE_ARTIFACT}" "${ARTIFACTS}/${EVENTING_KAFKA_CONTROL_PLANE_ARTIFACT}" || return $?
+}
diff --git a/test/e2e-tests.sh b/test/e2e-tests.sh
@@ -22,6 +22,8 @@ if ! ${SKIP_INITIALIZE}; then
   initialize $@ --skip-istio-addon
 fi
 
+save_release_artifacts || fail_test "Failed to save release artifacts"
+
 if ! ${LOCAL_DEVELOPMENT}; then
   scale_controlplane kafka-controller kafka-webhook-eventing eventing-webhook eventing-controller
   wait_until_pods_running knative-eventing || fail_test "Pods in knative-eventing didn't come up"