Skip to content

Use POD_NAME as the name for filebeat sidecar container #817

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jiangpengcheng merged 3 commits into from
Aug 14, 2025
Merged

Use POD_NAME as the name for filebeat sidecar container #817

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3549630
Use POD_NAME as the name for filebeat sidecar container
jiangpengcheng Aug 8, 2025
cee627e
Upgrade go to 1.24.6
jiangpengcheng Aug 11, 2025
320e895
Fix style
jiangpengcheng Aug 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions controllers/spec/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2387,7 +2387,7 @@
return subscription
}

func makeFilebeatContainer(volumeMounts []corev1.VolumeMount, envVar []corev1.EnvVar, name string, logTopic string,

Check failure on line 2390 in controllers/spec/common.go

View workflow job for this annotation

GitHub Actions / unit-tests (1.24.4) 

`makeFilebeatContainer` - `name` is unused (unparam)

Check failure on line 2390 in controllers/spec/common.go

View workflow job for this annotation

GitHub Actions / unit-tests (1.22.12) 

`makeFilebeatContainer` - `name` is unused (unparam)

Check failure on line 2390 in controllers/spec/common.go

View workflow job for this annotation

GitHub Actions / unit-tests (1.22.12) 

`makeFilebeatContainer` - `name` is unused (unparam)

Check failure on line 2390 in controllers/spec/common.go

View workflow job for this annotation

GitHub Actions / unit-tests (1.24.4) 

`makeFilebeatContainer` - `name` is unused (unparam)
agent v1alpha1.LogTopicAgent, tlsConfig TLSConfig, authConfig *v1alpha1.AuthConfig,
pulsarConfig string, authSecret string, tlsSecret string, image string) *corev1.Container {
if logTopic == "" || agent != v1alpha1.SIDECAR {
Expand All @@ -2407,8 +2407,8 @@
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 {
Expand Down
2 changes: 1 addition & 1 deletion controllers/spec/template/filebeat-config.yaml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ output.pulsar:
fast_fail: true
url: \${brokerServiceURL}
topic: \${logTopic}
name: \${logName}
name: \${POD_NAME}
token: \${clientAuthenticationParameters:""}
oauth2:
enabled: \${oauth2Enabled:false}
Expand Down
Loading