Skip to content

Commit c72de8e

Browse files
joshuabairdjoshuabaird
authored
Merge branch 'master' into ng-mob-add-support-for-storagetype-kube-events-input
2 parents e71072f + f2f7f2c commit c72de8e

28 files changed

+448
-84
lines changed

‎.github/ct.yaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,7 @@ target-branch: master # change to main if your default branch is main
66
chart-dirs:
77
- charts/fluent-operator
88

9-
check-version-increment: true
9+
# Disabled to allow PRs from forks where master may be behind upstream
10+
# Chart versioning is still enforced through maintainer review process
11+
check-version-increment: false
1012
validate-maintainers: true

‎.github/workflows/build-fluentbit-image.yaml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828

2929
steps:
3030
- name: Checkout code
31-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
31+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3232
with:
3333
ref: ${{ github.ref }}
3434

@@ -117,22 +117,22 @@ jobs:
117117
- runs-on: ubuntu-24.04-arm # Builds arm64 on arm64 hosts
118118
platform: linux/arm64
119119
steps:
120-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
120+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
121121

122122
- name: Set up Docker Buildx
123123
uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
124124
with:
125125
platforms: linux/amd64,linux/arm64
126126

127127
- name: Login to GHCR
128-
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
128+
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
129129
with:
130130
registry: ghcr.io
131131
username: ${{ github.actor }}
132132
password: ${{ secrets.GITHUB_TOKEN }}
133133

134134
- name: Login to Docker Hub
135-
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
135+
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
136136
with:
137137
registry: docker.io
138138
username: ${{ secrets.REGISTRY_USER }}
@@ -179,22 +179,22 @@ jobs:
179179
- runs-on: ubuntu-24.04-arm # Builds arm64 on arm64 hosts
180180
platform: linux/arm64
181181
steps:
182-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
182+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
183183

184184
- name: Set up Docker Buildx
185185
uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
186186
with:
187187
platforms: linux/amd64,linux/arm64
188188

189189
- name: Login to GHCR
190-
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
190+
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
191191
with:
192192
registry: ghcr.io
193193
username: ${{ github.actor }}
194194
password: ${{ secrets.GITHUB_TOKEN }}
195195

196196
- name: Login to Docker Hub
197-
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
197+
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
198198
with:
199199
registry: docker.io
200200
username: ${{ secrets.REGISTRY_USER }}
@@ -227,14 +227,14 @@ jobs:
227227
needs: [build, build-debug, build-tags]
228228
steps:
229229
- name: Login to GHCR
230-
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
230+
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
231231
with:
232232
registry: ghcr.io
233233
username: ${{ github.actor }}
234234
password: ${{ secrets.GITHUB_TOKEN }}
235235

236236
- name: Login to Docker Hub
237-
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
237+
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
238238
with:
239239
registry: docker.io
240240
username: ${{ secrets.REGISTRY_USER }}

‎.github/workflows/build-fluentd-image.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
VERSION: ${{ steps.get-version.outputs.VERSION }}
2020
steps:
2121
- name: Checkout code
22-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
22+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2323
with:
2424
ref: ${{ github.ref }}
2525

@@ -81,11 +81,11 @@ jobs:
8181
- runs-on: ubuntu-24.04-arm # Builds arm64 on arm64 hosts
8282
platform: linux/arm64
8383
steps:
84-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
84+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
8585

8686
- name: Install Go
8787
id: setup-go
88-
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
88+
uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
8989
with:
9090
go-version-file: go.mod
9191
cache-dependency-path: go.sum
@@ -96,14 +96,14 @@ jobs:
9696
platforms: linux/amd64,linux/arm64
9797

9898
- name: Login to GHCR
99-
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
99+
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
100100
with:
101101
registry: ghcr.io
102102
username: ${{ github.actor }}
103103
password: ${{ secrets.GITHUB_TOKEN }}
104104

105105
- name: Login to Docker Hub
106-
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
106+
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
107107
with:
108108
registry: docker.io
109109
username: ${{ secrets.REGISTRY_USER }}
@@ -153,14 +153,14 @@ jobs:
153153
needs: [build, determine-tags]
154154
steps:
155155
- name: Login to GHCR
156-
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
156+
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
157157
with:
158158
registry: ghcr.io
159159
username: ${{ github.actor }}
160160
password: ${{ secrets.GITHUB_TOKEN }}
161161

162162
- name: Login to Docker Hub
163-
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
163+
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
164164
with:
165165
registry: docker.io
166166
username: ${{ secrets.REGISTRY_USER }}

‎.github/workflows/build-op-image.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,13 @@ jobs:
7070

7171
steps:
7272
- name: Checkout code
73-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
73+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
7474
with:
7575
fetch-depth: 0
7676

