Skip to content
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

Upgrade fluent bit version 3.1.9 #164

Merged
merged 25 commits into from
Oct 31, 2024
Merged

Upgrade fluent bit version 3.1.9 #164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
8b7e36f
Upgrade fluent bit version to 3.1.9
gunnalahema Oct 18, 2024
7fccf55
Upgrade upload-artifact version to v3 since v2 is deprecated
gunnalahema Oct 18, 2024
f80eae8
NR-328274: use updated falcon role
luckslovez Oct 21, 2024
e1d40d1
dd zypper debug
gunnalahema Oct 23, 2024
f854ff1
add only sles workflow files
gunnalahema Oct 24, 2024
feb9b4d
add timeout 900
gunnalahema Oct 25, 2024
270994b
update strategy matrix to pick sles_15.4
nr-rkallempudi Oct 25, 2024
df64c50
Update playbook.yml
nr-rkallempudi Oct 25, 2024
a5e6bdc
Update playbook.yml
nr-rkallempudi Oct 25, 2024
1b0b58d
updating ami
nr-rkallempudi Oct 25, 2024
16f88f5
reverting the changes made related to configuration
nr-rkallempudi Oct 25, 2024
c2b4586
Testing it with sles 15.1
nr-rkallempudi Oct 25, 2024
dfb3c96
modifying AMIs to latest ones
nr-rkallempudi Oct 25, 2024
a5df926
updated SLES 15.2 version
nr-rkallempudi Oct 25, 2024
ddf6684
update sles 15.2 ami
gunnalahema Oct 26, 2024
3ff7024
update 15.2 sles ami
gunnalahema Oct 26, 2024
e903959
update sles 15.2 ami
gunnalahema Oct 27, 2024
e1ef286
update sles 15.2 ami
gunnalahema Oct 27, 2024
570c6f5
rename sles_15.2.yml to sles_15.2.ymlx to remove the file
gunnalahema Oct 28, 2024
14a09b0
remove timeout
gunnalahema Oct 28, 2024
9a33bf9
disable windows-server-2019 and 2022
gunnalahema Oct 28, 2024
397643d
update windows-server amis
gunnalahema Oct 29, 2024
178105b
remove 15.5 sles
gunnalahema Oct 29, 2024
f08d988
remove amazonlinux_2023 , centos_7 and 8
gunnalahema Oct 29, 2024
fc1e8a2
Update amazon-linux-2023 ami , added centos_7 , centos_8 , sles_15.5
gunnalahema Oct 30, 2024
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
6 changes: 3 additions & 3 deletions .github/workflows/prerelease.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
sudo apt-get install -y debsigs
bash ./scripts/sign.sh

- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v3
if: ${{ contains(matrix.packages.available-flavors, env.FB_PACKAGE_NAME) }}
with:
name: ${{ env.FB_PACKAGE_NAME }}_${{ env.VERSION }}_rpm
Expand Down Expand Up @@ -100,7 +100,7 @@ jobs:
sudo apt-get install -y debsigs
bash ./scripts/sign.sh

- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v3
if: ${{ contains(matrix.packages.available-flavors, env.FB_PACKAGE_NAME) }}
with:
name: ${{ env.FB_PACKAGE_NAME }}_${{ env.VERSION }}_deb
Expand Down Expand Up @@ -128,7 +128,7 @@ jobs:
unzip fluent-bit-${{ env.VERSION }}-${{ matrix.packages.version }}.zip
zip -r -j packages/fb-windows-${{ matrix.packages.arch }}.zip fluent-bit-${{ env.VERSION }}-${{ matrix.packages.version }}/bin/fluent-bit.exe fluent-bit-${{ env.VERSION }}-${{ matrix.packages.version }}/bin/fluent-bit.dll

- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v3
with:
name: fluent-bit_${{ env.VERSION }}_zip
path: packages/
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pull_request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ jobs:
# for those distros using the same package, such as Windows). To avoid this, we first push all the files to a
# shared filesystem and let the "prepare_prerelease" step below upload them later, sequentially. This GH action
# ensures that if two jobs attempt pushing the same file, they get overwritten (last one prevails).
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v3
with:
# Artifacts are pushed to *shared network folders* that have this name and that contain
# the artifact inside of them. Example: fluent-bit-2.1.8-386.exe/fluent-bit-2.1.8-386.exe
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/run_e2e_tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ jobs:

