update main branch samples

Signed-off-by: laminar <[email protected]>

Author: tpiperatgod

Prerequisites.md

@@ -26,7 +26,7 @@ You can refer to the [Installation Guide](https://github.com/OpenFunction/OpenFu
      namespace: default
    spec:
      kafka:
-       version: 2.8.0
+       version: 3.1.0
        replicas: 1
        listeners:
          - name: plain
@@ -41,8 +41,9 @@ You can refer to the [Installation Guide](https://github.com/OpenFunction/OpenFu
          offsets.topic.replication.factor: 1
          transaction.state.log.replication.factor: 1
          transaction.state.log.min.isr: 1
-         log.message.format.version: '2.8'
-         inter.broker.protocol.version: "2.8"
+         default.replication.factor: 1
+         min.insync.replicas: 1
+         inter.broker.protocol.version: "3.1"
        storage:
          type: ephemeral
      zookeeper:
@@ -53,7 +54,7 @@ You can refer to the [Installation Guide](https://github.com/OpenFunction/OpenFu
        topicOperator: {}
        userOperator: {}
    ---
-   apiVersion: kafka.strimzi.io/v1beta1
+   apiVersion: kafka.strimzi.io/v1beta2
    kind: KafkaTopic
    metadata:
      name: <kafka-topic>

README.md

@@ -1,5 +1,9 @@
 # OpenFunction function samples
 
+For samples of the latest stable version, please visit here:
+
+-> [v0.6.0 samples](https://github.com/openFunction/samples/tree/release-0.6)
+
 ## Function samples
 
 The following are samples of OpenFunction function.

apps/buildah/function-buildah.yaml

@@ -13,12 +13,13 @@ spec:
     srcRepo:
       url: "https://github.com/OpenFunction/samples.git"
       sourceSubPath: "apps/with-dockerfile"
+      revision: "main"
     shipwright:
       strategy:
         name: buildah
         kind: ClusterBuildStrategy
   serving:
-    runtime: Knative
+    runtime: knative
     template:
       containers:
         - name: function

apps/kaniko/function-kaniko.yaml

@@ -13,12 +13,13 @@ spec:
     srcRepo:
       url: "https://github.com/OpenFunction/samples.git"
       sourceSubPath: "apps/with-dockerfile"
+      revision: "main"
     shipwright:
       strategy:
         name: kaniko
         kind: ClusterBuildStrategy
   serving:
-    runtime: Knative
+    runtime: knative
     template:
       containers:
         - name: function

apps/ko/function-ko.yaml

@@ -13,12 +13,13 @@ spec:
     srcRepo:
       url: "https://github.com/OpenFunction/samples.git"
       sourceSubPath: "apps/with-dockerfile"
+      revision: "main"
     shipwright:
       strategy:
         name: ko
         kind: ClusterBuildStrategy
   serving:
-    runtime: Knative
+    runtime: knative
     template:
       containers:
         - name: function

apps/sample-apps-java-maven.yaml

@@ -13,8 +13,9 @@ spec:
     srcRepo:
       url: "https://github.com/buildpacks/samples.git"
       sourceSubPath: "apps/java-maven"
+      revision: "main"
   serving:
-    runtime: "Knative" # default to Knative
+    runtime: "knative" # default to knative
     template:
       containers:
         - name: function

functions-framework/golang/Knative/http/README.md

@@ -24,7 +24,7 @@ export FUNC_CONTEXT='{"name":"function-demo","version":"v1.0.0","port":"8080","r
 Start the function:
 
 ```shell
-go run main.go plugin.go
+go run main.go
 ```
 
 Access the function:

functions/Async/bindings/README.md

@@ -22,7 +22,7 @@ kind: Function
 metadata:
   name: bindings-without-output
 spec:
-  image: "<your registry name>/bindings-without-output:v2"
+  image: "<your registry name>/bindings-without-output:latest"
 ```
 
 Use the following commands to create this Function:
@@ -64,7 +64,7 @@ kind: Function
 metadata:
   name: bindings-with-output
 spec:
-  image: "<your registry name>/bindings-with-output:v2"
+  image: "<your registry name>/bindings-with-output:latest"
 ```
 
 Use the following commands to create this Function:

functions/Async/bindings/with-output/function-bindings.yaml

@@ -12,23 +12,23 @@ metadata:
       - plugin-example
 spec:
   version: "v2.0.0"
-  image: openfunctiondev/bindings-with-output:v2
+  image: openfunctiondev/bindings-with-output:latest
   imageCredentials:
     name: push-secret
   build:
-    builder: openfunction/builder-go:v2-1.16
+    builder: openfunction/builder-go:latest
     env:
       FUNC_NAME: "BindingsOutput"
       FUNC_CLEAR_SOURCE: "true"
     srcRepo:
       url: "https://github.com/OpenFunction/samples.git"
       sourceSubPath: "functions/Async/bindings/with-output/"
-      revision: "release-0.6"
+      revision: "main"
   serving:
     template:
       containers:
         - name: function
-          imagePullPolicy: IfNotPresent
+          imagePullPolicy: Always
     runtime: "async"
     inputs:
       - name: cron

functions/Async/bindings/with-output/output-target/output-target.yaml

@@ -4,18 +4,18 @@ metadata:
   name: output-target
 spec:
   version: "v2.0.0"
-  image: openfunctiondev/bindings-output-target:v2
+  image: openfunctiondev/bindings-output-target:latest
   imageCredentials:
     name: push-secret
   build:
-    builder: openfunction/builder-go:v2-1.16
+    builder: openfunction/builder-go:latest
     env:
       FUNC_NAME: "Target"
       FUNC_CLEAR_SOURCE: "true"
     srcRepo:
       url: "https://github.com/OpenFunction/samples.git"
       sourceSubPath: "functions/Async/bindings/with-output/output-target"
-      revision: "release-0.6"
+      revision: "main"
   serving:
     runtime: async
     inputs:
@@ -39,4 +39,4 @@ spec:
     template:
       containers:
         - name: function
-          imagePullPolicy: IfNotPresent
+          imagePullPolicy: Always

functions/Async/bindings/without-output/function-bindings.yaml

@@ -4,23 +4,23 @@ metadata:
   name: bindings-without-output
 spec:
   version: "v2.0.0"
-  image: openfunctiondev/bindings-without-output:v2
+  image: openfunctiondev/bindings-without-output:latest
   imageCredentials:
     name: push-secret
   build:
-    builder: openfunction/builder-go:v2-1.16
+    builder: openfunction/builder-go:latest
     env:
       FUNC_NAME: "BindingsNoOutput"
       FUNC_CLEAR_SOURCE: "true"
     srcRepo:
       url: "https://github.com/OpenFunction/samples.git"
       sourceSubPath: "functions/Async/bindings/without-output"
-      revision: "release-0.6"
+      revision: "main"
   serving:
     template:
       containers:
         - name: function
-          imagePullPolicy: IfNotPresent
+          imagePullPolicy: Always
     runtime: "async"
     inputs:
       - name: input

functions/Async/logs-handler-function/logs-handler-function.yaml

@@ -4,11 +4,11 @@ metadata:
   name: logs-async-handler
 spec:
   version: "v2.0.0"
-  image: openfunctiondev/logs-async-handler:v2
+  image: openfunctiondev/logs-async-handler:latest
   imageCredentials:
     name: push-secret
   build:
-    builder: openfunction/builder-go:v2-1.16
+    builder: openfunction/builder-go:latest
     env:
       FUNC_NAME: "LogsHandler"
       FUNC_CLEAR_SOURCE: "true"
@@ -17,7 +17,7 @@ spec:
     srcRepo:
       url: "https://github.com/OpenFunction/samples.git"
       sourceSubPath: "functions/Async/logs-handler-function/"
-      revision: "release-0.6"
+      revision: "main"
   serving:
     runtime: "async"
     scaleOptions:
@@ -37,7 +37,7 @@ spec:
     template:
       containers:
         - name: function
-          imagePullPolicy: IfNotPresent
+          imagePullPolicy: Always
     inputs:
       - name: kafka
         component: kafka-receiver

functions/Async/pubsub/README.md

@@ -18,8 +18,8 @@ Build and push the producer image.
 
 ```shell
 cd producer
-docker build -t <your registry name>/v1beta1-autoscaling-producer:v2 -f Dockerfile.producer .
-docker push <your registry name>/v1beta1-autoscaling-producer:v2
+docker build -t <your registry name>/v1beta1-autoscaling-producer:latest -f Dockerfile.producer .
+docker push <your registry name>/v1beta1-autoscaling-producer:latest
 ```
 
 Modify the container image in `deploy.yaml`:
@@ -30,8 +30,8 @@ Modify the container image in `deploy.yaml`:
     spec:
       containers:
         - name: producer
-          image: <your registry name>/v1beta1-autoscaling-producer:v2
-          imagePullPolicy: IfNotPresent
+          image: <your registry name>/v1beta1-autoscaling-producer:latest
+          imagePullPolicy: Always
           env:
             - name: PUBSUB_NAME
               value: "autoscaling-producer"
@@ -59,7 +59,7 @@ kind: Function
 metadata:
   name: autoscaling-subscriber
 spec:
-  image: "<your registry name>/autoscaling-subscriber:v2"
+  image: "<your registry name>/autoscaling-subscriber:latest"
 ```
 
 Use the following commands to create these Functions:

functions/Async/pubsub/producer/deploy.yaml

@@ -5,7 +5,7 @@ metadata:
   labels:
     app: producer
 spec:
-  replicas: 2
+  replicas: 1
   selector:
     matchLabels:
       app: producer
@@ -22,8 +22,8 @@ spec:
     spec:
       containers:
         - name: producer
-          image: openfunctiondev/v1beta1-autoscaling-producer:v2
-          imagePullPolicy: IfNotPresent
+          image: openfunctiondev/v1beta1-autoscaling-producer:latest
+          imagePullPolicy: Always
           env:
             - name: PUBSUB_NAME
               value: "autoscaling-producer"

functions/Async/pubsub/subscriber/function-subscriber.yaml

@@ -4,11 +4,11 @@ metadata:
   name: autoscaling-subscriber
 spec:
   version: "v2.0.0"
-  image: openfunctiondev/autoscaling-subscriber:v2
+  image: openfunctiondev/autoscaling-subscriber:latest
   imageCredentials:
     name: push-secret
   build:
-    builder: openfunction/builder-go:v2-1.16
+    builder: openfunction/builder-go:latest
     env:
       FUNC_NAME: "Subscriber"
       FUNC_CLEAR_SOURCE: "true"
@@ -17,7 +17,7 @@ spec:
     srcRepo:
       url: "https://github.com/OpenFunction/samples.git"
       sourceSubPath: "functions/Async/pubsub/subscriber"
-      revision: "release-0.6"
+      revision: "main"
   serving:
     runtime: "async"
     scaleOptions:
@@ -37,7 +37,7 @@ spec:
     template:
       containers:
         - name: function
-          imagePullPolicy: IfNotPresent
+          imagePullPolicy: Always
     inputs:
       - name: producer
         component: kafka-server

functions/Knative/function-with-dapr/README.md

@@ -45,7 +45,7 @@ serving:
   template:
     containers:
       - name: function
-        imagePullPolicy: IfNotPresent
+        imagePullPolicy: Always
 ```
 
 Use the following command to create the function:

functions/Knative/function-with-dapr/function-front.yaml

@@ -12,19 +12,19 @@ metadata:
       - plugin-example
 spec:
   version: "v1.0.0"
-  image: "openfunctiondev/sample-knative-dapr:v2"
+  image: "openfunctiondev/sample-knative-dapr:latest"
   imageCredentials:
     name: push-secret
   port: 8080 # default to 8080
   build:
-    builder: openfunction/builder-go:v2-1.16
+    builder: openfunction/builder-go:latest
     env:
       FUNC_NAME: "Sender"
       FUNC_CLEAR_SOURCE: "true"
     srcRepo:
       url: "https://github.com/OpenFunction/samples.git"
       sourceSubPath: "functions/Knative/function-with-dapr"
-      revision: "release-0.6"
+      revision: "main"
   serving:
     scaleOptions:
       minCount: 0
@@ -52,4 +52,4 @@ spec:
     template:
       containers:
         - name: function
-          imagePullPolicy: IfNotPresent
+          imagePullPolicy: Always

functions/Knative/function-with-dapr/output-target/output-target.yaml

@@ -4,18 +4,18 @@ metadata:
   name: output-target
 spec:
   version: "v1.0.0"
-  image: openfunctiondev/bindings-output-target:v2
+  image: openfunctiondev/bindings-output-target:latest
   imageCredentials:
     name: push-secret
   build:
-    builder: openfunction/builder-go:v2-1.16
+    builder: openfunction/builder-go:latest
     env:
       FUNC_NAME: "Target"
       FUNC_CLEAR_SOURCE: "true"
     srcRepo:
       url: "https://github.com/OpenFunction/samples.git"
       sourceSubPath: "functions/Knative/function-with-dapr/output-target"
-      revision: "release-0.6"
+      revision: "main"
   serving:
     runtime: async
     inputs:
@@ -40,4 +40,4 @@ spec:
     template:
       containers:
         - name: function
-          imagePullPolicy: IfNotPresent
+          imagePullPolicy: Always