7777
- name: Install Go
7878
id: setup-go
79-
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
79+
uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
8080
with:
8181
go-version-file: go.mod
8282
cache-dependency-path: go.sum
@@ -88,15 +88,15 @@ jobs:
8888

8989
- name: Login to GHCR
9090
if: github.event_name != 'pull_request'
91-
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
91+
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
9292
with:
9393
registry: ghcr.io
9494
username: ${{ github.actor }}
9595
password: ${{ secrets.GITHUB_TOKEN }}
9696

9797
- name: Login to Docker Hub
9898
if: github.event_name != 'pull_request'
99-
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
99+
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
100100
with:
101101
registry: docker.io
102102
username: ${{ secrets.REGISTRY_USER }}
@@ -166,14 +166,14 @@ jobs:
166166
needs: [build]
167167
steps:
168168
- name: Login to GHCR
169-
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
169+
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
170170
with:
171171
registry: ghcr.io
172172
username: ${{ github.actor }}
173173
password: ${{ secrets.GITHUB_TOKEN }}
174174

175175
- name: Login to Docker Hub
176-
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
176+
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
177177
with:
178178
registry: docker.io
179179
username: ${{ secrets.REGISTRY_USER }}

‎.github/workflows/bump-fluent-bit-version.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Checkout code
16-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
16+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
1717

1818
- name: Validate version format
1919
run: |

‎.github/workflows/helm-ci.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,18 @@ jobs:
2929

3030
steps:
3131
- name: Checkout
32-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
32+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3333
with:
3434
fetch-depth: 0
3535

3636
- name: Install Go
37-
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
37+
uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
3838
with:
3939
go-version-file: go.mod
4040
cache-dependency-path: go.sum
4141

4242
- name: Setup kubectl
43-
uses: marcofranssen/setup-kubectl@205b3cddf47a8557f8302cc6643b0a9a0b95d559 # v2.0.0
43+
uses: marcofranssen/setup-kubectl@8dd250ecabc2b05504337c1ff1ab4766f360742f # v2.1.0
4444
with:
4545
kubectlVersion: ${{ env.KUBECTL_VERSION }}
4646

‎.github/workflows/lint-test.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
runs-on: ubuntu-latest
88
steps:
99
- name: Checkout
10-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
10+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
1111
with:
1212
fetch-depth: 0
1313

‎.github/workflows/lint.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: Clone the code
13-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
13+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
1414

1515
- name: Setup Go
16-
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
16+
uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
1717
with:
1818
go-version-file: go.mod
1919

‎.github/workflows/main.yaml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,12 @@ jobs:
5353
GO111MODULE: "on"
5454
steps:
5555
- name: Checkout code
56-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
56+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
5757
with:
5858
fetch-depth: 0
5959

6060
- name: Install Go
61-
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
61+
uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
6262
with:
6363
go-version-file: go.mod
6464
cache-dependency-path: go.sum
@@ -95,18 +95,18 @@ jobs:
9595
GO111MODULE: "on"
9696
steps:
9797
- name: Checkout code
98-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
98+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
9999
with:
100100
fetch-depth: 0
101101

102102
- name: Install Go
103-
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
103+
uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
104104
with:
105105
go-version-file: go.mod
106106
cache-dependency-path: go.sum
107107

108108
- name: Setup kubectl
109-
uses: marcofranssen/setup-kubectl@205b3cddf47a8557f8302cc6643b0a9a0b95d559 # v2.0.0
109+
uses: marcofranssen/setup-kubectl@8dd250ecabc2b05504337c1ff1ab4766f360742f # v2.1.0
110110
with:
111111
kubectlVersion: ${{ env.KUBECTL_VERSION }}
112112

@@ -122,12 +122,12 @@ jobs:
122122
name: Binary build
123123
steps:
124124
- name: Checkout code
125-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
125+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
126126
with:
127127
fetch-depth: 0
128128

129129
- name: Install Go
130-
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
130+
uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
131131
with:
132132
go-version-file: go.mod
133133
cache-dependency-path: go.sum
@@ -141,12 +141,12 @@ jobs:
141141
# name: Docker amd64 build
142142
# steps:
143143
# - name: Checkout code
144-
# uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
144+
# uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
145145
# with:
146146
# fetch-depth: 0
147147

148148
# - name: Install Go
149-
# uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
149+
# uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
150150
# with:
151151
# go-version-file: go.mod
152152
# cache-dependency-path: go.sum

‎.github/workflows/release-tool.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
runs-on: ubuntu-latest
5151
steps:
5252
- name: Checkout code
53-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
53+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
5454

5555
- name: Configure Git
5656
run: |
@@ -73,7 +73,7 @@ jobs:
7373
runs-on: ubuntu-latest
7474
steps:
7575
- name: Checkout code
76-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
76+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
7777
with:
7878
ref: ${{ needs.validate-and-prepare.outputs.release_branch }}-work
7979

0 commit comments

Comments
 (0)