Skip to content

Commit 5c3a925

Browse files
Generated commit to update templated files based on rev 73432ec in stackabletech/operator-templating repo. (#379)
Triggered by: Manual run triggered by: lfrancke with message [Update dependencies for GitHub action and delete bors config in preparation for merge queues]
1 parent 22d864e commit 5c3a925

File tree

7 files changed

+70
-50
lines changed

7 files changed

+70
-50
lines changed

.github/pull_request_template.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
21
# Description
32

43
*Please add a description here. This will become the commit message of the merge request later.*
54

6-
<!-- Commit message above. Everything below is not added to the message. Do not change this line! -->
75

86
## Definition of Done Checklist
97

@@ -32,5 +30,3 @@
3230
- [ ] Feature Tracker has been updated
3331
- [ ] Proper release label has been added
3432
```
35-
36-
Once the review is done, comment `bors r+` (or `bors merge`) to merge. [Further information](https://bors.tech/documentation/getting-started/#reviewing-pull-requests)

.github/workflows/build.yml

Lines changed: 33 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ on:
1111
tags:
1212
- '[0-9][0-9].[0-9]+.[0-9]+'
1313
pull_request:
14+
merge_group:
1415

1516
env:
1617
CARGO_TERM_COLOR: always
@@ -35,13 +36,14 @@ jobs:
3536
run: |
3637
sudo apt-get update
3738
sudo apt-get install protobuf-compiler krb5-user libkrb5-dev libclang-dev liblzma-dev libssl-dev pkg-config
38-
- uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
39+
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3
3940
with:
4041
submodules: recursive
41-
- uses: dtolnay/rust-toolchain@1.68.2
42-
- uses: Swatinem/rust-cache@359a70e43a0bb8a13953b04a90f76428b4959bb6 # v2.2.0
42+
- uses: dtolnay/rust-toolchain@1.71.0
43+
- uses: Swatinem/rust-cache@dd05243424bd5c0e585e4b55eb2d7615cdd32f1f # v2
4344
with:
4445
key: udeps
46+
cache-all-crates: "true"
4547
- run: cargo install --locked [email protected]
4648
- run: cargo udeps --workspace
4749

@@ -62,8 +64,7 @@ jobs:
6264
# repository: dev
6365
#
6466
# Any other scenarios (e.g. when a branch is created/pushed) will cause the publish step to be skipped, most commonly this is expected to happen for the
65-
# branches that bors uses internally (staging, trying) for which the checks need to run, but we do not want artifacts
66-
# to be published.
67+
# branches that the GitHub merge queue feature uses internally for which the checks need to run, but we do not want artifacts to be published.
6768
select_helm_repo:
6869
name: Select target helm repository based on action trigger
6970
runs-on: ubuntu-latest
@@ -102,21 +103,21 @@ jobs:
102103
continue-on-error: ${{ matrix.checks == 'advisories' }}
103104

104105
steps:
105-
- uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
106+
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3
106107
with:
107108
submodules: recursive
108-
- uses: EmbarkStudios/cargo-deny-action@8a8607bd8e2b3a514d5a40174cc7c55b229d9ba7 # v1.4.0
109+
- uses: EmbarkStudios/cargo-deny-action@a50c7d5f86370e02fae8472c398f15a36e517bb8 # v1
109110
with:
110111
command: check ${{ matrix.checks }}
111112

112113
run_rustfmt:
113114
name: Run Rustfmt
114115
runs-on: ubuntu-latest
115116
steps:
116-
- uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
117+
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3
117118
with:
118119
submodules: recursive
119-
- uses: dtolnay/rust-toolchain@1.68.2
120+
- uses: dtolnay/rust-toolchain@1.71.0
120121
with:
121122
components: rustfmt
122123
- run: cargo fmt --all -- --check
@@ -129,15 +130,16 @@ jobs:
129130
run: |
130131
sudo apt-get update
131132
sudo apt-get install protobuf-compiler krb5-user libkrb5-dev libclang-dev liblzma-dev libssl-dev pkg-config
132-
- uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
133+
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3
133134
with:
134135
submodules: recursive
135-
- uses: dtolnay/rust-toolchain@1.68.2
136+
- uses: dtolnay/rust-toolchain@1.71.0
136137
with:
137138
components: clippy
138-
- uses: Swatinem/rust-cache@359a70e43a0bb8a13953b04a90f76428b4959bb6 # v2.2.0
139+
- uses: Swatinem/rust-cache@dd05243424bd5c0e585e4b55eb2d7615cdd32f1f # v2
139140
with:
140141
key: clippy
142+
cache-all-crates: "true"
141143
- name: Run clippy action to produce annotations
142144
uses: giraffate/clippy-action@13b9d32482f25d29ead141b79e7e04e7900281e0 # v1.0.1
143145
env:
@@ -161,15 +163,16 @@ jobs:
161163
run: |
162164
sudo apt-get update
163165
sudo apt-get install protobuf-compiler krb5-user libkrb5-dev libclang-dev liblzma-dev libssl-dev pkg-config
164-
- uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
166+
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3
165167
with:
166168
submodules: recursive
167-
- uses: dtolnay/rust-toolchain@1.68.2
169+
- uses: dtolnay/rust-toolchain@1.71.0
168170
with:
169171
components: rustfmt
170-
- uses: Swatinem/rust-cache@359a70e43a0bb8a13953b04a90f76428b4959bb6 # v2.2.0
172+
- uses: Swatinem/rust-cache@dd05243424bd5c0e585e4b55eb2d7615cdd32f1f # v2
171173
with:
172174
key: doc
175+
cache-all-crates: "true"
173176
- run: cargo doc --document-private-items
174177

175178
run_tests:
@@ -180,13 +183,14 @@ jobs:
180183
run: |
181184
sudo apt-get update
182185
sudo apt-get install protobuf-compiler krb5-user libkrb5-dev libclang-dev liblzma-dev libssl-dev pkg-config
183-
- uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
186+
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3
184187
with:
185188
submodules: recursive
186-
- uses: dtolnay/rust-toolchain@1.68.2
187-
- uses: Swatinem/rust-cache@359a70e43a0bb8a13953b04a90f76428b4959bb6 # v2.2.0
189+
- uses: dtolnay/rust-toolchain@1.71.0
190+
- uses: Swatinem/rust-cache@dd05243424bd5c0e585e4b55eb2d7615cdd32f1f # v2
188191
with:
189192
key: test
193+
cache-all-crates: "true"
190194
- run: cargo test
191195

192196

@@ -198,10 +202,10 @@ jobs:
198202
runs-on: ubuntu-latest
199203
steps:
200204
- name: Checkout
201-
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
205+
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3
202206
with:
203207
submodules: recursive
204-
- uses: actions/setup-python@13ae5bb136fac2878aff31522b9efb785519f984 # v4.6.1
208+
- uses: actions/setup-python@61a6322f88396a6271a6ee3565807d608ecaddd1 # v4
205209
with:
206210
python-version: '3.11'
207211
- name: Install jinja2-cli
@@ -212,7 +216,7 @@ jobs:
212216
run: git diff --exit-code
213217
- name: Git Diff showed uncommitted changes
214218
if: ${{ failure() }}
215-
uses: actions/github-script@d556feaca394842dc55e4734bf3bb9f685482fa0 # v6
219+
uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6
216220
with:
217221
script: |
218222
core.setFailed('Committed README are not up to date, please make sure to apply them to the templated partials, and re-commit!')
@@ -236,26 +240,27 @@ jobs:
236240
sudo apt-get update
237241
sudo apt-get install protobuf-compiler krb5-user libkrb5-dev libclang-dev liblzma-dev libssl-dev pkg-config
238242
- name: Checkout
239-
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
243+
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3
240244
with:
241245
submodules: recursive
242246
- name: Set up Helm
243247
uses: azure/setup-helm@5119fcb9089d432beecbf79bb2c7915207344b78 # v3.5
244248
with:
245249
version: v3.6.2
246250
- name: Set up cargo
247-
uses: dtolnay/rust-toolchain@1.68.2
251+
uses: dtolnay/rust-toolchain@1.71.0
248252
- name: Set up rust-cache
249-
uses: Swatinem/rust-cache@359a70e43a0bb8a13953b04a90f76428b4959bb6 # v2.2.0
253+
uses: Swatinem/rust-cache@dd05243424bd5c0e585e4b55eb2d7615cdd32f1f # v2
250254
with:
251255
key: charts
256+
cache-all-crates: "true"
252257
- name: Regenerate charts
253258
run: make regenerate-charts
254259
- name: Check if committed charts were up to date
255260
run: git diff --exit-code
256261
- name: Git Diff showed uncommitted changes
257262
if: ${{ failure() }}
258-
uses: actions/github-script@d556feaca394842dc55e4734bf3bb9f685482fa0 # v6
263+
uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6
259264
with:
260265
script: |
261266
core.setFailed('Committed charts were not up to date, please regenerate and re-commit!')
@@ -296,10 +301,10 @@ jobs:
296301
sudo apt-get update
297302
sudo apt-get install protobuf-compiler krb5-user libkrb5-dev libclang-dev liblzma-dev libssl-dev pkg-config
298303
- name: Checkout
299-
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
304+
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3
300305
with:
301306
submodules: recursive
302-
- uses: dtolnay/rust-toolchain@1.68.2
307+
- uses: dtolnay/rust-toolchain@1.71.0
303308
with:
304309
components: rustfmt
305310
# This step checks if the current run was triggered by a push to a pr (or a pr being created).
@@ -315,7 +320,7 @@ jobs:
315320
# default value in the makefile if called from this action, but not otherwise (i.e. when called locally).
316321
# This is needed for the HELM_REPO variable.
317322
- name: Set up Cosign
318-
uses: sigstore/cosign-installer@v3.0.5
323+
uses: sigstore/cosign-installer@6e04d228eb30da1757ee4e1dd75a0ec73a653e06 # v3
319324
- name: Publish Docker image and Helm chart
320325
run: make -e publish
321326
# Output the name of the published image to the Job output for later use

.github/workflows/daily_security.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
audit:
1515
runs-on: ubuntu-latest
1616
steps:
17-
- uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
18-
- uses: rustsec/audit-check@dd51754d4e59da7395a4cd9b593f0ff2d61a9b95 # v1.4.1
17+
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3
18+
- uses: rustsec/audit-check@dd51754d4e59da7395a4cd9b593f0ff2d61a9b95 # v1
1919
with:
2020
token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/reviewdog.yaml

Lines changed: 32 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,51 +13,70 @@ jobs:
1313
actionlint:
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
17-
- uses: reviewdog/action-actionlint@b6feb003955cad286985c42e7047f4567a798f3f # v1.36.0
16+
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3
17+
- uses: reviewdog/action-actionlint@7485c2136bd093d2317a854c72910eebaee35238 # v1
1818
with:
1919
github_token: ${{ secrets.GITHUB_TOKEN }}
2020

2121
flake8:
2222
runs-on: ubuntu-latest
2323
steps:
24-
- uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
25-
- uses: actions/setup-python@13ae5bb136fac2878aff31522b9efb785519f984 # v4.6.1
24+
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3
25+
- uses: actions/setup-python@61a6322f88396a6271a6ee3565807d608ecaddd1 # v4
2626
with:
2727
python-version: "3.11"
28-
- uses: reviewdog/action-flake8@b6435e67f0cfda225b9e0c9283cfb7ea7c551bdb # tag=v3.6.0
28+
- uses: reviewdog/action-flake8@1212bd6f1c67830dcff438cf39522d4b58407e71 # v3
2929
with:
3030
github_token: ${{ secrets.GITHUB_TOKEN }}
3131

3232
hadolint:
3333
runs-on: ubuntu-latest
3434
steps:
35-
- uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
36-
- uses: reviewdog/action-hadolint@141ffd8d2f0b75e6fc7c87341331985448b62aa4 # v1.34.1
35+
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3
36+
- uses: reviewdog/action-hadolint@7bd0800b7ce35c6d644cde762174e69f18896973 # v1
3737
with:
3838
github_token: ${{ secrets.GITHUB_TOKEN }}
3939

4040
markdownlint:
4141
runs-on: ubuntu-latest
4242
steps:
43-
- uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
44-
- uses: reviewdog/action-markdownlint@97e3df02fe1573d505a7b268046a44fa5409cbc3 # tag=v0.9.0
43+
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3
44+
- uses: reviewdog/action-markdownlint@e3a1300e4ead323f710e9b711ee269e0d29ba5ec # v0
4545
with:
4646
github_token: ${{ secrets.GITHUB_TOKEN }}
4747
markdownlint_flags: '-i README.md .'
4848

4949
shellcheck:
5050
runs-on: ubuntu-latest
5151
steps:
52-
- uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
53-
- uses: reviewdog/action-shellcheck@f52d78284b4941028952125a10c76676c3d456eb # v1.17.0
52+
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3
53+
- uses: reviewdog/action-shellcheck@50e5e1e2284575f23a1e409d9c0804cdfc4f6e31 # v1
5454
with:
5555
github_token: ${{ secrets.GITHUB_TOKEN }}
5656

5757
yamllint:
5858
runs-on: ubuntu-latest
5959
steps:
60-
- uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
61-
- uses: reviewdog/action-yamllint@8c429dfe4fc47b1ce1fa99a64e94693880d5dc30 # tag=v1.6.1
60+
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3
61+
- uses: reviewdog/action-yamllint@49fe172669b506f0c688207a67b4cf93fee52699 # v1
6262
with:
6363
github_token: ${{ secrets.GITHUB_TOKEN }}
64+
65+
misspell:
66+
runs-on: ubuntu-latest
67+
steps:
68+
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3
69+
- uses: reviewdog/action-misspell@9257f108197b44e37995c98bea6ee4a5b9ffc3b0 # v1
70+
with:
71+
github_token: ${{ secrets.GITHUB_TOKEN }}
72+
locale: "US"
73+
74+
languagetool:
75+
runs-on: ubuntu-latest
76+
steps:
77+
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3
78+
- uses: reviewdog/action-languagetool@0551a7dc055989cdd75cb564ce23991717157004 # v1
79+
with:
80+
github_token: ${{ secrets.GITHUB_TOKEN }}
81+
level: info
82+
patterns: "**/*.md **/*.txt **/*.adoc"

.readme/partials/borrowed/footer.md.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ We develop and test our operators on the following cloud platforms:
2121
* GKE on Google Cloud Platform (GCP)
2222
* [IONOS Cloud Managed Kubernetes](https://cloud.ionos.com/managed/kubernetes)
2323
* K3s
24-
* Kubernetes (for an up to date list of supported versions please check the release notes in our [docs](https://docs.stackable.tech)
24+
* Kubernetes (for an up to date list of supported versions please check the release notes in our [docs](https://docs.stackable.tech))
2525
* Red Hat OpenShift
2626

2727

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ We develop and test our operators on the following cloud platforms:
5858
* GKE on Google Cloud Platform (GCP)
5959
* [IONOS Cloud Managed Kubernetes](https://cloud.ionos.com/managed/kubernetes)
6060
* K3s
61-
* Kubernetes (for an up to date list of supported versions please check the release notes in our [docs](https://docs.stackable.tech)
61+
* Kubernetes (for an up to date list of supported versions please check the release notes in our [docs](https://docs.stackable.tech))
6262
* Red Hat OpenShift
6363

6464

rust-toolchain.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
[toolchain]
2-
channel = "1.68.2"
2+
channel = "1.71.0"

0 commit comments

Comments
 (0)