Fix core interceptors installation errors

We need to wait for the Interceptors CRD to become established before we can create the core interceptors. Otherwise, we run the risk of trying to create the core-interceptors too early leading to installation errors. Signed-off-by: Dibyo Mukherjee <[email protected]>
tektoncd · Jan 28, 2021 · 2acfa07 · 2acfa07
1 parent e9543ad
commit 2acfa07
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/config/core-interceptors-deployment.yaml → ...ceptors/core-interceptors-deployment.yaml b/config/core-interceptors-deployment.yaml → ...ceptors/core-interceptors-deployment.yaml
diff --git a/config/core-interceptors.yaml → config/interceptors/core-interceptors.yaml b/config/core-interceptors.yaml → config/interceptors/core-interceptors.yaml
diff --git a/examples/v1alpha1-task/v1alpha1-task-listener.yaml b/examples/v1alpha1-task/v1alpha1-task-listener.yaml
@@ -19,7 +19,7 @@ spec:
 apiVersion: triggers.tekton.dev/v1alpha1
 kind: EventListener
 metadata:
-  name: v1alpha1-task-listener
+  name: v1alpha1-task-listener-mkt-cloud---product-hierarchy-replication-salesbagsreplication
 spec:
   serviceAccountName: tekton-triggers-example-sa
   triggers:

diff --git a/test/e2e-common.sh b/test/e2e-common.sh
@@ -54,11 +54,16 @@ function install_triggers_crd() {
   echo ">> Deploying Tekton Triggers"
   ko apply -f config/ || fail_test "Tekton Triggers installation failed"
 
+  # Wait for the Interceptors CRD to be available before adding the core-interceptors
+  kubectl wait --for=condition=Established --timeout=30s crds/interceptors.triggers.tekton.dev
+  ko apply -f config/interceptors || fail_test "Core interceptors installation failed"
+
   # Make sure that eveything is cleaned up in the current namespace.
   for res in eventlistener triggertemplate triggerbinding clustertriggerbinding; do
     kubectl delete --ignore-not-found=true ${res}.triggers.tekton.dev --all
   done
 
   # Wait for pods to be running in the namespaces we are deploying to
   wait_until_pods_running tekton-pipelines || fail_test "Tekton Triggers did not come up"
-}
+
+}