Skip to content

Commit

Permalink
upgrade plugin kubernetes metadata (#80)
Browse files Browse the repository at this point in the history
* upgrade plugin

* changelog

* update git-secrets workflow

* git secrets

* upgrade fluentd 1.14->1.15

* update fluentd arm 1.14->1.15

* update ds

* update git-secrets

* workaround

* workaround

* workaround

* readme - fluentd upgrade
  • Loading branch information
mirii1994 committed Oct 23, 2022
1 parent 3348e89 commit a907e16
Show file tree
Hide file tree
Showing 8 changed files with 20 additions and 17 deletions.
17 changes: 8 additions & 9 deletions .github/workflows/git-secrets.yml
Original file line number Diff line number Diff line change
@@ -1,33 +1,32 @@
name: git-secrets

# Controls when the workflow will run
# Triggers the workflow on push or pull request events but only for the main branch
on: [push]

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
# This workflow contains a single job called "main"
git-secrets:
# The type of runner that the job will run on
runs-on: ubuntu-18.04

runs-on: ubuntu-22.04
# Steps represent a sequence of tasks that will be executed as part of the job
steps:
- name: Check Out Source Code
uses: actions/checkout@v2

uses: actions/checkout@v3
- name: Set up Python 3.8
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: 3.8
- name: Installing dependencies
run:
sudo apt-get install git less openssh-server
sudo apt-get install less openssh-server
- name: Installing scanning tool
run: |
eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
ln -s "$(which echo)" /usr/local/bin/say
brew install git-secrets
git secrets --install
git secrets --register-aws
- name: Running scanning tool
run:
git secrets --scan
eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
git secrets --scan
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM fluent/fluentd-kubernetes-daemonset:v1.14-debian-logzio-amd64-1
FROM fluent/fluentd-kubernetes-daemonset:v1.15-debian-logzio-amd64-1

USER root
WORKDIR /fluentd
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.arm
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM logzio/fluentd-kubernetes-daemonset-arm:v1.14-debian-logzio-arm
FROM logzio/fluentd-kubernetes-daemonset-arm:v1.15-debian-logzio-arm

USER root
WORKDIR /fluentd
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
source "https://rubygems.org"

gem "fluent-plugin-logzio", "0.0.22"
gem "fluent-plugin-kubernetes_metadata_filter", ">=2.11.1"
gem "fluent-plugin-kubernetes_metadata_filter", ">=3.1.2"
8 changes: 6 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -203,17 +203,21 @@ By default, latest images launch `prometheus` plugins to monitor fluentd. You ca

### Changelog
**logzio/logzio-fluentd**:
- v1.2.0:
- Upgrade fluentd to 1.15.
- Upgrade plugin `fluent-plugin-kubernetes_metadata_filter` to `3.1.2`([#80](https://github.com/logzio/logzio-k8s/pull/80)).
- v1.1.1:
- Upgrade plugin `fluent-plugin-kubernetes_metadata_filter` to `2.11.1`.
- upgrade plugin `fluent-plugin-logzio` to `0.0.22`.
- v1.1.0:
- Upgrade base image to `v1.14`.
- Upgrade `fluent-plugin-kubernetes_metadata_filter` to `2.10`.
- v1.0.2:
- The docker image is now available also for ARM architecture.


<details>
<summary markdown="span"> Expand to check old versions </summary>
- v1.0.2:
- The docker image is now available also for ARM architecture.
- v1.0.1:
- Upgrade base image to 'fluent/fluentd-kubernetes-daemonset:v1.13-debian-logzio-amd64-1'.
- v1.0.0:
Expand Down
2 changes: 1 addition & 1 deletion logzio-daemonset-containerd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ spec:
mountPath: /fluentd/etc
containers:
- name: fluentd
image: logzio/logzio-fluentd:1.1.1
image: logzio/logzio-fluentd:1.2.0
env:
- name: LOGZIO_LOG_SHIPPING_TOKEN
valueFrom:
Expand Down
2 changes: 1 addition & 1 deletion logzio-daemonset-rbac.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ spec:
mountPath: /fluentd/etc
containers:
- name: fluentd
image: logzio/logzio-fluentd:1.1.1
image: logzio/logzio-fluentd:1.2.0
env:
- name: LOGZIO_LOG_SHIPPING_TOKEN
valueFrom:
Expand Down
2 changes: 1 addition & 1 deletion logzio-daemonset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ spec:
mountPath: /fluentd/etc
containers:
- name: fluentd
image: logzio/logzio-fluentd:1.1.1
image: logzio/logzio-fluentd:1.2.0
env:
- name: LOGZIO_LOG_SHIPPING_TOKEN
valueFrom:
Expand Down

0 comments on commit a907e16

Please sign in to comment.