Skip to content

Commit 9b775ae

Browse files
egershonNvidiaegershonNvidia
authored
Merge branch 'master' into elad-master-tls-crl-support
Signed-off-by: egershonNvidia <108881287+egershonNvidia@users.noreply.github.com>
2 parents 433a1bb + a1d6fb1 commit 9b775ae

511 files changed

Lines changed: 117843 additions & 13686 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.dockerignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,6 @@
22
# .git
33
build/**
44
dockerfiles/**
5+
6+
# Generated by CMake; a stale source-tree copy can shadow the build-tree header
7+
lib/monkey/include/monkey/mk_core/mk_core_info.h

‎.github/workflows/call-build-images.yaml‎

Lines changed: 50 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
contents: read
6161
steps:
6262
- name: Checkout code
63-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
63+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
6464
with:
6565
ref: ${{ inputs.ref }}
6666

@@ -98,7 +98,7 @@ jobs:
9898
runs-on: ${{ (contains(matrix.platform, 'arm') && 'ubuntu-22.04-arm') || 'ubuntu-latest' }}
9999
steps:
100100
- name: Checkout code
101-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
101+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
102102
with:
103103
ref: ${{ inputs.ref }}
104104
token: ${{ secrets.token }}
@@ -107,7 +107,7 @@ jobs:
107107
uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4.2.0
108108

109109
- name: Log in to the Container registry
110-
uses: docker/login-action@af1e73f918a031802d376d3c8bbc3fe56130a9b0 # v4.4.0
110+
uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
111111
with:
112112
registry: ${{ inputs.registry }}
113113
username: ${{ github.actor }}
@@ -183,7 +183,7 @@ jobs:
183183
uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4.2.0
184184

185185
- name: Log in to the Container registry
186-
uses: docker/login-action@af1e73f918a031802d376d3c8bbc3fe56130a9b0 # v4.4.0
186+
uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
187187
with:
188188
registry: ${{ inputs.registry }}
189189
username: ${{ github.actor }}
@@ -235,7 +235,7 @@ jobs:
235235
uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4.2.0
236236

237237
- name: Log in to the Container registry
238-
uses: docker/login-action@af1e73f918a031802d376d3c8bbc3fe56130a9b0 # v4.4.0
238+
uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
239239
with:
240240
registry: ${{ inputs.registry }}
241241
username: ${{ github.actor }}
@@ -265,7 +265,7 @@ jobs:
265265
packages: read
266266
steps:
267267
- name: Log in to the Container registry
268-
uses: docker/login-action@af1e73f918a031802d376d3c8bbc3fe56130a9b0 # v4.4.0
268+
uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
269269
with:
270270
registry: ${{ inputs.registry }}
271271
username: ${{ inputs.username }}
@@ -297,7 +297,7 @@ jobs:
297297
packages: read
298298
steps:
299299
- name: Log in to the Container registry
300-
uses: docker/login-action@af1e73f918a031802d376d3c8bbc3fe56130a9b0 # v4.4.0
300+
uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
301301
with:
302302
registry: ${{ inputs.registry }}
303303
username: ${{ inputs.username }}
@@ -381,33 +381,43 @@ jobs:
381381

382382
# This takes a long time...
383383
call-build-windows-container:
384-
name: Windows container images
384+
name: Windows ${{ matrix.windows-container-type }} ${{ matrix.windows-base-version }} container image
385385
runs-on: windows-${{ matrix.windows-base-version }}
386386
environment: ${{ inputs.environment }}
387387
needs:
388388
- call-build-images-meta
389389
strategy:
390390
fail-fast: true
391391
matrix:
392-
windows-base-version:
393-
- '2022'
394-
- '2025'
392+
include:
393+
- windows-base-version: '2022'
394+
windows-container-type: servercore
395+
dockerfile: Dockerfile.windows
396+
image-tag-prefix: windows-2022
397+
- windows-base-version: '2025'
398+
windows-container-type: servercore
399+
dockerfile: Dockerfile.windows
400+
image-tag-prefix: windows-2025
401+
- windows-base-version: '2025'
402+
windows-container-type: nanoserver
403+
dockerfile: Dockerfile.windows.nano
404+
image-tag-prefix: windows-nano-2025
395405
permissions:
396406
contents: read
397407
packages: write
398408
env:
399-
IMAGE: ${{ inputs.registry }}/${{ inputs.image }}:windows-${{ matrix.windows-base-version }}-${{ inputs.version }}
409+
IMAGE: ${{ inputs.registry }}/${{ inputs.image }}:${{ matrix.image-tag-prefix }}-${{ inputs.version }}
400410
steps:
401411
- name: Checkout repository
402-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
412+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
403413
with:
404414
ref: ${{ inputs.ref }}
405415

406416
# - name: Set up Docker Buildx
407417
# uses: docker/setup-buildx-action@v4
408418

409419
- name: Log in to the Container registry
410-
uses: docker/login-action@af1e73f918a031802d376d3c8bbc3fe56130a9b0 # v4.4.0
420+
uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
411421
with:
412422
registry: ${{ inputs.registry }}
413423
username: ${{ inputs.username }}
@@ -438,21 +448,45 @@ jobs:
438448
run: |
439449
VERSION=$(gh release list --json tagName,isLatest --jq '.[] | select(.isLatest)|.tagName | sub("^v"; "")')
440450
echo VERSION="$VERSION"
441-
docker pull ${{ inputs.registry }}/${{ inputs.image }}:windows-${{ matrix.windows-base-version }}-$VERSION
451+
docker pull ${{ inputs.registry }}/${{ inputs.image }}:${{ matrix.image-tag-prefix }}-$VERSION
442452
shell: bash
443453
env:
444454
GH_TOKEN: ${{ secrets.token }}
445455

446456
- name: Build the production images
447457
run: |
448-
docker build -t $IMAGE --build-arg FLB_NIGHTLY_BUILD=${{ inputs.unstable }} --build-arg WINDOWS_VERSION=ltsc${{ matrix.windows-base-version }} -f ./dockerfiles/Dockerfile.windows .
458+
docker build -t $IMAGE --build-arg FLB_NIGHTLY_BUILD=${{ inputs.unstable }} --build-arg WINDOWS_VERSION=ltsc${{ matrix.windows-base-version }} -f ./dockerfiles/${{ matrix.dockerfile }} .
449459
shell: bash
450460

451461
- name: Sanity check of the production images
452462
run: |
453463
docker run --rm -t $IMAGE --help
454464
shell: bash
455465

466+
- name: Sanity check the Nano Server default configuration
467+
if: matrix.windows-container-type == 'nanoserver'
468+
run: |
469+
$containerName = "fluent-bit-nano-${{ matrix.windows-base-version }}"
470+
471+
try {
472+
docker run --detach --name $containerName $env:IMAGE
473+
Start-Sleep -Seconds 5
474+
475+
$running = docker inspect --format '{{.State.Running}}' $containerName
476+
docker logs $containerName
477+
478+
if ($running -ne "true") {
479+
throw "Nano Server container did not remain running"
480+
}
481+
}
482+
finally {
483+
$containerId = docker ps --all --quiet --filter "name=^/${containerName}$"
484+
if ($containerId) {
485+
docker rm --force $containerName | Out-Null
486+
}
487+
}
488+
shell: pwsh
489+
456490
- name: Push the production images
457491
if: inputs.push
458492
run: |

‎.github/workflows/call-build-linux-packages.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
contents: read
6161
steps:
6262
- name: Checkout code
63-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
63+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
6464
with:
6565
ref: ${{ inputs.ref }}
6666
path: source
@@ -87,7 +87,7 @@ jobs:
8787
# Pick up latest master version
8888
- name: Checkout code for action
8989
if: inputs.environment == 'staging'
90-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
90+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
9191
with:
9292
path: action-support
9393

@@ -115,7 +115,7 @@ jobs:
115115
continue-on-error: ${{ inputs.ignore_failing_targets || false }}
116116
steps:
117117
- name: Checkout code
118-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
118+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
119119
with:
120120
ref: ${{ inputs.ref }}
121121

@@ -196,7 +196,7 @@ jobs:
196196
# Pick up latest master version
197197
- name: Checkout code for action
198198
if: inputs.environment == 'staging'
199-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
199+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
200200
with:
201201
path: action-support
202202

@@ -233,7 +233,7 @@ jobs:
233233
DEBIAN_FRONTEND: noninteractive
234234

235235
- name: Checkout code for repo metadata construction - always latest
236-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
236+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
237237

238238
- name: Import GPG key for signing
239239
id: import_gpg

‎.github/workflows/call-build-macos.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
contents: read
4848
steps:
4949
- name: Checkout code
50-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
50+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
5151
with:
5252
ref: ${{ inputs.ref }}
5353

@@ -83,7 +83,7 @@ jobs:
8383

8484
steps:
8585
- name: Checkout repository
86-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
86+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
8787
with:
8888
ref: ${{ inputs.ref }}
8989

@@ -126,7 +126,7 @@ jobs:
126126
contents: read
127127
steps:
128128
- name: Checkout repository
129-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
129+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
130130
with:
131131
ref: ${{ inputs.ref }}
132132

‎.github/workflows/call-build-windows.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
armSupported: ${{ steps.armcheck.outputs.armSupported }}
5757
steps:
5858
- name: Checkout repository
59-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
59+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
6060
with:
6161
ref: ${{ inputs.ref }}
6262

@@ -105,7 +105,7 @@ jobs:
105105
PATH: C:\ProgramData\Chocolatey\bin;c:/Program Files/Git/cmd;c:/Windows/system32;C:/Windows/System32/WindowsPowerShell/v1.0;$ENV:WIX/bin;C:/Program Files/CMake/bin;C:\vcpkg;
106106
steps:
107107
- name: Checkout repository
108-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
108+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
109109
with:
110110
ref: ${{ inputs.ref }}
111111

@@ -325,7 +325,7 @@ jobs:
325325
contents: read
326326
steps:
327327
- name: Checkout repository
328-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
328+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
329329
with:
330330
# Need latest for checksum packaging script
331331
ref: master

‎.github/workflows/call-integration-image-build.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
contents: read
4040
packages: write
4141
steps:
42-
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
42+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
4343
with:
4444
ref: ${{ inputs.ref }}
4545
persist-credentials: false
@@ -48,7 +48,7 @@ jobs:
4848
uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4.2.0
4949

5050
- name: Log in to the Container registry
51-
uses: docker/login-action@af1e73f918a031802d376d3c8bbc3fe56130a9b0 # v4.4.0
51+
uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
5252
with:
5353
registry: ${{ inputs.registry }}
5454
username: ${{ inputs.username }}
@@ -106,12 +106,12 @@ jobs:
106106
packages: read
107107
steps:
108108
- name: Checkout repository
109-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
109+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
110110
with:
111111
ref: ${{ inputs.ref }}
112112

113113
- name: Log in to the Container registry
114-
uses: docker/login-action@af1e73f918a031802d376d3c8bbc3fe56130a9b0 # v4.4.0
114+
uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
115115
with:
116116
registry: ${{ inputs.registry }}
117117
username: ${{ inputs.username }}

‎.github/workflows/call-run-integration-test.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
gke-cluster-region: ${{ steps.gke-cluster-region.outputs.stdout }}
4747
gke-cluster-zone: ${{ steps.gke-cluster-zone.outputs.stdout }}
4848
steps:
49-
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
49+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
5050
with:
5151
ref: ${{ inputs.ref }}
5252
repository: fluent/fluent-bit-ci
@@ -175,7 +175,7 @@ jobs:
175175
- name: Test image exists and cache locally
176176
run: docker pull ${{ inputs.image_name }}:${{ inputs.image_tag }}
177177

178-
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
178+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
179179
with:
180180
ref: ${{ inputs.ref }}
181181
repository: fluent/fluent-bit-ci
@@ -234,7 +234,7 @@ jobs:
234234
env:
235235
USE_GKE_GCLOUD_AUTH_PLUGIN: true
236236
steps:
237-
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
237+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
238238
with:
239239
ref: ${{ inputs.ref }}
240240
repository: fluent/fluent-bit-ci

‎.github/workflows/call-test-images.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
uses: sigstore/cosign-installer@6f9f17788090df1f26f669e9d70d6ae9567deba6 # v4.1.2
5151

5252
- name: Log in to the Container registry
53-
uses: docker/login-action@af1e73f918a031802d376d3c8bbc3fe56130a9b0 # v4.4.0
53+
uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
5454
with:
5555
registry: ${{ inputs.registry }}
5656
username: ${{ inputs.username }}
@@ -92,7 +92,7 @@ jobs:
9292
expected: arm
9393
steps:
9494
- name: Log in to the Container registry
95-
uses: docker/login-action@af1e73f918a031802d376d3c8bbc3fe56130a9b0 # v4.4.0
95+
uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
9696
with:
9797
registry: ${{ inputs.registry }}
9898
username: ${{ inputs.username }}
@@ -136,12 +136,12 @@ jobs:
136136
arch: [ linux/amd64, linux/arm64, linux/arm/v7 ]
137137
steps:
138138
- name: Checkout repository
139-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
139+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
140140
with:
141141
ref: ${{ inputs.ref }}
142142

143143
- name: Log in to the Container registry
144-
uses: docker/login-action@af1e73f918a031802d376d3c8bbc3fe56130a9b0 # v4.4.0
144+
uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
145145
with:
146146
registry: ${{ inputs.registry }}
147147
username: ${{ inputs.username }}
@@ -182,7 +182,7 @@ jobs:
182182
runs-on: ubuntu-latest
183183
steps:
184184
- name: Checkout repository
185-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
185+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
186186
with:
187187
ref: ${{ inputs.ref }}
188188

‎.github/workflows/call-test-packages.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
distro: [ amazonlinux2022, amazonlinux2, centos7, centos8, debian10, debian11, ubuntu1804, ubuntu2004, ubuntu2204 ]
4141
steps:
4242
- name: Checkout repository
43-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
43+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
4444
with:
4545
ref: ${{ inputs.ref }}
4646
persist-credentials: false

‎.github/workflows/call-windows-unit-tests.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
PATH: C:\ProgramData\Chocolatey\bin;c:/Program Files/Git/cmd;c:/Windows/system32;C:/Windows/System32/WindowsPowerShell/v1.0;$ENV:WIX/bin;C:/Program Files/CMake/bin;C:\vcpkg;
6363
steps:
6464
- name: Checkout repository
65-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
65+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
6666
with:
6767
ref: ${{ inputs.ref }}
6868

0 commit comments

Comments
 (0)