Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
38 changes: 38 additions & 0 deletions .github/renovate-config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
const helmRegex = {
customType: "regex",
datasourceTemplate: "helm",
matchStringsStrategy: "combination",
};

const customRegex = {
customType: "regex",
matchStringsStrategy: "combination",
};

module.exports = {
username: "renovate[bot]",
gitAuthor: "Renovate Bot <bot@renovateapp.com>",
onboarding: false,
platform: "github",
dryRun: null,
repositories: ["truongnht/fluent-operator"],
enabledManagers: ["custom.regex"],
extends: ["config:recommended"],
customManagers: [
{
customType: "regex",
matchStringsStrategy: "any",
fileMatch: ["charts/fluent-operator/values.yaml"],
matchStrings: [
// "\# renovate:\\s+datasource=(?<datasource>\\S+?)\\s+registryUrl=(?<registryUrl>\\S+?)\\s+depName=(?<depName>\\S+?)\\s+(crdTargetRevision|targetRevision|chartVersion|version):\\s+(?<currentValue>\\S+?)\\s+?",
'# renovate:\\s+datasource=(?<datasource>\\S+?)\\s+depName=(?<depName>\\S+?)\\s+tag:\\s+"(?<currentValue>\\S+?)"\\s+?',
],
},
],
packageRules: [
{
groupName: "fluent-bit",
matchPackageNames: ["/^xpkg\\.upbound\\.io\\/crossplane-contrib\\//"],
},
],
};
5 changes: 5 additions & 0 deletions .github/renovate.json5
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
$schema: "https://docs.renovatebot.com/renovate-schema.json",
labels: ["dependencies"],
extends: ["config:best-practices", ":disableDependencyDashboard"],
}
37 changes: 37 additions & 0 deletions .github/workflows/renovate.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: Renovate
on:
push:
paths:
- ".github/workflows/renovate.yaml"
- ".github/renovate-config.js"
schedule:
- cron: "0 7 * * 5"
workflow_dispatch:

env:
RENOVATE_VERSION: 38.70.0
ACTIONS_STEP_DEBUG: ${{ secrets.ACTIONS_STEP_DEBUG }}

jobs:
renovate:
runs-on: [self-hosted, linux, x64]

permissions:
contents: write
pull-requests: write

steps:
- name: Checkout
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

- name: Self-hosted Renovate
uses: renovatebot/github-action@e084b5ac6fd201023db6dd7743aec023babb02c8 # v41.0.13
with:
renovate-version: ${{ env.RENOVATE_VERSION }}
configurationFile: ".github/renovate-config.js"
token: "${{ secrets.RENOVATE_TOKEN }}"
env:
LOG_LEVEL: ${{ env.ACTIONS_STEP_DEBUG == 'true' && 'debug' || 'info' }}
RENOVATE_REPOSITORIES: ${{ github.repository }}
RENOVATE_ALLOW_SCRIPTS: true
RENOVATE_SEPARATE_MAJOR_MINOR: false
72 changes: 37 additions & 35 deletions charts/fluent-operator/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ operator:
repository: "kubesphere/fluent-operator"
tag: "latest"
# If set to false, this will disable the creation of ClusterRole, ClusterRoleBinding,
# Deployment, and ServiceAccount resources to avoid conflicts when deploying multiple instances.
# Deployment, and ServiceAccount resources to avoid conflicts when deploying multiple instances.
enable: true
# nodeSelector configuration for Fluent Operator. Ref: https://kubernetes.io/docs/user-guide/node-selection/
nodeSelector: {}
Expand Down Expand Up @@ -70,7 +70,8 @@ operator:
# By default all CRDs are deployed.
disableComponentControllers: ""
# Extra arguments given to the controller flags
extraArgs: []
extraArgs:
[]
# - --watch-namespaces=logging

fluentbit:
Expand All @@ -96,7 +97,8 @@ fluentbit:

image:
repository: "ghcr.io/fluent/fluent-operator/fluent-bit"
tag: "3.2.9"
# renovate: datasource=docker depName=ghcr.io/fluent/fluent-operator/fluent-bit
tag: 3.2.9
# fluentbit resources. If you do want to specify resources, adjust them as necessary
# You can adjust it based on the log volume.
resources:
Expand Down Expand Up @@ -135,7 +137,7 @@ fluentbit:
# List of volumes that can be mounted by containers belonging to the pod.
additionalVolumes: []
# Additional rbac rules which will be applied to the fluent-bit clusterrole. Ref: https://kubernetes.io/docs/reference/access-authn-authz/rbac/#rolebinding-and-clusterrolebinding
# NOTE: As fluent-bit is managed by the fluent-operator, fluent-bit can only be granted permissions the operator also has
# NOTE: As fluent-bit is managed by the fluent-operator, fluent-bit can only be granted permissions the operator also has
rbacRules: {}
# Pod volumes to mount into the container's filesystem.
additionalVolumesMounts: []
Expand Down Expand Up @@ -215,7 +217,7 @@ fluentbit:
# Use storageType as "filesystem" if you want to use filesystem as the buffering mechanism for tail input.
storageType: memory
pauseOnChunksOverlimit: "off"
# multiline.parser
# multiline.parser
# multilineParser: "docker, cri"
systemd:
enable: true
Expand All @@ -230,18 +232,18 @@ fluentbit:
pauseOnChunksOverlimit: "off"
nodeExporterMetrics: {}
# uncomment below nodeExporterMetrics section if you want to collect node exporter metrics
# nodeExporterMetrics:
# tag: node_metrics
# scrapeInterval: 15s
# path:
# procfs: /host/proc
# sysfs: /host/sys
# nodeExporterMetrics:
# tag: node_metrics
# scrapeInterval: 15s
# path:
# procfs: /host/proc
# sysfs: /host/sys
fluentBitMetrics: {}
# uncomment below fluentBitMetrics section if you want to collect fluentBit metrics
# fluentBitMetrics:
# scrapeInterval: "2"
# scrapeOnStart: true
# tag: "fb.metrics"
# fluentBitMetrics:
# scrapeInterval: "2"
# scrapeOnStart: true
# tag: "fb.metrics"

# Configure the output plugin parameter in FluentBit.
# You can set enable to true to output logs to the specified location.
Expand Down Expand Up @@ -286,13 +288,13 @@ fluentbit:
enable: false
# Uncomment the following section to enable Prometheus metrics exporter.
prometheusMetricsExporter: {}
# prometheusMetricsExporter:
# match: "fb.metrics"
# metricsExporter:
# host: "0.0.0.0"
# port: 2020
# addLabels:
# app: "fluentbit"
# prometheusMetricsExporter:
# match: "fb.metrics"
# metricsExporter:
# host: "0.0.0.0"
# port: 2020
# addLabels:
# app: "fluentbit"

# Loki fluentbit ClusterOutput, to be encapsulated in fluentbit config
# See https://github.com/fluent/fluent-operator/blob/master/docs/plugins/fluentbit/output/loki.md
Expand All @@ -302,11 +304,11 @@ fluentbit:
enable: false # Bool
retryLimit: "no_limits"
host: 127.0.0.1 # String
port: 3100 # Int
port: 3100 # Int
# Either, give http{User,Password},tenantID string values specifying them directly
httpUser: myuser
httpPassword: mypass
tenantID: ''
tenantID: ""
# Or give {http{User,Password},tenantID} as reference to secrets that you have manually installed into your kubernetes cluster
#httpUser:
# valueFrom:
Expand Down Expand Up @@ -350,15 +352,15 @@ fluentbit:

service:
storage: {}
# Remove the above storage section and uncomment below section if you want to configure file-system as storage for buffer
# storage:
# path: "/host/fluent-bit-buffer/"
# backlogMemLimit: "50MB"
# checksum: "off"
# deleteIrrecoverableChunks: "on"
# maxChunksUp: 128
# metrics: "on"
# sync: normal
# Remove the above storage section and uncomment below section if you want to configure file-system as storage for buffer
# storage:
# path: "/host/fluent-bit-buffer/"
# backlogMemLimit: "50MB"
# checksum: "off"
# deleteIrrecoverableChunks: "on"
# maxChunksUp: 128
# metrics: "on"
# sync: normal

