Release v0.25.1

.ci/olm-tests/catalog.yml

@@ -5,4 +5,4 @@ metadata:
   namespace: olm
 spec:
   sourceType: grpc
-  image: kind-registry:5000/streamnativeio/function-mesh-catalog:v0.25.0
+  image: kind-registry:5000/streamnativeio/function-mesh-catalog:v0.25.1

.ci/olm-tests/subs.yml

@@ -6,6 +6,6 @@ metadata:
 spec:
   channel: alpha
   name: function-mesh
-      startingCSV: function-mesh.v0.25.0
+      startingCSV: function-mesh.v0.25.1
   source: my-test-catalog
   sourceNamespace: olm

.github/workflows/bundle-release.yml

@@ -49,10 +49,10 @@ jobs:
           username: ${{ secrets.DOCKER_USER }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
-      - name: Set up GO 1.24.4
+      - name: Set up GO 1.24.6
         uses: actions/setup-go@v1
         with:
-          go-version: 1.24.4
+          go-version: 1.24.6
         id: go
 
       - name: InstallKubebuilder
@@ -180,10 +180,10 @@ jobs:
           username: ${{ secrets.DOCKER_USER }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
-      - name: Set up GO 1.24.4
+      - name: Set up GO 1.24.6
         uses: actions/setup-go@v1
         with:
-          go-version: 1.24.4
+          go-version: 1.24.6
         id: go
 
       - name: InstallKubebuilder

.github/workflows/olm-verify.yml

@@ -34,10 +34,10 @@ jobs:
       - name: checkout
         uses: actions/checkout@v2
 
-      - name: Set up GO 1.24.4
+      - name: Set up GO 1.24.6
         uses: actions/setup-go@v1
         with:
-          go-version: 1.24.4
+          go-version: 1.24.6
         id: go
 
       - name: InstallKubebuilder

.github/workflows/project.yml

@@ -18,7 +18,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        go-version: [1.22.12, 1.24.4]
+        go-version: [1.22.12, 1.24.6]
     steps:
       - name: Free Disk Space (Ubuntu)
         uses: jlumbroso/free-disk-space@v1.3.0

.github/workflows/release.yml

@@ -37,10 +37,10 @@ jobs:
           username: ${{ secrets.DOCKER_USER }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
-      - name: Set up GO 1.24.4
+      - name: Set up GO 1.24.6
         uses: actions/setup-go@v1
         with:
-          go-version: 1.24.4
+          go-version: 1.24.6
         id: go
 
       - name: InstallKubebuilder

.github/workflows/test-helm-charts.yml

@@ -83,11 +83,11 @@ jobs:
         run: hack/kind-cluster-build.sh --name chart-testing -c 1 -v 10 --k8sVersion v1.23.17
         if: steps.list-changed.outputs.changed == 'true'
 
-      - name: Set up GO 1.24.4
+      - name: Set up GO 1.24.6
         if: steps.list-changed.outputs.changed == 'true'
         uses: actions/setup-go@v1
         with:
-          go-version: 1.24.4
+          go-version: 1.24.6
         id: go
 
       - name: setup kubebuilder 3.6.0

.github/workflows/trivy.yml

@@ -34,10 +34,10 @@ jobs:
           repository: ${{github.event.pull_request.head.repo.full_name}}
           ref: ${{ github.event.pull_request.head.sha }}
 
-      - name: Set up GO 1.24.4
+      - name: Set up GO 1.24.6
         uses: actions/setup-go@v1
         with:
-          go-version: 1.24.4
+          go-version: 1.24.6
         id: go
 
       - name: InstallKubebuilder

.github/workflows/trivy_scheduled_master.yml

@@ -45,10 +45,10 @@ jobs:
           repository: ${{github.event.pull_request.head.repo.full_name}}
           ref: ${{ github.event.pull_request.head.sha }}
 
-      - name: Set up GO 1.24.4
+      - name: Set up GO 1.24.6
         uses: actions/setup-go@v1
         with:
-          go-version: 1.24.4
+          go-version: 1.24.6
         id: go
 
       - name: InstallKubebuilder

CHANGELOG.md

@@ -1,3 +1,9 @@
+# Function Mesh v0.25.1 Release Notes
+
+## v0.25.1 What's New
+
+* [Runtime] Use POD_NAME as the name for filebeat sidecar container ([#817](https://github.com/streamnative/function-mesh/pull/817))
+
 # Function Mesh v0.25.0 Release Notes
 
 ## v0.25.0 What's New

Dockerfile

@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.24.4-bullseye as builder
+FROM golang:1.24.6-bullseye as builder
 
 WORKDIR /workspace/api
 COPY api/ .

Makefile

@@ -1,5 +1,5 @@
 # Current Operator version
-VERSION ?= 0.25.0
+VERSION ?= 0.25.1
 # Default image tag
 DOCKER_REPO := $(if $(DOCKER_REPO),$(DOCKER_REPO),streamnative)
 OPERATOR_IMG ?= ${DOCKER_REPO}/function-mesh:v$(VERSION)

README.md

@@ -4,7 +4,7 @@ A Kubernetes-Native way to run pulsar functions, connectors and composed functio
 ## Install
 
 ```bash
-curl -sSL https://github.com/streamnative/function-mesh/releases/download/v0.25.0/install.sh | bash
+curl -sSL https://github.com/streamnative/function-mesh/releases/download/v0.25.1/install.sh | bash
 ```
 
 The above command installs all the CRDs, required service account configuration, and all function-mesh operator components. Before you start running a function-mesh example, verify if Function Mesh is installed correctly.

api/go.mod

@@ -1,6 +1,6 @@
 module github.com/streamnative/function-mesh/api
 
-go 1.24.4
+go 1.24.6
 
 require (
 	k8s.io/api v0.30.9

charts/function-mesh-operator/Chart.yaml

@@ -19,12 +19,12 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.2.34
+version: 0.2.35
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: 0.25.0
+appVersion: 0.25.1
 
 home: https://github.com/streamnative/function-mesh
 sources:
@@ -33,5 +33,5 @@ sources:
 dependencies:
   - name: admission-webhook
     condition: admissionWebhook.enabled
-    version: 0.2.34
+    version: 0.2.35
 #    repository: https://charts.functionmesh.io/

charts/function-mesh-operator/charts/admission-webhook/Chart.yaml

@@ -19,13 +19,13 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.2.34
+version: 0.2.35
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: 0.25.0
+appVersion: 0.25.1
 
 home: https://github.com/streamnative/function-mesh
 sources:

charts/function-mesh-operator/values.yaml

@@ -11,7 +11,7 @@ installation:
   namespace: function-mesh-system
 
 # operatorImage is Function Mesh Operator image
-operatorImage: streamnative/function-mesh:v0.25.0
+operatorImage: streamnative/function-mesh:v0.25.1
 imagePullPolicy: IfNotPresent
 imagePullSecrets: []
 

controllers/spec/common.go

@@ -218,11 +218,11 @@ func MakeHeadlessServiceName(serviceName string) string {
 func MakeStatefulSet(objectMeta *metav1.ObjectMeta, replicas *int32, downloaderImage string, container *corev1.Container,
 	volumes []corev1.Volume, labels map[string]string, policy v1alpha1.PodPolicy, authConfig *v1alpha1.AuthConfig,
 	tlsConfig TLSConfig, pulsarConfig, authSecret, tlsSecret string, javaRuntime *v1alpha1.JavaRuntime,
-	pythonRuntime *v1alpha1.PythonRuntime, goRuntime *v1alpha1.GoRuntime, env []corev1.EnvVar, name, logTopic, filebeatImage string,
+	pythonRuntime *v1alpha1.PythonRuntime, goRuntime *v1alpha1.GoRuntime, env []corev1.EnvVar, logTopic, filebeatImage string,
 	logTopicAgent v1alpha1.LogTopicAgent, definedVolumeMounts []corev1.VolumeMount, volumeClaimTemplates []corev1.PersistentVolumeClaim,
 	persistentVolumeClaimRetentionPolicy *appsv1.StatefulSetPersistentVolumeClaimRetentionPolicy) *appsv1.StatefulSet {
 
-	filebeatContainer := makeFilebeatContainer(definedVolumeMounts, env, name, logTopic, logTopicAgent, tlsConfig, authConfig, pulsarConfig, tlsSecret, authSecret, filebeatImage)
+	filebeatContainer := makeFilebeatContainer(definedVolumeMounts, env, logTopic, logTopicAgent, tlsConfig, authConfig, pulsarConfig, tlsSecret, authSecret, filebeatImage)
 
 	volumeMounts := generateDownloaderVolumeMountsForDownloader(javaRuntime, pythonRuntime, goRuntime)
 	var downloaderContainer *corev1.Container
@@ -2387,7 +2387,7 @@ func getSubscriptionNameOrDefault(subscription, tenant, namespace, name string)
 	return subscription
 }
 
-func makeFilebeatContainer(volumeMounts []corev1.VolumeMount, envVar []corev1.EnvVar, name string, logTopic string,
+func makeFilebeatContainer(volumeMounts []corev1.VolumeMount, envVar []corev1.EnvVar, logTopic string,
 	agent v1alpha1.LogTopicAgent, tlsConfig TLSConfig, authConfig *v1alpha1.AuthConfig,
 	pulsarConfig string, authSecret string, tlsSecret string, image string) *corev1.Container {
 	if logTopic == "" || agent != v1alpha1.SIDECAR {
@@ -2407,8 +2407,8 @@ func makeFilebeatContainer(volumeMounts []corev1.VolumeMount, envVar []corev1.En
 		Name:  "logTopic",
 		Value: logTopic,
 	}, corev1.EnvVar{
-		Name:  "logName",
-		Value: name,
+		Name:      "POD_NAME",
+		ValueFrom: &corev1.EnvVarSource{FieldRef: &corev1.ObjectFieldSelector{FieldPath: "metadata.name"}},
 	})
 
 	if authConfig != nil {

controllers/spec/function.go

@@ -69,7 +69,7 @@ func MakeFunctionStatefulSet(ctx context.Context, cli client.Client, function *v
 	statefulSet := MakeStatefulSet(objectMeta, function.Spec.Replicas, function.Spec.DownloaderImage,
 		makeFunctionContainer(function), makeFunctionVolumes(function, function.Spec.Pulsar.AuthConfig), labels, function.Spec.Pod,
 		function.Spec.Pulsar.AuthConfig, function.Spec.Pulsar.TLSConfig, function.Spec.Pulsar.PulsarConfig, function.Spec.Pulsar.AuthSecret,
-		function.Spec.Pulsar.TLSSecret, function.Spec.Java, function.Spec.Python, function.Spec.Golang, function.Spec.Pod.Env, function.Name,
+		function.Spec.Pulsar.TLSSecret, function.Spec.Java, function.Spec.Python, function.Spec.Golang, function.Spec.Pod.Env,
 		function.Spec.LogTopic, function.Spec.FilebeatImage, function.Spec.LogTopicAgent, function.Spec.VolumeMounts,
 		function.Spec.VolumeClaimTemplates, function.Spec.PersistentVolumeClaimRetentionPolicy)
 

controllers/spec/function_test.go

@@ -123,7 +123,7 @@ func TestInitContainerDownloader(t *testing.T) {
 	statefulSet := MakeStatefulSet(objectMeta, function.Spec.Replicas, function.Spec.DownloaderImage,
 		makeFunctionContainer(function), makeFunctionVolumes(function, function.Spec.Pulsar.AuthConfig), labels, function.Spec.Pod,
 		function.Spec.Pulsar.AuthConfig, function.Spec.Pulsar.TLSConfig, function.Spec.Pulsar.PulsarConfig, function.Spec.Pulsar.AuthSecret,
-		function.Spec.Pulsar.TLSSecret, function.Spec.Java, function.Spec.Python, function.Spec.Golang, function.Spec.Pod.Env, function.Name,
+		function.Spec.Pulsar.TLSSecret, function.Spec.Java, function.Spec.Python, function.Spec.Golang, function.Spec.Pod.Env,
 		function.Spec.LogTopic, function.Spec.FilebeatImage, function.Spec.LogTopicAgent, function.Spec.VolumeMounts,
 		function.Spec.VolumeClaimTemplates, function.Spec.PersistentVolumeClaimRetentionPolicy)
 

controllers/spec/sink.go

@@ -65,7 +65,7 @@ func MakeSinkStatefulSet(ctx context.Context, cli client.Client, sink *v1alpha1.
 	statefulSet := MakeStatefulSet(objectMeta, sink.Spec.Replicas, sink.Spec.DownloaderImage, makeSinkContainer(sink),
 		makeSinkVolumes(sink, sink.Spec.Pulsar.AuthConfig), makeSinkLabels(sink), sink.Spec.Pod, sink.Spec.Pulsar.AuthConfig,
 		sink.Spec.Pulsar.TLSConfig, sink.Spec.Pulsar.PulsarConfig, sink.Spec.Pulsar.AuthSecret, sink.Spec.Pulsar.TLSSecret,
-		sink.Spec.Java, sink.Spec.Python, sink.Spec.Golang, sink.Spec.Pod.Env, sink.Name, sink.Spec.LogTopic, sink.Spec.FilebeatImage,
+		sink.Spec.Java, sink.Spec.Python, sink.Spec.Golang, sink.Spec.Pod.Env, sink.Spec.LogTopic, sink.Spec.FilebeatImage,
 		sink.Spec.LogTopicAgent, sink.Spec.VolumeMounts, nil, nil)
 
 	globalBackendConfigVersion, namespacedBackendConfigVersion, err := PatchStatefulSet(ctx, cli, sink.Namespace, statefulSet)

controllers/spec/source.go

@@ -65,7 +65,7 @@ func MakeSourceStatefulSet(ctx context.Context, cli client.Client, source *v1alp
 	statefulSet := MakeStatefulSet(objectMeta, source.Spec.Replicas, source.Spec.DownloaderImage, makeSourceContainer(source),
 		makeSourceVolumes(source, source.Spec.Pulsar.AuthConfig), makeSourceLabels(source), source.Spec.Pod, source.Spec.Pulsar.AuthConfig,
 		source.Spec.Pulsar.TLSConfig, source.Spec.Pulsar.PulsarConfig, source.Spec.Pulsar.AuthSecret, source.Spec.Pulsar.TLSSecret,
-		source.Spec.Java, source.Spec.Python, source.Spec.Golang, source.Spec.Pod.Env, source.Name, source.Spec.LogTopic, source.Spec.FilebeatImage,
+		source.Spec.Java, source.Spec.Python, source.Spec.Golang, source.Spec.Pod.Env, source.Spec.LogTopic, source.Spec.FilebeatImage,
 		source.Spec.LogTopicAgent, source.Spec.VolumeMounts, nil, nil)
 
 	globalBackendConfigVersion, namespacedBackendConfigVersion, err := PatchStatefulSet(ctx, cli, source.Namespace, statefulSet)

controllers/spec/template/filebeat-config.yaml.tmpl

@@ -6,7 +6,7 @@ output.pulsar:
   fast_fail: true
   url: \${brokerServiceURL}
   topic: \${logTopic}
-  name: \${logName}
+  name: \${POD_NAME}
   token: \${clientAuthenticationParameters:""}
   oauth2:
     enabled: \${oauth2Enabled:false}

go.mod

@@ -1,6 +1,6 @@
 module github.com/streamnative/function-mesh
 
-go 1.24.4
+go 1.24.6
 
 require (
 	github.com/apache/pulsar-client-go v0.9.1-0.20230816081803-fbee610ddcbf

images/samples/go-function-samples/Dockerfile

@@ -1,5 +1,5 @@
 ARG PULSAR_IMAGE_TAG
-FROM golang:1.24.4-bullseye as builder
+FROM golang:1.24.6-bullseye as builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests

images/samples/go-function-samples/func/go.mod

@@ -1,6 +1,6 @@
 module github.com/apache/pulsar/pulsar-function-go/examples
 
-go 1.24.4
+go 1.24.6
 
 require github.com/apache/pulsar/pulsar-function-go v0.0.0-20250430085326-611dc3f360b5
 

install.sh

@@ -56,7 +56,7 @@ EOF
 
 main() {
   local local_kube="kind"
-  local fm_version="v0.25.0"
+  local fm_version="v0.25.1"
   local kind_name="kind"
   local kind_version="v0.7.0"
   local node_num=2

redhat.Dockerfile

@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.24.4-bullseye as builder
+FROM golang:1.24.6-bullseye as builder
 
 WORKDIR /workspace/api
 COPY api/ .