Skip to content

Commit c28b904

Browse files
stackable-botstackable-bot
authored
chore: Generated commit to update templated files since the last template run up to stackabletech/operator-templating@e3ffe71 (#364)
Reference-to: stackabletech/operator-templating@e3ffe71 (chore: SDP 25.7 templating updates)
1 parent 5dbed41 commit c28b904

File tree

10 files changed

+130
-52
lines changed

10 files changed

+130
-52
lines changed

‎.github/workflows/build.yml‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ env:
2626
CARGO_TERM_COLOR: always
2727
CARGO_INCREMENTAL: '0'
2828
CARGO_PROFILE_DEV_DEBUG: '0'
29-
RUST_TOOLCHAIN_VERSION: "1.85.0"
29+
RUST_TOOLCHAIN_VERSION: "1.87.0"
3030
RUST_NIGHTLY_TOOLCHAIN_VERSION: "nightly-2025-05-26"
31-
PYTHON_VERSION: "3.12"
31+
PYTHON_VERSION: "3.13"
3232
RUSTFLAGS: "-D warnings"
3333
RUSTDOCFLAGS: "-D warnings"
3434
RUST_LOG: "info"
@@ -42,18 +42,18 @@ jobs:
4242
RUSTC_BOOTSTRAP: 1
4343
steps:
4444
- name: Install host dependencies
45-
uses: awalsh128/cache-apt-pkgs-action@5902b33ae29014e6ca012c5d8025d4346556bd40 # v1.4.3
45+
uses: awalsh128/cache-apt-pkgs-action@4c82c3ccdc1344ee11e9775dbdbdf43aa8a5614e # v1.5.1
4646
with:
4747
packages: protobuf-compiler krb5-user libkrb5-dev libclang-dev liblzma-dev libssl-dev pkg-config apt-transport-https
4848
version: ubuntu-latest
4949
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
5050
with:
5151
persist-credentials: false
5252
submodules: recursive
53-
- uses: dtolnay/rust-toolchain@56f84321dbccf38fb67ce29ab63e4754056677e0
53+
- uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b
5454
with:
5555
toolchain: ${{ env.RUST_TOOLCHAIN_VERSION }}
56-
- uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
56+
- uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
5757
with:
5858
key: udeps
5959
cache-all-crates: "true"
@@ -114,7 +114,7 @@ jobs:
114114
with:
115115
persist-credentials: false
116116
submodules: recursive
117-
- uses: EmbarkStudios/cargo-deny-action@34899fc7ba81ca6268d5947a7a16b4649013fea1 # v2.0.11
117+
- uses: EmbarkStudios/cargo-deny-action@30f817c6f72275c6d54dc744fbca09ebc958599f # v2.0.12
118118
with:
119119
command: check ${{ matrix.checks }}
120120

@@ -126,7 +126,7 @@ jobs:
126126
with:
127127
persist-credentials: false
128128
submodules: recursive
129-
- uses: dtolnay/rust-toolchain@56f84321dbccf38fb67ce29ab63e4754056677e0
129+
- uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b
130130
with:
131131
toolchain: ${{ env.RUST_NIGHTLY_TOOLCHAIN_VERSION }}
132132
components: rustfmt
@@ -139,19 +139,19 @@ jobs:
139139
runs-on: ubuntu-latest
140140
steps:
141141
- name: Install host dependencies
142-
uses: awalsh128/cache-apt-pkgs-action@5902b33ae29014e6ca012c5d8025d4346556bd40 # v1.4.3
142+
uses: awalsh128/cache-apt-pkgs-action@4c82c3ccdc1344ee11e9775dbdbdf43aa8a5614e # v1.5.1
143143
with:
144144
packages: protobuf-compiler krb5-user libkrb5-dev libclang-dev liblzma-dev libssl-dev pkg-config apt-transport-https
145145
version: ubuntu-latest
146146
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
147147
with:
148148
persist-credentials: false
149149
submodules: recursive
150-
- uses: dtolnay/rust-toolchain@56f84321dbccf38fb67ce29ab63e4754056677e0
150+
- uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b
151151
with:
152152
toolchain: ${{ env.RUST_TOOLCHAIN_VERSION }}
153153
components: clippy
154-
- uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
154+
- uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
155155
with:
156156
key: clippy
157157
cache-all-crates: "true"
@@ -178,18 +178,18 @@ jobs:
178178
runs-on: ubuntu-latest
179179
steps:
180180
- name: Install host dependencies
181-
uses: awalsh128/cache-apt-pkgs-action@5902b33ae29014e6ca012c5d8025d4346556bd40 # v1.4.3
181+
uses: awalsh128/cache-apt-pkgs-action@4c82c3ccdc1344ee11e9775dbdbdf43aa8a5614e # v1.5.1
182182
with:
183183
packages: protobuf-compiler krb5-user libkrb5-dev libclang-dev liblzma-dev libssl-dev pkg-config apt-transport-https
184184
version: ubuntu-latest
185185
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
186186
with:
187187
submodules: recursive
188-
- uses: dtolnay/rust-toolchain@56f84321dbccf38fb67ce29ab63e4754056677e0
188+
- uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b
189189
with:
190190
toolchain: ${{ env.RUST_TOOLCHAIN_VERSION }}
191191
components: rustfmt
192-
- uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
192+
- uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
193193
with:
194194
key: doc
195195
cache-all-crates: "true"
@@ -201,18 +201,18 @@ jobs:
201201
runs-on: ubuntu-latest
202202
steps:
203203
- name: Install host dependencies
204-
uses: awalsh128/cache-apt-pkgs-action@5902b33ae29014e6ca012c5d8025d4346556bd40 # v1.4.3
204+
uses: awalsh128/cache-apt-pkgs-action@4c82c3ccdc1344ee11e9775dbdbdf43aa8a5614e # v1.5.1
205205
with:
206206
packages: protobuf-compiler krb5-user libkrb5-dev libclang-dev liblzma-dev libssl-dev pkg-config apt-transport-https
207207
version: ubuntu-latest
208208
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
209209
with:
210210
persist-credentials: false
211211
submodules: recursive
212-
- uses: dtolnay/rust-toolchain@56f84321dbccf38fb67ce29ab63e4754056677e0
212+
- uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b
213213
with:
214214
toolchain: ${{ env.RUST_TOOLCHAIN_VERSION }}
215-
- uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
215+
- uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
216216
with:
217217
key: test
218218
cache-all-crates: "true"
@@ -261,7 +261,7 @@ jobs:
261261
runs-on: ubuntu-latest
262262
steps:
263263
- name: Install host dependencies
264-
uses: awalsh128/cache-apt-pkgs-action@5902b33ae29014e6ca012c5d8025d4346556bd40 # v1.4.3
264+
uses: awalsh128/cache-apt-pkgs-action@4c82c3ccdc1344ee11e9775dbdbdf43aa8a5614e # v1.5.1
265265
with:
266266
packages: protobuf-compiler krb5-user libkrb5-dev libclang-dev liblzma-dev libssl-dev pkg-config apt-transport-https
267267
version: ubuntu-latest
@@ -274,10 +274,10 @@ jobs:
274274
with:
275275
version: v3.16.1
276276
- name: Set up cargo
277-
uses: dtolnay/rust-toolchain@56f84321dbccf38fb67ce29ab63e4754056677e0
277+
uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b
278278
with:
279279
toolchain: ${{ env.RUST_TOOLCHAIN_VERSION }}
280-
- uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
280+
- uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
281281
with:
282282
key: charts
283283
cache-all-crates: "true"
@@ -332,16 +332,16 @@ jobs:
332332
IMAGE_TAG: ${{ steps.printtag.outputs.IMAGE_TAG }}
333333
steps:
334334
- name: Install host dependencies
335-
uses: awalsh128/cache-apt-pkgs-action@5902b33ae29014e6ca012c5d8025d4346556bd40 # v1.4.3
335+
uses: awalsh128/cache-apt-pkgs-action@4c82c3ccdc1344ee11e9775dbdbdf43aa8a5614e # v1.5.1
336336
with:
337337
packages: protobuf-compiler krb5-user libkrb5-dev libclang-dev liblzma-dev libssl-dev pkg-config apt-transport-https
338338
version: ${{ matrix.runner }}
339339
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
340340
with:
341341
persist-credentials: false
342342
submodules: recursive
343-
- uses: cachix/install-nix-action@17fe5fb4a23ad6cbbe47d6b3f359611ad276644c # v31.4.0
344-
- uses: dtolnay/rust-toolchain@56f84321dbccf38fb67ce29ab63e4754056677e0
343+
- uses: cachix/install-nix-action@f0fe604f8a612776892427721526b4c7cfb23aba # v31.4.1
344+
- uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b
345345
with:
346346
toolchain: ${{ env.RUST_TOOLCHAIN_VERSION }}
347347
components: rustfmt
@@ -376,9 +376,9 @@ jobs:
376376
377377
# Recreate charts and publish charts and docker image.
378378
- name: Install cosign
379-
uses: sigstore/cosign-installer@3454372f43399081ed03b604cb2d021dabca52bb # v3.8.2
379+
uses: sigstore/cosign-installer@398d4b0eeef1380460a10c8013a76f728fb906ac # v3.9.1
380380
- name: Install syft
381-
uses: anchore/sbom-action/download-syft@e11c554f704a0b820cbf8c51673f6945e0731532 # v0.20.0
381+
uses: anchore/sbom-action/download-syft@cee1b8e05ae5b2593a75e197229729eabaa9f8ec # v0.20.2
382382
- name: Build Docker image and Helm chart
383383
run: |
384384
# Installing helm and yq on ubicloud-standard-8-arm only
@@ -421,7 +421,7 @@ jobs:
421421
OCI_REGISTRY_SDP_CHARTS_USERNAME: "robot$sdp-charts+github-action-build"
422422
steps:
423423
- name: Install cosign
424-
uses: sigstore/cosign-installer@3454372f43399081ed03b604cb2d021dabca52bb # v3.8.2
424+
uses: sigstore/cosign-installer@398d4b0eeef1380460a10c8013a76f728fb906ac # v3.9.1
425425
- name: Checkout
426426
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
427427
with:

‎.github/workflows/integration-test.yml‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ jobs:
8686

8787
- name: Run Integration Test
8888
id: test
89-
uses: stackabletech/actions/run-integration-test@5901c3b1455488820c4be367531e07c3c3e82538 # v0.4.0
89+
uses: stackabletech/actions/run-integration-test@4483641a7e24057bd2ba51cb4c3f2f0010ad21b7 # v0.8.4
9090
with:
9191
test-platform: ${{ env.TEST_PLATFORM }}-${{ env.TEST_ARCHITECTURE }}
9292
test-run: ${{ env.TEST_RUN }}
@@ -117,3 +117,21 @@ jobs:
117117
}
118118
]
119119
}
120+
# TODO: Update to version 2.1.0. This could look something like the following.
121+
# The workflow is currently not in use, testing that the new version still works imposes effort.
122+
# So I left it as a future exercise, but saved the current state.
123+
#
124+
# uses: slackapi/slack-github-action@b0fa283ad8fea605de13dc3f449259339835fc52 # v2.1.0
125+
# with:
126+
# method: chat.postMessage
127+
# token: ${{ secrets.SLACK_INTEGRATION_TEST_TOKEN }}
128+
# payload: |
129+
# channel: "C07UYJYSMSN" # notifications-integration-tests
130+
# text: "Integration Test *${{ github.repository }}* failed"
131+
# attachments:
132+
# - pretext: "Started at ${{ steps.test.outputs.start-time }}, failed at ${{ steps.test.outputs.end-time }}"
133+
# color: "#aa0000"
134+
# actions:
135+
# - type: button
136+
# text: Go to integration test run
137+
# url: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"

