diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8f67bc74..4b4abe75 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,6 +14,7 @@ on: - "renovate/**" tags: - '[0-9][0-9].[0-9]+.[0-9]+' + - '[0-9][0-9].[0-9]+.[0-9]+-rc[0-9]+' pull_request: merge_group: schedule: @@ -344,9 +345,18 @@ jobs: with: crate: cargo-edit bin: cargo-set-version - - name: Update version if PR - if: ${{ github.event_name == 'pull_request' }} + - name: Update version if PR against main branch + if: ${{ github.event_name == 'pull_request' && github.ref == 'refs/heads/main' }} run: cargo set-version --offline --workspace 0.0.0-pr${{ github.event.pull_request.number }} + - name: Update version if PR against non-main branch + # For PRs to be merged against a release branch, use the version that has already been set in the calling script. + if: ${{ github.event_name == 'pull_request' && github.ref != 'refs/heads/main' }} + env: + PR_NUMBER: ${{ github.event.pull_request.number }} + run: | + MANIFEST_VERSION=$(cargo metadata --format-version 1 --no-deps | jq -r '.packages[0].version') + PR_VERSION="${MANIFEST_VERSION}-pr${PR_NUMBER}" + cargo set-version --offline --workspace "$PR_VERSION" # Recreate charts and publish charts and docker image. The "-e" is needed as we want to override the # default value in the makefile if called from this action, but not otherwise (i.e. when called locally). @@ -410,9 +420,18 @@ jobs: with: crate: cargo-edit bin: cargo-set-version - - name: Update version if PR - if: ${{ github.event_name == 'pull_request' }} + - name: Update version if PR against main branch + if: ${{ github.event_name == 'pull_request' && github.ref == 'refs/heads/main' }} run: cargo set-version --offline --workspace 0.0.0-pr${{ github.event.pull_request.number }} + - name: Update version if PR against non-main branch + # For PRs to be merged against a release branch, use the version that has already been set in the calling script. + if: ${{ github.event_name == 'pull_request' && github.ref != 'refs/heads/main' }} + env: + PR_NUMBER: ${{ github.event.pull_request.number }} + run: | + MANIFEST_VERSION=$(cargo metadata --format-version 1 --no-deps | jq -r '.packages[0].version') + PR_VERSION="${MANIFEST_VERSION}-pr${PR_NUMBER}" + cargo set-version --offline --workspace "$PR_VERSION" - name: Build manifest list run: | # Creating manifest list diff --git a/CHANGELOG.md b/CHANGELOG.md index 9c02b275..2628fbd2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## [Unreleased] +## [24.11.1-rc1] - 2024-12-06 + ### Fixed - Fix OIDC endpoint construction in case the `rootPath` does have a trailing slash ([#569]). diff --git a/Cargo.lock b/Cargo.lock index ac49679f..f3d792d5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2233,7 +2233,7 @@ dependencies = [ [[package]] name = "stackable-superset-crd" -version = "24.11.0" +version = "24.11.1-rc1" dependencies = [ "indoc", "product-config", @@ -2249,7 +2249,7 @@ dependencies = [ [[package]] name = "stackable-superset-operator" -version = "24.11.0" +version = "24.11.1-rc1" dependencies = [ "anyhow", "built", diff --git a/Cargo.nix b/Cargo.nix index 7e3b7302..b6bf2839 100644 --- a/Cargo.nix +++ b/Cargo.nix @@ -2004,6 +2004,21 @@ rec { }; resolvedDefaultFeatures = [ "alloc" "std" ]; }; + "futures-timer" = rec { + crateName = "futures-timer"; + version = "3.0.3"; + edition = "2018"; + sha256 = "094vw8k37djpbwv74bwf2qb7n6v6ghif4myss6smd6hgyajb127j"; + libName = "futures_timer"; + authors = [ + "Alex Crichton " + ]; + features = { + "gloo-timers" = [ "dep:gloo-timers" ]; + "send_wrapper" = [ "dep:send_wrapper" ]; + "wasm-bindgen" = [ "gloo-timers" "send_wrapper" ]; + }; + }; "futures-util" = rec { crateName = "futures-util"; version = "0.3.31"; @@ -5031,6 +5046,23 @@ rec { }; resolvedDefaultFeatures = [ "simd" "std" ]; }; + "proc-macro-crate" = rec { + crateName = "proc-macro-crate"; + version = "3.2.0"; + edition = "2021"; + sha256 = "0yzsqnavb3lmrcsmbrdjfrky9vcbl46v59xi9avn0796rb3likwf"; + libName = "proc_macro_crate"; + authors = [ + "Bastian Köcher " + ]; + dependencies = [ + { + name = "toml_edit"; + packageId = "toml_edit"; + } + ]; + + }; "proc-macro2" = rec { crateName = "proc-macro2"; version = "1.0.89"; @@ -5424,6 +5456,20 @@ rec { }; resolvedDefaultFeatures = [ "default" "std" "unicode" "unicode-age" "unicode-bool" "unicode-case" "unicode-gencat" "unicode-perl" "unicode-script" "unicode-segment" ]; }; + "relative-path" = rec { + crateName = "relative-path"; + version = "1.9.3"; + edition = "2021"; + sha256 = "1limlh8fzwi21g0473fqzd6fln9iqkwvzp3816bxi31pkilz6fds"; + libName = "relative_path"; + authors = [ + "John-John Tedro " + ]; + features = { + "serde" = [ "dep:serde" ]; + }; + resolvedDefaultFeatures = [ "default" ]; + }; "ring" = rec { crateName = "ring"; version = "0.17.8"; @@ -5489,6 +5535,105 @@ rec { }; resolvedDefaultFeatures = [ "alloc" "default" "dev_urandom_fallback" ]; }; + "rstest" = rec { + crateName = "rstest"; + version = "0.23.0"; + edition = "2021"; + sha256 = "0d90hr3i2yajzgpzvsh6p2yjzmcb3nm8884xdbb5sswvwmdmhb0a"; + authors = [ + "Michele d'Amico " + ]; + dependencies = [ + { + name = "futures"; + packageId = "futures 0.3.31"; + optional = true; + } + { + name = "futures-timer"; + packageId = "futures-timer"; + optional = true; + } + { + name = "rstest_macros"; + packageId = "rstest_macros"; + usesDefaultFeatures = false; + } + ]; + buildDependencies = [ + { + name = "rustc_version"; + packageId = "rustc_version"; + } + ]; + features = { + "async-timeout" = [ "dep:futures" "dep:futures-timer" "rstest_macros/async-timeout" ]; + "crate-name" = [ "rstest_macros/crate-name" ]; + "default" = [ "async-timeout" "crate-name" ]; + }; + resolvedDefaultFeatures = [ "async-timeout" "crate-name" "default" ]; + }; + "rstest_macros" = rec { + crateName = "rstest_macros"; + version = "0.23.0"; + edition = "2021"; + sha256 = "0nmdm7a4ysihnh0zz6w6gqrmw205zfp7xqkb2id3858vg20afpl2"; + procMacro = true; + authors = [ + "Michele d'Amico " + ]; + dependencies = [ + { + name = "cfg-if"; + packageId = "cfg-if"; + } + { + name = "glob"; + packageId = "glob"; + } + { + name = "proc-macro-crate"; + packageId = "proc-macro-crate"; + optional = true; + } + { + name = "proc-macro2"; + packageId = "proc-macro2"; + } + { + name = "quote"; + packageId = "quote"; + } + { + name = "regex"; + packageId = "regex"; + } + { + name = "relative-path"; + packageId = "relative-path"; + } + { + name = "syn"; + packageId = "syn 2.0.82"; + features = [ "full" "parsing" "extra-traits" "visit" "visit-mut" ]; + } + { + name = "unicode-ident"; + packageId = "unicode-ident"; + } + ]; + buildDependencies = [ + { + name = "rustc_version"; + packageId = "rustc_version"; + } + ]; + features = { + "crate-name" = [ "dep:proc-macro-crate" ]; + "default" = [ "async-timeout" "crate-name" ]; + }; + resolvedDefaultFeatures = [ "async-timeout" "crate-name" ]; + }; "rustc-demangle" = rec { crateName = "rustc-demangle"; version = "0.1.24"; @@ -5504,6 +5649,19 @@ rec { "rustc-dep-of-std" = [ "core" "compiler_builtins" ]; }; }; + "rustc_version" = rec { + crateName = "rustc_version"; + version = "0.4.1"; + edition = "2018"; + sha256 = "14lvdsmr5si5qbqzrajgb6vfn69k0sfygrvfvr2mps26xwi3mjyg"; + dependencies = [ + { + name = "semver"; + packageId = "semver"; + } + ]; + + }; "rustls" = rec { crateName = "rustls"; version = "0.23.15"; @@ -6754,7 +6912,7 @@ rec { }; "stackable-superset-crd" = rec { crateName = "stackable-superset-crd"; - version = "24.11.0"; + version = "24.11.1-rc1"; edition = "2021"; src = lib.cleanSourceWith { filter = sourceFilter; src = ./rust/crd; }; libName = "stackable_superset_crd"; @@ -6812,7 +6970,7 @@ rec { }; "stackable-superset-operator" = rec { crateName = "stackable-superset-operator"; - version = "24.11.0"; + version = "24.11.1-rc1"; edition = "2021"; crateBin = [ { @@ -6890,6 +7048,12 @@ rec { features = [ "chrono" "git2" ]; } ]; + devDependencies = [ + { + name = "rstest"; + packageId = "rstest"; + } + ]; }; "strsim" = rec { @@ -7609,6 +7773,51 @@ rec { }; resolvedDefaultFeatures = [ "codec" "default" "io" "slab" "time" ]; }; + "toml_datetime" = rec { + crateName = "toml_datetime"; + version = "0.6.8"; + edition = "2021"; + sha256 = "0hgv7v9g35d7y9r2afic58jvlwnf73vgd1mz2k8gihlgrf73bmqd"; + authors = [ + "Alex Crichton " + ]; + features = { + "serde" = [ "dep:serde" ]; + }; + }; + "toml_edit" = rec { + crateName = "toml_edit"; + version = "0.22.22"; + edition = "2021"; + sha256 = "1xf7sxfzmnc45f75x302qrn5aph52vc8w226v59yhrm211i8vr2a"; + authors = [ + "Andronik Ordian " + "Ed Page " + ]; + dependencies = [ + { + name = "indexmap"; + packageId = "indexmap"; + features = [ "std" ]; + } + { + name = "toml_datetime"; + packageId = "toml_datetime"; + } + { + name = "winnow"; + packageId = "winnow"; + optional = true; + } + ]; + features = { + "default" = [ "parse" "display" ]; + "parse" = [ "dep:winnow" ]; + "perf" = [ "dep:kstring" ]; + "serde" = [ "dep:serde" "toml_datetime/serde" "dep:serde_spanned" ]; + }; + resolvedDefaultFeatures = [ "default" "display" "parse" ]; + }; "tower" = rec { crateName = "tower"; version = "0.5.1"; @@ -9410,6 +9619,28 @@ rec { ]; }; + "winnow" = rec { + crateName = "winnow"; + version = "0.6.20"; + edition = "2021"; + sha256 = "16y4i8z9vh8hazjxg5mvmq0c5i35wlk8rxi5gkq6cn5vlb0zxh9n"; + dependencies = [ + { + name = "memchr"; + packageId = "memchr"; + optional = true; + usesDefaultFeatures = false; + } + ]; + features = { + "debug" = [ "std" "dep:anstream" "dep:anstyle" "dep:is-terminal" "dep:terminal_size" ]; + "default" = [ "std" ]; + "simd" = [ "dep:memchr" ]; + "std" = [ "alloc" "memchr?/std" ]; + "unstable-doc" = [ "alloc" "std" "simd" "unstable-recover" ]; + }; + resolvedDefaultFeatures = [ "alloc" "default" "std" ]; + }; "xml-rs" = rec { crateName = "xml-rs"; version = "0.8.22"; diff --git a/Cargo.toml b/Cargo.toml index 668cba09..ceb1ee72 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,7 @@ members = ["rust/crd", "rust/operator-binary"] resolver = "2" [workspace.package] -version = "24.11.0" +version = "24.11.1-rc1" authors = ["Stackable GmbH "] license = "OSL-3.0" edition = "2021" diff --git a/deploy/helm/superset-operator/Chart.yaml b/deploy/helm/superset-operator/Chart.yaml index 9eda9e3e..da64ff4b 100644 --- a/deploy/helm/superset-operator/Chart.yaml +++ b/deploy/helm/superset-operator/Chart.yaml @@ -1,8 +1,8 @@ --- apiVersion: v2 name: superset-operator -version: "24.11.0" -appVersion: "24.11.0" +version: "24.11.1-rc1" +appVersion: "24.11.1-rc1" description: The Stackable Operator for Apache Superset home: https://github.com/stackabletech/superset-operator maintainers: diff --git a/docs/modules/superset/examples/getting_started/getting_started.sh b/docs/modules/superset/examples/getting_started/getting_started.sh index 1c6bd5f9..0278fe68 100755 --- a/docs/modules/superset/examples/getting_started/getting_started.sh +++ b/docs/modules/superset/examples/getting_started/getting_started.sh @@ -32,20 +32,20 @@ echo "Updating Helm repo" helm repo update echo "Installing Operators with Helm" # tag::helm-install-operators[] -helm install --wait commons-operator stackable-stable/commons-operator --version 24.11.0 -helm install --wait secret-operator stackable-stable/secret-operator --version 24.11.0 -helm install --wait listener-operator stackable-stable/listener-operator --version 24.11.0 -helm install --wait superset-operator stackable-stable/superset-operator --version 24.11.0 +helm install --wait commons-operator stackable-stable/commons-operator --version 24.11.1-rc1 +helm install --wait secret-operator stackable-stable/secret-operator --version 24.11.1-rc1 +helm install --wait listener-operator stackable-stable/listener-operator --version 24.11.1-rc1 +helm install --wait superset-operator stackable-stable/superset-operator --version 24.11.1-rc1 # end::helm-install-operators[] ;; "stackablectl") echo "installing Operators with stackablectl" # tag::stackablectl-install-operators[] stackablectl operator install \ - commons=24.11.0 \ - secret=24.11.0 \ - listener=24.11.0 \ - superset=24.11.0 + commons=24.11.1-rc1 \ + secret=24.11.1-rc1 \ + listener=24.11.1-rc1 \ + superset=24.11.1-rc1 # end::stackablectl-install-operators[] ;; *) diff --git a/docs/modules/superset/examples/getting_started/install_output.txt b/docs/modules/superset/examples/getting_started/install_output.txt index c71da3a4..a66cd12a 100644 --- a/docs/modules/superset/examples/getting_started/install_output.txt +++ b/docs/modules/superset/examples/getting_started/install_output.txt @@ -1,4 +1,4 @@ -Installed commons=24.11.0 operator -Installed secret=24.11.0 operator -Installed listener=24.11.0 operator -Installed superset=24.11.0 operator +Installed commons=24.11.1-rc1 operator +Installed secret=24.11.1-rc1 operator +Installed listener=24.11.1-rc1 operator +Installed superset=24.11.1-rc1 operator diff --git a/docs/modules/superset/examples/getting_started/superset-load-examples-job.yaml b/docs/modules/superset/examples/getting_started/superset-load-examples-job.yaml index e05be96d..6d3cf5c9 100644 --- a/docs/modules/superset/examples/getting_started/superset-load-examples-job.yaml +++ b/docs/modules/superset/examples/getting_started/superset-load-examples-job.yaml @@ -13,7 +13,7 @@ spec: name: config containers: - name: superset - image: docker.stackable.tech/stackable/superset:4.0.2-stackable24.11.0 + image: docker.stackable.tech/stackable/superset:4.0.2-stackable24.11.1-rc1 command: [ "/bin/sh", "-c", diff --git a/docs/templating_vars.yaml b/docs/templating_vars.yaml index 063dd97b..cfa5fb65 100644 --- a/docs/templating_vars.yaml +++ b/docs/templating_vars.yaml @@ -3,7 +3,7 @@ helm: repo_name: stackable-stable repo_url: https://repo.stackable.tech/repository/helm-stable/ versions: - commons: 24.11.0 - secret: 24.11.0 - listener: 24.11.0 - superset: 24.11.0 + commons: 24.11.1-rc1 + secret: 24.11.1-rc1 + listener: 24.11.1-rc1 + superset: 24.11.1-rc1 diff --git a/tests/release.yaml b/tests/release.yaml index 4e9640e7..2f2667a6 100644 --- a/tests/release.yaml +++ b/tests/release.yaml @@ -7,12 +7,12 @@ releases: description: Integration test products: commons: - operatorVersion: 24.11.0 + operatorVersion: 24.11.1-rc1 secret: - operatorVersion: 24.11.0 + operatorVersion: 24.11.1-rc1 listener: - operatorVersion: 24.11.0 + operatorVersion: 24.11.1-rc1 druid: - operatorVersion: 24.11.0 + operatorVersion: 24.11.1-rc1 superset: - operatorVersion: 24.11.0 + operatorVersion: 24.11.1-rc1