Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into feat/oidc-support
Browse files Browse the repository at this point in the history
  • Loading branch information
labrenbe committed Aug 5, 2024
2 parents 46cebd1 + 6c4e47c commit e6ecd09
Show file tree
Hide file tree
Showing 9 changed files with 24 additions and 22 deletions.
4 changes: 2 additions & 2 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# Author
- [ ] Changes are OpenShift compatible
- [ ] CRD changes approved
- [ ] CRD documentation for all fields, following the [style guide](https://docs.stackable.tech/home/nightly/contributor/docs-style-guide).
- [ ] CRD documentation for all fields, following the [style guide](https://docs.stackable.tech/home/nightly/contributor/docs/style-guide).
- [ ] Helm chart can be installed and deployed operator works
- [ ] Integration tests passed (for non trivial changes)
- [ ] Changes need to be "offline" compatible
Expand All @@ -22,7 +22,7 @@
- [ ] Code contains useful comments
- [ ] Code contains useful logging statements
- [ ] (Integration-)Test cases added
- [ ] Documentation added or updated. Follows the [style guide](https://docs.stackable.tech/home/nightly/contributor/docs-style-guide).
- [ ] Documentation added or updated. Follows the [style guide](https://docs.stackable.tech/home/nightly/contributor/docs/style-guide).
- [ ] Changelog updated
- [ ] Cargo.toml only contains references to git tags (not specific commits or branches)
```
Expand Down
10 changes: 8 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ env:
CARGO_TERM_COLOR: always
CARGO_INCREMENTAL: '0'
CARGO_PROFILE_DEV_DEBUG: '0'
RUST_TOOLCHAIN_VERSION: "1.79.0"
RUST_TOOLCHAIN_VERSION: "1.80.0"
RUSTFLAGS: "-D warnings"
RUSTDOCFLAGS: "-D warnings"
RUST_LOG: "info"
Expand Down Expand Up @@ -368,7 +368,13 @@ jobs:
make -e build
- name: Publish Docker image and Helm chart
if: ${{ !github.event.pull_request.head.repo.fork }}
run: make -e publish
run: |
# We want to publish helmcharts only once as they have a common name, while still publishing both images with architecture specific tags
if [ "$(uname -m)" = "x86_64" ]; then
make -e publish
else
make -e docker-publish
fi
# Output the name of the published image to the Job output for later use
- id: printtag
name: Output image name and tag
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file.

## [Unreleased]

## [24.7.0] - 2024-07-24

### Added

- Support specifying the SecretClass that is used to obtain TLS certificates ([#622]).
Expand Down

This file was deleted.

This file was deleted.

5 changes: 5 additions & 0 deletions docs/modules/nifi/examples/getting_started/install_output.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Installed commons=0.0.0-dev operator
Installed secret=0.0.0-dev operator
Installed listener=0.0.0-dev operator
Installed zookeeper=0.0.0-dev operator
Installed nifi=0.0.0-dev operator
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Installed commons={{ versions.commons }} operator
Installed secret={{ versions.secret }} operator
Installed listener={{ versions.listener }} operator
Installed zookeeper={{ versions.zookeeper }} operator
Installed nifi={{ versions.nifi }} operator
4 changes: 1 addition & 3 deletions docs/modules/nifi/pages/getting_started/installation.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,7 @@ include::example$getting_started/getting_started.sh[tag=stackablectl-install-ope
The output should contain the following lines
[source]
----
include::example$getting_started/install-operator-output.txt[tag=stackablectl-install-operators-output]
----
include::example$getting_started/install_output.txt[]
TIP: Consult the xref:management:stackablectl:quickstart.adoc[] to learn more about how to use `stackablectl`.
--
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# DO NOT EDIT, this file is generated by operator-templating
[toolchain]
channel = "1.79.0"
channel = "1.80.0"

0 comments on commit e6ecd09

Please sign in to comment.