‎.github/workflows/pr_pre-commit.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ on:
77

88
env:
99
CARGO_TERM_COLOR: always
10-
NIX_PKG_MANAGER_VERSION: "2.28.3"
10+
NIX_PKG_MANAGER_VERSION: "2.30.0"
1111
RUST_TOOLCHAIN_VERSION: "nightly-2025-05-26"
1212
HADOLINT_VERSION: "v2.12.0"
13-
PYTHON_VERSION: "3.12"
13+
PYTHON_VERSION: "3.13"
1414

1515
jobs:
1616
pre-commit:

‎.pre-commit-config.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ repos:
3636
# If you do not, you will need to delete the cached ruff binary shown in the
3737
# error message
3838
- repo: https://github.com/astral-sh/ruff-pre-commit
39-
rev: d19233b89771be2d89273f163f5edc5a39bbc34a # 0.11.12
39+
rev: 0b19ef1fd6ad680ed7752d6daba883ce1265a6de # 0.12.2
4040
hooks:
4141
# Run the linter.
4242
- id: ruff-check

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ check-kubernetes:
150150

151151
run-dev: check-nix check-kubernetes
152152
kubectl apply -f deploy/stackable-operators-ns.yaml
153-
nix run --extra-experimental-features "nix-command flakes" -f. tilt -- up --port 5430 --namespace stackable-operators
153+
nix run --extra-experimental-features "nix-command flakes" -f. tilt -- up --port 5431 --namespace stackable-operators
154154

