OpenFunction
diff --git a/‎content/en/docs/best-practices/interact-with-dapr-output-binding.md‎
Lines changed: 27 additions & 31 deletions b/‎content/en/docs/best-practices/interact-with-dapr-output-binding.md‎
Lines changed: 27 additions & 31 deletions
diff --git a/‎content/en/docs/best-practices/logs-handler-function.md‎
Lines changed: 60 additions & 58 deletions b/‎content/en/docs/best-practices/logs-handler-function.md‎
Lines changed: 60 additions & 58 deletions
diff --git a/‎content/en/docs/best-practices/skywalking-solution-for-openfunction.md‎
Lines changed: 16 additions & 15 deletions b/‎content/en/docs/best-practices/skywalking-solution-for-openfunction.md‎
Lines changed: 16 additions & 15 deletions
diff --git a/‎content/en/docs/concepts/Events/event-bus-and-trigger.md‎
Lines changed: 20 additions & 22 deletions b/‎content/en/docs/concepts/Events/event-bus-and-trigger.md‎
Lines changed: 20 additions & 22 deletions
@@ -114,7 +114,7 @@ The following diagram illustrates the relationship between these functions.
 1. Use the following example YAML file to create a manifest `kafka-input.yaml` and modify the value of `spec.image` to set your own image registry address. The field `spec.serving.inputs` defines an input source that points to a Dapr component of the Kafka server. It means that the `kafka-input` function will be driven by events in the topic `sample-topic` of the Kafka server.
 
    ```yaml
-   apiVersion: core.openfunction.io/v1beta1
+   apiVersion: core.openfunction.io/v1beta2
    kind: Function
    metadata:
      name: kafka-input
@@ -133,15 +133,19 @@ The following diagram illustrates the relationship between these functions.
          sourceSubPath: "functions/async/bindings/kafka-input"
          revision: "main"
      serving:
-       runtime: async
        scaleOptions:
          minReplicas: 0
          maxReplicas: 10 
          keda:
+           triggers:
+           - type: kafka
+             metadata:
+               topic: sample-topic
+               bootstrapServers: kafka-server-kafka-brokers.default.svc:9092
+               consumerGroup: kafka-input
+               lagThreshold: "20"
            scaledObject:
              pollingInterval: 15
-             minReplicaCount: 0
-             maxReplicaCount: 10
              cooldownPeriod: 60
              advanced:
                horizontalPodAutoscalerConfig:
@@ -154,16 +158,11 @@ The following diagram illustrates the relationship between these functions.
                        periodSeconds: 15
                    scaleUp:
                      stabilizationWindowSeconds: 0
+
        triggers:
-         - type: kafka
-           metadata:
-             topic: sample-topic
-             bootstrapServers: kafka-server-kafka-brokers.default.svc:9092
-             consumerGroup: kafka-input
-             lagThreshold: "20"
-       inputs:
-         - name: greeting
-           component: target-topic
+         dapr:
+         - name: target-topic
+           type: bindings.kafka
        bindings:
          target-topic:
            type: bindings.kafka
@@ -192,26 +191,17 @@ The following diagram illustrates the relationship between these functions.
    ```
 
 3. Use the following example YAML file to create a manifest `function-front.yaml` and modify the value of `spec.image` to set your own image registry address.
-
-   ```yaml
-   apiVersion: core.openfunction.io/v1beta1
+   
+```yaml
+   apiVersion: core.openfunction.io/v1beta2
    kind: Function
    metadata:
      name: function-front
-     annotations:
-       plugins: |
-         pre:
-         - plugin-custom
-         - plugin-example
-         post:
-         - plugin-custom
-         - plugin-example
    spec:
      version: "v1.0.0"
      image: "<your registry name>/sample-knative-dapr:latest"
      imageCredentials:
        name: push-secret
-     port: 8080 # Default to 8080
      build:
        builder: openfunction/builder-go:latest
        env:
@@ -222,14 +212,20 @@ The following diagram illustrates the relationship between these functions.
          sourceSubPath: "functions/knative/with-output-binding"
          revision: "main"
      serving:
+        hooks:
+          pre:
+            - plugin-custom
+            - plugin-example
+          post:
+            - plugin-example
+            - plugin-custom
        scaleOptions:
          minReplicas: 0
          maxReplicas: 5
-       runtime: knative
        outputs:
-         - name: target
-           component: kafka-server
-           operation: "create"
+         - dapr:
+             name: kafka-server
+             operation: "create"
        bindings:
          kafka-server:
            type: bindings.kafka
