Merge pull request #279 from mindwm/feat/mindwm-function-xrd

Feat/mindwm function xrd

Author: metacoma

Makefile

@@ -44,7 +44,7 @@ dns_search_domain:
 
 .ONESHELL: docker_insecure_registry
 docker_insecure_registry:
-	INSECURE_REGISTRY="zot-int.zot.svc.cluster.local:5000"
+	INSECURE_REGISTRY="$(MINDWM_HOST_REGISTRY)"
 	DOCKER_CONFIG="/etc/docker/daemon.json"
 
 	if [[ ! -f "$$DOCKER_CONFIG" ]]; then
@@ -244,7 +244,7 @@ service_dashboard:
 	export INGRESS_HOST=$$(kubectl -n "$$INGRESS_NS" get service "$$INGRESS_NAME" -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
 	export INGRESS_PORT=$$(kubectl -n "$$INGRESS_NS" get service "$$INGRESS_NAME" -o jsonpath='{.spec.ports[?(@.name=="http2")].port}')
 	cat<<EOF
-	echo $$INGRESS_HOST argocd.$(DOMAIN) grafana.$(DOMAIN) vm.$(DOMAIN) nats.$(DOMAIN) neo4j.$(CONTEXT_NAME).$(DOMAIN) tempo.$(DOMAIN) | sudo tee -a /etc/hosts
+	echo $$INGRESS_HOST argocd.$(DOMAIN) grafana.$(DOMAIN) vm.$(DOMAIN) nats.$(DOMAIN) neo4j.$(CONTEXT_NAME).$(DOMAIN) tempo.$(DOMAIN) $(MINDWM_HOST_REGISTRY) | sudo tee -a /etc/hosts
 	http://argocd.$(DOMAIN):$$INGRESS_PORT
 	http://grafana.$(DOMAIN):$$INGRESS_PORT
 	http://loki.$(DOMAIN):$$INGRESS_PORT
@@ -260,7 +260,7 @@ edit_hosts:
 	export INGRESS_NS=istio-system
 	export INGRESS_HOST=$$(kubectl -n "$$INGRESS_NS" get service "$$INGRESS_NAME" -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
 	sudo sed -i -e '/$(DOMAIN)/d' /etc/hosts
-	echo $$INGRESS_HOST argocd.$(DOMAIN) grafana.$(DOMAIN) vm.$(DOMAIN) nats.$(DOMAIN) neo4j.$(CONTEXT_NAME).$(DOMAIN) tempo.$(DOMAIN) loki.$(DOMAIN) neo4j.cyan.$(DOMAIN) | sudo tee -a /etc/hosts
+	echo $$INGRESS_HOST argocd.$(DOMAIN) grafana.$(DOMAIN) vm.$(DOMAIN) nats.$(DOMAIN) neo4j.$(CONTEXT_NAME).$(DOMAIN) tempo.$(DOMAIN) loki.$(DOMAIN) neo4j.cyan.$(DOMAIN) $(MINDWM_HOST_REGISTRY) | sudo tee -a /etc/hosts
 
 .PHONY: mindwm_test
 mindwm_test:

config_schema.k

@@ -5,6 +5,8 @@ userPrefix = "user"
 contextPrefix = "context"
 hostPrefix = "host"
 
+minwdm_host_registry = "zot-int.zot.svc.cluster.local:5000"
+
 schema ResourceNameStr:
     data: str
     check:
@@ -24,11 +26,11 @@ crossplaneResourceName = lambda entity: any, resourceName : ResourceNameStr -> s
 
 crossplane_user2context_trigger_name = lambda user : MindwmUser, ctx: MindwmContext -> str {
   "user-" + getData(user.name) + "-to-context-" + getData(ctx.name)
-} 
+}
 
 crossplane_context2user_trigger_name = lambda user : MindwmUser, ctx: MindwmContext -> str {
   "context-" + getData(ctx.name) + "-to-user-" + getData(user.name)
-} 
+}
 
 domain: DomainStr { data = "mindwm.local" }
 
@@ -45,7 +47,7 @@ schema MindwmHost:
     # from user_broker to host broker trigger
     trigger_back: Trigger {
       name.data = "user-broker-to-" + getData(name) + "-broker-trigger"
-    } 
+    }
 
 schema MindwmUser:
     name: ResourceNameStr
@@ -55,30 +57,30 @@ schema MindwmUser:
 schema MindwmContext:
     name: ResourceNameStr
     namespace: ResourceNameStr = { data = "${contextPrefix}-${getData(name)}" }
-    broker: Broker { 
+    broker: Broker {
       name.data = "context-broker"
       virtual_service = {
         name.data = "broker-virtual-service"
-      } 
-    } 
+      }
+    }
     kafka: Kafka {}
     neo4j: Neo4j {}
     vector: Vector {}
-    cdc_topic: KafkaTopic { 
+    cdc_topic: KafkaTopic {
       name.data = "context-" + getData(name) + "-cdc"
-    } 
-    gateway: IstioGateway { 
-      name.data = "gateway" 
+    }
+    gateway: IstioGateway {
+      name.data = "gateway"
       hosts = [
         "neo4j." + getData(name) + "." + getData(domain)
-      ] 
-    } 
+      ]
+    }
     neo4j_virtual_service: IstioVirtualService {
       name.data = "neo4j-virtual-service"
-    } 
+    }
     node_red_virtual_service: IstioVirtualService {
       name.data = "node-red-virtual-service"
-    } 
+    }
     kafkaSource: KafkaSource = {
         name.data = getData(cdc_topic.name) + "-kafkasource"
         topicName = cdc_topic.name
@@ -111,7 +113,7 @@ schema Broker:
         { data = "${getData(brokerName)}-config" }
     })(name)
     deadLetter: DeadLetter { name.data = "dead-letter" }
-    virtual_service?: IstioVirtualService 
+    virtual_service?: IstioVirtualService
 
 schema DeadLetter:
     name: ResourceNameStr
@@ -152,13 +154,13 @@ schema Crossplane:
     domain: DomainStr { data = "mindwm.io" }
 
 schema IstioGateway:
-    name: ResourceNameStr 
+    name: ResourceNameStr
     hosts: [str]
 
 schema IstioVirtualService:
     name: ResourceNameStr
 
 schema KnativeFunction:
-    name: ResourceNameStr 
+    name: ResourceNameStr
     image: str
 #ctx = MindwmContext { name.data = "pink" }

main.k

@@ -407,7 +407,7 @@ mindwm_app = ArgoCdOrder.make({
                     "argocd.argoproj.io/sync-options" = "SkipDryRunOnMissingResource=true"
                 }
             })
-            for resource in XrdKclFunction.makeContextXR() + XrdKclFunction.makeUserXR() + XrdKclFunction.makeHostXR()
+            for resource in XrdKclFunction.makeContextXR() + XrdKclFunction.makeUserXR() + XrdKclFunction.makeHostXR() + XrdKclFunction.makeFunctionXR()
         ]
         [
             k8core.Service {

manifests/tekton-pipelines.yaml

@@ -24513,7 +24513,7 @@ data:
   #
   # See more in the Affinity Assistant documentation
   # https://github.com/tektoncd/pipeline/blob/main/docs/affinityassistants.md
-  coschedule: "workspaces"
+  coschedule: "disabled"
   # Setting this flag to "true" will prevent Tekton scanning attached
   # service accounts and injecting any credentials it finds into your
   # Steps.