Add knative crds + move knative CRs to plugin-infra

Makefile

@@ -365,15 +365,18 @@ undeploy: kustomize ## Undeploy controller from the K8s cluster specified in ~/.
 .PHONY: plugin-infra
 plugin-infra:
 	@if [ -d "config/profile/$(PROFILE)/plugin-infra" ]; then \
-		$(KUSTOMIZE) build config/profile/$(PROFILE)/plugin-infra | $(KUBECTL) apply -f -; \
+		$(KUBECTL) apply -f config/profile/$(PROFILE)/plugin-infra/orchestrator/infra-serverless.yaml; \
+		$(KUBECTL) wait --for=condition=Established crd --all --timeout=60s; \
+		$(KUBECTL) apply -f config/profile/$(PROFILE)/plugin-infra/orchestrator/infra-knative-cr.yaml; \
+		$(KUBECTL) apply -f config/profile/$(PROFILE)/plugin-infra/orchestrator/infra-sonataflow.yaml; \
 	else \
 		echo "Directory config/profile/$(PROFILE)/plugin-infra does not exist."; \
 	fi
 
 .PHONY: plugin-infra-undeploy
 plugin-infra-undeploy:
 	@if [ -d "config/profile/$(PROFILE)/plugin-infra" ]; then \
-		$(KUSTOMIZE) build config/profile/$(PROFILE)/plugin-infra | $(KUBECTL) delete -f -; \
+		$(KUBECTL) delete -f config/profile/$(PROFILE)/plugin-infra/orchestrator; \
 	else \
 		echo "Directory config/profile/$(PROFILE)/plugin-infra does not exist."; \
 	fi

bundle/rhdh/manifests/rhdh-plugin-deps_v1_configmap.yaml

@@ -65,25 +65,6 @@ data:
                   # Allow openshift-user-workload-monitoring pods to access the workflow.
                   kubernetes.io/metadata.name: openshift-user-workload-monitoring
     ---
-    apiVersion: operator.knative.dev/v1beta1
-    kind: KnativeEventing
-    metadata:
-      name: knative-eventing
-      namespace: knative-eventing
-    spec:
-      Registry: {}
-    ---
-    apiVersion: operator.knative.dev/v1beta1
-    kind: KnativeServing
-    metadata:
-      name: knative-serving
-      namespace: knative-serving
-    spec:
-      controller-custom-certs:
-        name: ""
-        type: ""
-      registry: {}
-    ---
     apiVersion: sonataflow.org/v1alpha08
     kind: SonataFlowPlatform
     metadata:

config/profile/rhdh/plugin-deps/sonataflow.yaml

@@ -62,25 +62,6 @@ spec:
               # Allow openshift-user-workload-monitoring pods to access the workflow.
               kubernetes.io/metadata.name: openshift-user-workload-monitoring
 ---
-apiVersion: operator.knative.dev/v1beta1
-kind: KnativeEventing
-metadata:
-  name: knative-eventing
-  namespace: knative-eventing
-spec:
-  Registry: {}
----
-apiVersion: operator.knative.dev/v1beta1
-kind: KnativeServing
-metadata:
-  name: knative-serving
-  namespace: knative-serving
-spec:
-  controller-custom-certs:
-    name: ""
-    type: ""
-  registry: {}
----
 apiVersion: sonataflow.org/v1alpha08
 kind: SonataFlowPlatform
 metadata:

config/profile/rhdh/plugin-infra/orchestrator/infra-knative-cr.yaml

@@ -0,0 +1,20 @@
+---
+apiVersion: operator.knative.dev/v1beta1
+kind: KnativeEventing
+metadata:
+  name: knative-eventing
+  namespace: knative-eventing
+spec:
+  Registry: {}
+
+---
+apiVersion: operator.knative.dev/v1beta1
+kind: KnativeServing
+metadata:
+  name: knative-serving
+  namespace: knative-serving
+spec:
+  controller-custom-certs:
+    name: ""
+    type: ""
+  registry: {}

config/profile/rhdh/plugin-infra/orchestrator/infra-serverless.yaml

@@ -20,15 +20,4 @@ spec:
   installPlanApproval: Automatic #  whether the update should be installed automatically
   name: serverless-operator  #  name of the operator package
   source: redhat-operators  #  name of the catalog source
-  sourceNamespace: openshift-marketplace
----
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: knative-serving
----
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: knative-eventing
-
+  sourceNamespace: openshift-marketplace

dist/rhdh/install.yaml

@@ -2097,25 +2097,6 @@ data:
                   # Allow openshift-user-workload-monitoring pods to access the workflow.
                   kubernetes.io/metadata.name: openshift-user-workload-monitoring
     ---
-    apiVersion: operator.knative.dev/v1beta1
-    kind: KnativeEventing
-    metadata:
-      name: knative-eventing
-      namespace: knative-eventing
-    spec:
-      Registry: {}
-    ---
-    apiVersion: operator.knative.dev/v1beta1
-    kind: KnativeServing
-    metadata:
-      name: knative-serving
-      namespace: knative-serving
-    spec:
-      controller-custom-certs:
-        name: ""
-        type: ""
-      registry: {}
-    ---
     apiVersion: sonataflow.org/v1alpha08
     kind: SonataFlowPlatform
     metadata:

docs/dynamic-plugins.md

@@ -35,7 +35,7 @@ configMapGenerator:
 
 ### Plugin dependencies infrastructure
 
-If plugin dependencies require infrastructural resources (e.g. other Operators to be installed) and if the User (Administrator) wants it to be deployed (see Note below), they can be specified in the /config/profile/{PROFILE}/plugin-infra directory. To create these resources (along with the operator deployment), use the `make plugin-infra` command. 
+If plugin dependencies require infrastructural resources (e.g. other Operators and CRs to be installed) and if the User (Administrator) wants it to be deployed (see Note below), they can be specified in the /config/profile/{PROFILE}/plugin-infra directory. To create these resources (along with the operator deployment), use the `make plugin-infra` command. 
 
 **Note**: Be cautious when running this command on a production cluster, as it may reconfigure cluster-scoped resources.
 
@@ -73,7 +73,6 @@ See [example](/examples/orchestrator.yaml) for a complete configuration of the o
 
 The orchestrator plugin has the following dependencies:
 - A Sonataflowplatform custom resource - created in the namespace of the Backstage CR.
-- Knativeeventing and Knativeserving custom resources to be created in the knative-eventing and knative-serving namespaces respectively.
 - A set of NetworkPolicies to allow traffic between Knative resources created in the namespace of Backstage CR, traffic for monitoring, and intra-namespace traffic.
 See [profile/rhdh/plugin-deps](/config/profile/rhdh/plugin-deps)