Skip to content

Commit 07ef739

Browse files
chore: Generated commit to update templated files since the last template run up to stackabletech/operator-templating@13ec44c (#504)
Reference-to: stackabletech/operator-templating@13ec44c (Workflow changes in preparation for release-candidates)
1 parent e3fe2ca commit 07ef739

File tree

4 files changed

+27
-50
lines changed

4 files changed

+27
-50
lines changed

.github/workflows/build.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ on:
1313
- trying
1414
- "renovate/**"
1515
tags:
16-
- '[0-9][0-9].[0-9]+.[0-9]+'
16+
- '[0-9][0-9].[0-9]+.[0-9]+(-rc[0-9]+)?'
1717
pull_request:
1818
merge_group:
1919
schedule:
@@ -345,7 +345,8 @@ jobs:
345345
crate: cargo-edit
346346
bin: cargo-set-version
347347
- name: Update version if PR
348-
if: ${{ github.event_name == 'pull_request' }}
348+
# For PRs to be merged against a release branch, the version has already been set, in which case ignore this step.
349+
if: ${{ github.event_name == 'pull_request' && github.ref == 'refs/heads/main' }}
349350
run: cargo set-version --offline --workspace 0.0.0-pr${{ github.event.pull_request.number }}
350351

351352
# Recreate charts and publish charts and docker image. The "-e" is needed as we want to override the
@@ -411,7 +412,8 @@ jobs:
411412
crate: cargo-edit
412413
bin: cargo-set-version
413414
- name: Update version if PR
414-
if: ${{ github.event_name == 'pull_request' }}
415+
# For PRs to be merged against a release branch, the version has already been set, in which case ignore this step.
416+
if: ${{ github.event_name == 'pull_request' && github.ref == 'refs/heads/main' }}
415417
run: cargo set-version --offline --workspace 0.0.0-pr${{ github.event.pull_request.number }}
416418
- name: Build manifest list
417419
run: |

Cargo.nix

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

crate-hashes.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.

deploy/helm/spark-k8s-operator/crds/crds.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ spec:
194194
type: boolean
195195
type: object
196196
requestedSecretLifetime:
197-
description: Request secret (currently only autoTls certificates) lifetime from the secret operator, e.g. `7d`, or `30d`. That this can be shortened by the `maxCertificateLifetime` setting on the SecretClass issuing the TLS certificate.
197+
description: Request secret (currently only autoTls certificates) lifetime from the secret operator, e.g. `7d`, or `30d`. This can be shortened by the `maxCertificateLifetime` setting on the SecretClass issuing the TLS certificate.
198198
nullable: true
199199
type: string
200200
resources:
@@ -468,7 +468,7 @@ spec:
468468
type: boolean
469469
type: object
470470
requestedSecretLifetime:
471-
description: Request secret (currently only autoTls certificates) lifetime from the secret operator, e.g. `7d`, or `30d`. That this can be shortened by the `maxCertificateLifetime` setting on the SecretClass issuing the TLS certificate.
471+
description: Request secret (currently only autoTls certificates) lifetime from the secret operator, e.g. `7d`, or `30d`. This can be shortened by the `maxCertificateLifetime` setting on the SecretClass issuing the TLS certificate.
472472
nullable: true
473473
type: string
474474
resources:

0 commit comments

Comments
 (0)