Skip to content

kube-fluentd-operator fix symlinks + add more runtime deps #3495

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
rawlingsj merged 1 commit into from
Jul 9, 2023
Merged

kube-fluentd-operator fix symlinks + add more runtime deps #3495

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 15 additions & 7 deletions kube-fluentd-operator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
package:
name: kube-fluentd-operator
version: 1.17.4
epoch: 2
description: foo
epoch: 3
description: Auto-configuration of Fluentd daemon-set based on Kubernetes metadata
copyright:
- license: MIT
dependencies:
runtime:
- jemalloc
- ruby-3.2
- libsystemd
- busybox

environment:
contents:
Expand All @@ -35,6 +37,7 @@ environment:
- go
# - shadow

# https://github.com/javiercri/fluent-plugin-google-cloud/commit/619c813c265d51f4dd0b1cada3a07e615b47cdde
vars:
FLUENT_PLUGIN_GOOGLE_CLOUD_COMMIT: "619c813c265d51f4dd0b1cada3a07e615b47cdde"

Expand Down Expand Up @@ -99,16 +102,21 @@ subpackages:
pipeline:
- runs: |
mkdir -p ${{targets.subpkgdir}}/fluentd/etc
mkdir -p ${{targets.subpkgdir}}/etc/fluent/templates
mkdir -p ${{targets.subpkgdir}}/usr/bin
mkdir -p ${{targets.subpkgdir}}/bin
mkdir -p ${{targets.subpkgdir}}/usr/local/bundle/bin
mkdir -p ${{targets.subpkgdir}}/usr/lib/gem

ln -sf /var/lib/kube-fluentd-operator/initdb/entrypoint.sh ${{targets.subpkgdir}}/fluentd/entrypoint.sh
ln -sf /etc/fluent/fluent.conf ${{targets.subpkgdir}}/fluentd/failsafe.conf
ln -sf /etc/fluent/plugin ${{targets.subpkgdir}}/fluentd/plugins
ln -sf /templates ${{targets.subpkgdir}}/etc/fluent/templates
ln -sf /bin/config-reloader ${{targets.subpkgdir}}/usr/bin/config-reloader
ln -sf $(ruby -e "puts File.join(Gem.default_dir, RbConfig::CONFIG['ruby_version'], 'bin', 'fluentd')") ${{targets.subpkgdir}}/usr/local/bundle/bin/fluentd
ln -sf /etc/fluent/plugin ${{targets.subpkgdir}}/fluentd/log
ln -sf /etc/fluent/templates ${{targets.subpkgdir}}/templates
ln -sf /usr/bin/config-reloader ${{targets.subpkgdir}}/bin/config-reloader
ln -sf $(ruby -e "puts File.join(Gem.default_dir, 'ruby', RbConfig::CONFIG['ruby_version'], 'bin', 'fluentd')") ${{targets.subpkgdir}}/usr/local/bundle/bin/fluentd

# this should probably live in the ruby-3.2 package but not sure if we need to do it in a way that multiple ruby versions can coexist
# TODO JR to followup
ln -sf $(ruby -e "puts File.join(Gem.default_dir, 'ruby', RbConfig::CONFIG['ruby_version'])") ${{targets.subpkgdir}}/usr/lib/gem/home

update:
enabled: true
Expand Down