155155
stop-dev: check-nix check-kubernetes
156156
nix run --extra-experimental-features "nix-command flakes" -f. tilt -- down

‎deploy/helm/commons-operator/templates/deployment.yaml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,26 @@ spec:
4242
- mountPath: /etc/stackable/{{ include "operator.appname" . }}/config-spec
4343
name: config-spec
4444
env:
45+
# The following env vars are passed as clap (think CLI) arguments to the operator.
46+
# They are picked up by clap using the structs defied in the operator.
47+
# (which is turn pulls in https://github.com/stackabletech/operator-rs/blob/main/crates/stackable-operator/src/cli.rs)
48+
# You can read there about the expected values and purposes.
49+
50+
# Sometimes products need to know the operator image, e.g. the opa-bundle-builder OPA
51+
# sidecar uses the operator image.
4552
- name: OPERATOR_IMAGE
4653
# Tilt can use annotations as image paths, but not env variables
4754
valueFrom:
4855
fieldRef:
4956
fieldPath: metadata.annotations['internal.stackable.tech/image']
57+
58+
# Operators need to know the node name they are running on, to e.g. discover the
59+
# Kubernetes domain name from the kubelet API.
60+
- name: KUBERNETES_NODE_NAME
61+
valueFrom:
62+
fieldRef:
63+
fieldPath: spec.nodeName
64+
5065
{{- if .Values.kubernetesClusterDomain }}
5166
- name: KUBERNETES_CLUSTER_DOMAIN
5267
value: {{ .Values.kubernetesClusterDomain | quote }}