# Configure the default filters in FluentBit.
# The `filter` will filter and parse the collected log information and output the logs into a uniform format. You can choose whether to turn this on or not.
Expand All @@ -367,7 +369,7 @@ fluentbit:
enable: false
keyContent: log
# emitterMemBufLimit 120 (MB)
emitterMemBufLimit: 120
emitterMemBufLimit: 120
parsers:
- go
- python
Expand Down Expand Up @@ -399,7 +401,7 @@ fluentbit:

parsers:
javaMultiline:
# use in filter for parser generic springboot multiline log format
# use in filter for parser generic springboot multiline log format
enable: false
#Using namespaceClusterFbCfg, deploy fluent-bit configmap and secret in this namespace.
#If it is not defined, it is in the namespace of the fluent-operator.
Expand Down
1 change: 1 addition & 0 deletions cmd/fluent-watcher/fluentbit/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
# renovate: datasource=docker depName=ghcr.io/fluent/fluent-operator/fluent-bit version=
3.2.9
1 change: 1 addition & 0 deletions config/samples/fluentbit_v1alpha2_fluentbit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ metadata:
labels:
app: fluent-bit
spec:
# renovate: datasource=docker depName=ghcr.io/fluent/fluent-operator/fluent-bit
image: ghcr.io/fluent/fluent-operator/fluent-bit:3.2.9
imagePullPolicy: IfNotPresent
positionDB:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ metadata:
labels:
app.kubernetes.io/name: fluent-bit
spec:
# renovate: datasource=docker depName=ghcr.io/fluent/fluent-operator/fluent-bit
image: ghcr.io/fluent/fluent-operator/fluent-bit:3.2.9
positionDB:
hostPath:
Expand Down
9 changes: 5 additions & 4 deletions manifests/kubeedge/fluentbit-fluentbit-edge.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ metadata:
labels:
app.kubernetes.io/name: fluent-bit
spec:
# renovate: datasource=docker depName=ghcr.io/fluent/fluent-operator/fluent-bit
image: ghcr.io/fluent/fluent-operator/fluent-bit:3.2.9
positionDB:
hostPath:
Expand All @@ -24,10 +25,10 @@ spec:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: node-role.kubernetes.io/edge
operator: Exists
hostNetwork : true
- matchExpressions:
- key: node-role.kubernetes.io/edge
operator: Exists
hostNetwork: true
volumes:
- name: host-proc
hostPath:
Expand Down
7 changes: 4 additions & 3 deletions manifests/logging-stack/fluentbit-fluentBit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ metadata:
labels:
app.kubernetes.io/name: fluent-bit
spec:
# renovate: datasource=docker depName=ghcr.io/fluent/fluent-operator/fluent-bit
image: ghcr.io/fluent/fluent-operator/fluent-bit:3.2.9
positionDB:
hostPath:
Expand All @@ -24,6 +25,6 @@ spec:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: node-role.kubernetes.io/edge
operator: DoesNotExist
- matchExpressions:
- key: node-role.kubernetes.io/edge
operator: DoesNotExist
1 change: 1 addition & 0 deletions manifests/quick-start/fluentbit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ metadata:
labels:
app.kubernetes.io/name: fluent-bit
spec:
# renovate: datasource=docker depName=ghcr.io/fluent/fluent-operator/fluent-bit
image: ghcr.io/fluent/fluent-operator/fluent-bit:3.2.9
fluentBitConfigName: fluent-bit-config

Expand Down
1 change: 1 addition & 0 deletions manifests/regex-parser/fluentbit-fluentBit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@ metadata:
labels:
app.kubernetes.io/name: fluent-bit
spec:
# renovate: datasource=docker depName=ghcr.io/fluent/fluent-operator/fluent-bit
image: ghcr.io/fluent/fluent-operator/fluent-bit:3.2.9
fluentBitConfigName: fluent-bit-config