@@ -249,8 +245,8 @@ The following diagram illustrates the relationship between these functions.
          containers:
            - name: function
              imagePullPolicy: Always
-   ```
-   
+ ```
+
    {{% alert title="Note" color="success" %}}
 
    `metadata.plugins.pre` defines the order of plugins that need to be called before the user function is executed. `metadata.plugins.post` defines the order of plugins that need to be called after the user function is executed. For more information about the logic of these two plugins and the effect of the plugins after they are executed, see [Plugin mechanism](https://github.com/OpenFunction/samples/blob/main/functions-framework/README.md#plugin-mechanism).
 
@@ -111,87 +111,89 @@ This document uses an asynchronous function to analyze the log stream in Kafka t
 
 1. Use the following example YAML file to create a manifest `logs-handler-function.yaml` and modify the value of `spec.image` to set your own image registry address.
 
-   ```yaml
-   apiVersion: core.openfunction.io/v1beta1
+```yaml
+   apiVersion: core.openfunction.io/v1beta2
    kind: Function
    metadata:
      name: logs-async-handler
+     namespace: default
    spec:
-     version: "v2.0.0"
-     image: <your registry name>/logs-async-handler:latest
-     imageCredentials:
-       name: push-secret
      build:
        builder: openfunction/builder-go:latest
        env:
-         FUNC_NAME: "LogsHandler"
          FUNC_CLEAR_SOURCE: "true"
-         # Use FUNC_GOPROXY to set the goproxy
-         # FUNC_GOPROXY: "https://goproxy.cn"
+         FUNC_NAME: LogsHandler
        srcRepo:
-         url: "https://github.com/OpenFunction/samples.git"
-         sourceSubPath: "functions/async/logs-handler-function/"
-         revision: "main"
+         revision: main
+         sourceSubPath: functions/async/logs-handler-function/
+         url: https://github.com/OpenFunction/samples.git
+     image: openfunctiondev/logs-async-handler:v1
+     imageCredentials:
+       name: push-secret
      serving:
-       runtime: "async"
-       scaleOptions:
-         keda:
-           scaledObject:
-             pollingInterval: 15
-             minReplicaCount: 0
-             maxReplicaCount: 10
-             cooldownPeriod: 60
-             advanced:
-               horizontalPodAutoscalerConfig:
-                 behavior:
-                   scaleDown:
-                     stabilizationWindowSeconds: 45
-                     policies:
-                     - type: Percent
-                       value: 50
-                       periodSeconds: 15
-                   scaleUp:
-                     stabilizationWindowSeconds: 0
-       triggers:
-         - type: kafka
-           metadata:
-             topic: logs
-             bootstrapServers: kafka-server-kafka-brokers.default.svc.cluster.local:9092
-             consumerGroup: logs-handler
-             lagThreshold: "20"
-       template:
-         containers:
-           - name: function
-             imagePullPolicy: Always
-       inputs:
-         - name: kafka
-           component: kafka-receiver
-       outputs:
-         - name: notify
-           component: notification-manager
-           operation: "post"
        bindings:
          kafka-receiver:
-           type: bindings.kafka
-           version: v1
            metadata:
              - name: brokers
-               value: "kafka-server-kafka-brokers:9092"
+               value: kafka-server-kafka-brokers:9092
              - name: authRequired
                value: "false"
              - name: publishTopic
-               value: "logs"
+               value: logs
              - name: topics
-               value: "logs"
+               value: logs
              - name: consumerGroup
-               value: "logs-handler"
-         notification-manager:
-           type: bindings.http
+               value: logs-handler
+           type: bindings.kafka
            version: v1
+         notification-manager:
            metadata:
              - name: url
                value: http://notification-manager-svc.kubesphere-monitoring-system.svc.cluster.local:19093/api/v2/alerts
-   ```
+           type: bindings.http
+           version: v1
+       outputs:
+         - dapr:
+             name: notification-manager
+             operation: post
+             type: bindings.http
+       scaleOptions:
+         keda:
+           scaledObject:
+             advanced:
+               horizontalPodAutoscalerConfig:
+                 behavior:
+                   scaleDown:
+                     policies:
+                       - periodSeconds: 15
+                         type: Percent
+                         value: 50
+                     stabilizationWindowSeconds: 45
+                   scaleUp:
+                     stabilizationWindowSeconds: 0
+             cooldownPeriod: 60
+             pollingInterval: 15
+           triggers:
+             - metadata:
+                 bootstrapServers: kafka-server-kafka-brokers.default.svc.cluster.local:9092
+                 consumerGroup: logs-handler
+                 lagThreshold: "20"
+                 topic: logs
+               type: kafka
+         maxReplicas: 10
+         minReplicas: 0
+       template:
+         containers:
+           - imagePullPolicy: IfNotPresent
+             name: function
+       triggers:
+         dapr:
+           - name: kafka-receiver
+             type: bindings.kafka
+       workloadType: Deployment
+     version: v2.0.0
+     workloadRuntime: OCIContainer
+```
 
 2. Run the following command to create the function `logs-async-handler`.
 
 
@@ -72,7 +72,7 @@ This document uses `skywalking-oap.default:11800` as an example of the skywalkin
 
    ```yaml
    data:
-     plugins.tracing: |
+     tracing: |
        enabled: true
        provider:
          name: "skywalking"
@@ -94,20 +94,21 @@ To enable tracing configuration in the function-level, add the field `plugins.tr
 ```yaml
 metadata:
   name: tracing-function
-  annotations:
-    plugins.tracing: |
-      enabled: true
-      provider:
-        name: "skywalking"
-        oapServer: "skywalking-oap:11800"
-      tags:
-        func: tracing-function
-        layer: faas
-        tag1: value1
-        tag2: value2
-      baggage:
-        key: "key1"
-        value: "value1"
+spec:
+   serving:
+      tracing:
+        enabled: true
+        provider:
+          name: "skywalking"
+          oapServer: "skywalking-oap:11800"
+        tags:
+          func: tracing-function
+          layer: faas
+          tag1: value1
+          tag2: value2
+        baggage:
+          key: "key1"
+          value: "value1"
 ```
 
 It is recommended that you use the global tracing configuration, or you have to add function-level tracing configuration for every function you create.
 
@@ -27,35 +27,33 @@ helm install stan nats/stan --set stan.nats.url=nats://nats:4222
 1. Use the following content to create a configuration file (for example, `openfuncasync-function.yaml`) for the target function, which is triggered by the Trigger CRD and prints the received message.
 
    ```yaml
-   apiVersion: core.openfunction.io/v1beta1
+   apiVersion: core.openfunction.io/v1beta2
    kind: Function
    metadata:
      name: trigger-target
    spec:
      version: "v1.0.0"
      image: openfunctiondev/v1beta1-trigger-target:latest
-     port: 8080
      serving:
-       runtime: "async"
        scaleOptions:
          keda:
            scaledObject:
              pollingInterval: 15
              minReplicaCount: 0
              maxReplicaCount: 10
              cooldownPeriod: 30
+           triggers:
+             - type: stan
+               metadata:
+                 natsServerMonitoringEndpoint: "stan.default.svc.cluster.local:8222"
+                 queueGroup: "grp1"
+                 durableName: "ImDurable"
+                 subject: "metrics"
+                 lagThreshold: "10"
        triggers:
-         - type: stan
-           metadata:
-             natsServerMonitoringEndpoint: "stan.default.svc.cluster.local:8222"
-             queueGroup: "grp1"
-             durableName: "ImDurable"
-             subject: "metrics"
-             lagThreshold: "10"
-       inputs:
-         - name: autoscaling-pubsub
-           component: eventbus
-           topic: metrics
+         dapr:
+           - name: eventbus
+             topic: metrics
        pubsub:
          eventbus:
            type: pubsub.natsstreaming
@@ -233,7 +231,7 @@ helm install stan nats/stan --set stan.nats.url=nats://nats:4222
 1. Use the following content to create an event producer configuration file (for example, `events-producer.yaml`).
 
    ```yaml
-   apiVersion: core.openfunction.io/v1beta1
+   apiVersion: core.openfunction.io/v1beta2
    kind: Function
    metadata:
      name: events-producer
@@ -245,14 +243,14 @@ helm install stan nats/stan --set stan.nats.url=nats://nats:4222
          containers:
            - name: function
              imagePullPolicy: Always
-       runtime: "async"
-       inputs:
-         - name: cron
-           component: cron
+       triggers:
+         dapr:
+           - name: cron
+             type: bindings.cron
        outputs:
-         - name: target
-           component: kafka-server
-           operation: "create"
+         - dapr:
+             name: kafka-server
+             operation: "create"
        bindings:
          cron:
            type: bindings.cron