‎docker/Dockerfile‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ ARG RELEASE="1"
2626
# These are chosen at random and are this high on purpose to have very little chance to clash with an existing user or group on the host system
2727
ARG STACKABLE_USER_GID="574654813"
2828
ARG STACKABLE_USER_UID="782252253"
29+
ARG STACKABLE_USER_NAME="stackable"
2930

3031
# Sets the default shell to Bash with strict error handling and robust pipeline processing.
3132
# "-e": Exits immediately if a command exits with a non-zero status
@@ -95,6 +96,12 @@ RUN <<EOF
9596
# Update image and install kerberos client libraries as well as some other utilities
9697
microdnf update
9798

99+
# **findutils**
100+
# Needed to find all patch files, used in `apply_patches.sh`, and helpful for debugging
101+
# Added 2024-10: Last vulnerability in 2007, only two vulnerabilities in total, a risk we accept
102+
# https://nvd.nist.gov/vuln/search/results?form_type=Advanced&results_type=overview&search_type=all&isCpeNameSearch=false&cpe_vendor=cpe%3A%2F%3Agnu&cpe_product=cpe%3A%2F%3Agnu%3Afindutils
103+
# cpe:2.3:a:gnu:findutils:*:*:*:*:*:*:*:*
104+
#
98105
# **iputils**
99106
# To make debugging easier, includes things like ping
100107
# Added 2024-03: We cannot find any vulnerabilities in the past years
@@ -120,6 +127,7 @@ microdnf update
120127
# NOTE (@NickLarsenNZ): Maybe we should consider pinning package versions?
121128
# hadolint ignore=DL3041
122129
microdnf install \
130+
findutils \
123131
iputils \
124132
krb5-libs \
125133
less \
@@ -128,7 +136,7 @@ microdnf install \
128136
shadow-utils \
129137
tar
130138

131-
groupadd --gid ${STACKABLE_USER_GID} --system stackable
139+
groupadd --gid ${STACKABLE_USER_GID} --system ${STACKABLE_USER_NAME}
132140
# The --no-log-init is required to work around a bug/problem in Go/Docker when very large UIDs are used
133141
# See https://github.com/moby/moby/issues/5419#issuecomment-41478290 for more context
134142
# Making this a system user prevents a mail dir from being created, expiry of passwords etc. but it will warn:
@@ -142,7 +150,7 @@ useradd \
142150
--system \
143151
--create-home \
144152
--home-dir /stackable \
145-
stackable
153+
${STACKABLE_USER_NAME}
146154
microdnf remove shadow-utils
147155
microdnf clean all
148156
rm -rf /var/cache/yum

‎nix/sources.json‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎rust-toolchain.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# DO NOT EDIT, this file is generated by operator-templating
22
[toolchain]
3-
channel = "1.85.0"
3+
channel = "1.87.0"
44
profile = "default"

0 commit comments

Comments
 (0)