tear_down_test_executor_instances:
name: Tear down test executor instances
if: always()
#if: always() #Uncomment after 3.1.9 version release
needs: report_test_results
uses: ./.github/workflows/run_task.yml
with:
Expand Down
2 changes: 1 addition & 1 deletion ansible/build-fb-suse/requirements.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
collections:
- name: community.aws
- name: community.general
- name: git+https://github.com/Sivakumar3695/caos-ansible-roles#/caos.ansible_roles/
- name: git+https://github.com/luckslovez/caos-ansible-roles#/caos.ansible_roles/
type: git
roles:
- name: andrewrothstein.gh
Expand Down
2 changes: 1 addition & 1 deletion versions/amazonlinux_2023.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ osDistro: amazonlinux
osVersion: 2023
packages:
- arch: x86_64
ami: ami-01103fb68b3569475
ami: ami-0798fb070bcaff6e9
- arch: aarch64
ami: ami-0b9df99d3514cdede
2 changes: 1 addition & 1 deletion versions/common.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
fbVersion: 3.1.2
fbVersion: 3.1.9

# This file, together with each distro file are processed and merged incrementally to
# build all the information required to download and test each package. Each package ends
Expand Down
0 versions/sles_12.1.yml → versions/sles_12.1.ymlx
View file
Open in desktop
File renamed without changes.
0 versions/sles_12.2.yml → versions/sles_12.2.ymlx
View file
Open in desktop
File renamed without changes.
0 versions/sles_12.3.yml → versions/sles_12.3.ymlx
View file
Open in desktop
File renamed without changes.
0 versions/sles_12.4.yml → versions/sles_12.4.ymlx
View file
Open in desktop
File renamed without changes.
0 versions/sles_15.1.yml → versions/sles_15.1.ymlx
View file
Open in desktop
File renamed without changes.
5 changes: 0 additions & 5 deletions versions/sles_15.2.yml
View file
Open in desktop

This file was deleted.

5 changes: 5 additions & 0 deletions versions/sles_15.2.ymlx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
osDistro: sles
osVersion: 15.2
packages:
- arch: x86_64
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we get this confirmed before publishing to stage as well

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we are not including 15.2 sles for now . should look into it later finding the right ami.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If infra agent still supports it then which artifact they would get if they are on this OS Distro?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

they will get the previous fluent bit version which supports this OS Distro , in this case that could be 3.1.2

ami: ami-03bb89b7d26709c14 # TODO: This AMI is from publisher kurian. Need to confirm with security team before making it to production.
2 changes: 1 addition & 1 deletion versions/sles_15.3.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ osDistro: sles
osVersion: 15.3
packages:
- arch: x86_64
ami: ami-0d80ccb98990ccf53
ami: ami-048206b517bb4a5c2
2 changes: 1 addition & 1 deletion versions/sles_15.4.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ osDistro: sles
osVersion: 15.4
packages:
- arch: x86_64
ami: ami-04bec2ee7152c1c8c
ami: ami-0f48f109f1e6a8a4c
2 changes: 1 addition & 1 deletion versions/strategyMatrix.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ def list_distro_files():
try:
return [
filename
for filename in os.listdir(".")
for filename in os.listdir(".")
if (filename.endswith(".yml") or filename.endswith(".yaml"))
and filename != "common.yml"
]
Expand Down
4 changes: 2 additions & 2 deletions versions/windows-server-2019.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ osDistro: windows-server
osVersion: 2019
packages:
- arch: win64
ami: ami-0cd3008ce2e0d1c0c
ami: ami-04a0f66869c37da73
# There is no win32 image available in AWS, so we use the w64 one to test the w32 binaries
- arch: win32
ami: ami-0cd3008ce2e0d1c0c
ami: ami-0131f8b98ba082b3b
4 changes: 2 additions & 2 deletions versions/windows-server-2022.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ osDistro: windows-server
osVersion: 2022
packages:
- arch: win64
ami: ami-094aa6728b151e05a
ami: ami-0c808db6baea2d0ed
- arch: win32
ami: ami-094aa6728b151e05a
ami: ami-0c25be66a8d4215e5
Comment on lines +5 to +7
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why so many AMIs needed to be updated? Did they get updated recently?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Existing AMI's had no images , so thats why updated them.

Loading