From 7953a0f414e61ff6674b64b6b07d3072477651a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6nke=20Liebau?= Date: Thu, 21 Nov 2024 19:12:27 +0100 Subject: [PATCH 1/7] Use patched version of op-rs that hopefully addresses SUP-148. --- Cargo.lock | 8 ++++---- Cargo.toml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index de175734..f38c1193 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2152,8 +2152,8 @@ dependencies = [ [[package]] name = "stackable-operator" -version = "0.80.0" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.80.0#6fbe32300b60f95e0baa2ab0ff2daf961b06531c" +version = "0.81.0" +source = "git+https://github.com/stackabletech//operator-rs.git?branch=fix/SUP-148#ad2dd708836428942058ac72b225fa27ea130fc4" dependencies = [ "chrono", "clap", @@ -2191,7 +2191,7 @@ dependencies = [ [[package]] name = "stackable-operator-derive" version = "0.3.1" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.80.0#6fbe32300b60f95e0baa2ab0ff2daf961b06531c" +source = "git+https://github.com/stackabletech//operator-rs.git?branch=fix/SUP-148#ad2dd708836428942058ac72b225fa27ea130fc4" dependencies = [ "darling", "proc-macro2", @@ -2202,7 +2202,7 @@ dependencies = [ [[package]] name = "stackable-shared" version = "0.0.1" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.80.0#6fbe32300b60f95e0baa2ab0ff2daf961b06531c" +source = "git+https://github.com/stackabletech//operator-rs.git?branch=fix/SUP-148#ad2dd708836428942058ac72b225fa27ea130fc4" dependencies = [ "kube", "semver", diff --git a/Cargo.toml b/Cargo.toml index e3180d09..15164921 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -31,5 +31,5 @@ tracing = "0.1" url = { version = "2.5.2" } xml-rs = "0.8" -# [patch."https://github.com/stackabletech/operator-rs.git"] -# stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "main" } +[patch."https://github.com/stackabletech/operator-rs.git"] +stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "fix/SUP-148" } From 9f69785be3fe1dcc21d8ce870257e58ba8e589d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6nke=20Liebau?= Date: Fri, 22 Nov 2024 11:01:42 +0100 Subject: [PATCH 2/7] Updated cargo.lock to include new commits in op-rs pr (should be no significant changes, pretty much just comments and tests). --- Cargo.lock | 6 +++--- Cargo.nix | 20 ++++++++++---------- crate-hashes.json | 6 +++--- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f38c1193..354d8905 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2153,7 +2153,7 @@ dependencies = [ [[package]] name = "stackable-operator" version = "0.81.0" -source = "git+https://github.com/stackabletech//operator-rs.git?branch=fix/SUP-148#ad2dd708836428942058ac72b225fa27ea130fc4" +source = "git+https://github.com/stackabletech//operator-rs.git?branch=fix/SUP-148#154ce7e8de746aa43e120cb839f9494089c620ef" dependencies = [ "chrono", "clap", @@ -2191,7 +2191,7 @@ dependencies = [ [[package]] name = "stackable-operator-derive" version = "0.3.1" -source = "git+https://github.com/stackabletech//operator-rs.git?branch=fix/SUP-148#ad2dd708836428942058ac72b225fa27ea130fc4" +source = "git+https://github.com/stackabletech//operator-rs.git?branch=fix/SUP-148#154ce7e8de746aa43e120cb839f9494089c620ef" dependencies = [ "darling", "proc-macro2", @@ -2202,7 +2202,7 @@ dependencies = [ [[package]] name = "stackable-shared" version = "0.0.1" -source = "git+https://github.com/stackabletech//operator-rs.git?branch=fix/SUP-148#ad2dd708836428942058ac72b225fa27ea130fc4" +source = "git+https://github.com/stackabletech//operator-rs.git?branch=fix/SUP-148#154ce7e8de746aa43e120cb839f9494089c620ef" dependencies = [ "kube", "semver", diff --git a/Cargo.nix b/Cargo.nix index 7392c79c..e32b0ca2 100644 --- a/Cargo.nix +++ b/Cargo.nix @@ -6675,13 +6675,13 @@ rec { }; "stackable-operator" = rec { crateName = "stackable-operator"; - version = "0.80.0"; + version = "0.81.0"; edition = "2021"; workspace_member = null; src = pkgs.fetchgit { - url = "https://github.com/stackabletech/operator-rs.git"; - rev = "6fbe32300b60f95e0baa2ab0ff2daf961b06531c"; - sha256 = "16jrq3wdwz63210jgmqbx3snrr15wxw6l1smqhzv7b7jpq8qvya3"; + url = "https://github.com/stackabletech//operator-rs.git"; + rev = "154ce7e8de746aa43e120cb839f9494089c620ef"; + sha256 = "126dij4q7gyjzj2654p0dzsb2gkpgsgf24qmbzvnwyy4vz2lybaw"; }; libName = "stackable_operator"; authors = [ @@ -6837,9 +6837,9 @@ rec { edition = "2021"; workspace_member = null; src = pkgs.fetchgit { - url = "https://github.com/stackabletech/operator-rs.git"; - rev = "6fbe32300b60f95e0baa2ab0ff2daf961b06531c"; - sha256 = "16jrq3wdwz63210jgmqbx3snrr15wxw6l1smqhzv7b7jpq8qvya3"; + url = "https://github.com/stackabletech//operator-rs.git"; + rev = "154ce7e8de746aa43e120cb839f9494089c620ef"; + sha256 = "126dij4q7gyjzj2654p0dzsb2gkpgsgf24qmbzvnwyy4vz2lybaw"; }; procMacro = true; libName = "stackable_operator_derive"; @@ -6872,9 +6872,9 @@ rec { edition = "2021"; workspace_member = null; src = pkgs.fetchgit { - url = "https://github.com/stackabletech/operator-rs.git"; - rev = "6fbe32300b60f95e0baa2ab0ff2daf961b06531c"; - sha256 = "16jrq3wdwz63210jgmqbx3snrr15wxw6l1smqhzv7b7jpq8qvya3"; + url = "https://github.com/stackabletech//operator-rs.git"; + rev = "154ce7e8de746aa43e120cb839f9494089c620ef"; + sha256 = "126dij4q7gyjzj2654p0dzsb2gkpgsgf24qmbzvnwyy4vz2lybaw"; }; libName = "stackable_shared"; authors = [ diff --git a/crate-hashes.json b/crate-hashes.json index 562fb18b..a9482aa5 100644 --- a/crate-hashes.json +++ b/crate-hashes.json @@ -1,6 +1,6 @@ { - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.80.0#stackable-operator-derive@0.3.1": "16jrq3wdwz63210jgmqbx3snrr15wxw6l1smqhzv7b7jpq8qvya3", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.80.0#stackable-operator@0.80.0": "16jrq3wdwz63210jgmqbx3snrr15wxw6l1smqhzv7b7jpq8qvya3", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.80.0#stackable-shared@0.0.1": "16jrq3wdwz63210jgmqbx3snrr15wxw6l1smqhzv7b7jpq8qvya3", + "git+https://github.com/stackabletech//operator-rs.git?branch=fix%2FSUP-148#stackable-operator-derive@0.3.1": "126dij4q7gyjzj2654p0dzsb2gkpgsgf24qmbzvnwyy4vz2lybaw", + "git+https://github.com/stackabletech//operator-rs.git?branch=fix%2FSUP-148#stackable-operator@0.81.0": "126dij4q7gyjzj2654p0dzsb2gkpgsgf24qmbzvnwyy4vz2lybaw", + "git+https://github.com/stackabletech//operator-rs.git?branch=fix%2FSUP-148#stackable-shared@0.0.1": "126dij4q7gyjzj2654p0dzsb2gkpgsgf24qmbzvnwyy4vz2lybaw", "git+https://github.com/stackabletech/product-config.git?tag=0.7.0#product-config@0.7.0": "0gjsm80g6r75pm3824dcyiz4ysq1ka4c1if6k1mjm9cnd5ym0gny" } \ No newline at end of file From 0b9090af5b9fce6425ad0067545b5facbb27c65f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6nke=20Liebau?= Date: Fri, 22 Nov 2024 11:37:08 +0100 Subject: [PATCH 3/7] Update revision of PR branch. --- Cargo.lock | 6 +++--- Cargo.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 354d8905..4afe807c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2153,7 +2153,7 @@ dependencies = [ [[package]] name = "stackable-operator" version = "0.81.0" -source = "git+https://github.com/stackabletech//operator-rs.git?branch=fix/SUP-148#154ce7e8de746aa43e120cb839f9494089c620ef" +source = "git+https://github.com/stackabletech//operator-rs.git?branch=fix/SUP-148#d04b987c75beecd5bc65d40a07084d9e991babf2" dependencies = [ "chrono", "clap", @@ -2191,7 +2191,7 @@ dependencies = [ [[package]] name = "stackable-operator-derive" version = "0.3.1" -source = "git+https://github.com/stackabletech//operator-rs.git?branch=fix/SUP-148#154ce7e8de746aa43e120cb839f9494089c620ef" +source = "git+https://github.com/stackabletech//operator-rs.git?branch=fix/SUP-148#d04b987c75beecd5bc65d40a07084d9e991babf2" dependencies = [ "darling", "proc-macro2", @@ -2202,7 +2202,7 @@ dependencies = [ [[package]] name = "stackable-shared" version = "0.0.1" -source = "git+https://github.com/stackabletech//operator-rs.git?branch=fix/SUP-148#154ce7e8de746aa43e120cb839f9494089c620ef" +source = "git+https://github.com/stackabletech//operator-rs.git?branch=fix/SUP-148#d04b987c75beecd5bc65d40a07084d9e991babf2" dependencies = [ "kube", "semver", diff --git a/Cargo.nix b/Cargo.nix index e32b0ca2..e93d2892 100644 --- a/Cargo.nix +++ b/Cargo.nix @@ -6680,7 +6680,7 @@ rec { workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech//operator-rs.git"; - rev = "154ce7e8de746aa43e120cb839f9494089c620ef"; + rev = "d04b987c75beecd5bc65d40a07084d9e991babf2"; sha256 = "126dij4q7gyjzj2654p0dzsb2gkpgsgf24qmbzvnwyy4vz2lybaw"; }; libName = "stackable_operator"; @@ -6838,7 +6838,7 @@ rec { workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech//operator-rs.git"; - rev = "154ce7e8de746aa43e120cb839f9494089c620ef"; + rev = "d04b987c75beecd5bc65d40a07084d9e991babf2"; sha256 = "126dij4q7gyjzj2654p0dzsb2gkpgsgf24qmbzvnwyy4vz2lybaw"; }; procMacro = true; @@ -6873,7 +6873,7 @@ rec { workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech//operator-rs.git"; - rev = "154ce7e8de746aa43e120cb839f9494089c620ef"; + rev = "d04b987c75beecd5bc65d40a07084d9e991babf2"; sha256 = "126dij4q7gyjzj2654p0dzsb2gkpgsgf24qmbzvnwyy4vz2lybaw"; }; libName = "stackable_shared"; From 10d5958f4f7c2378624de35b616dd747214ced52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6nke=20Liebau?= Date: Fri, 22 Nov 2024 14:22:53 +0100 Subject: [PATCH 4/7] Update revision of PR branch. --- Cargo.lock | 6 +++--- Cargo.nix | 12 ++++++------ Cargo.toml | 1 + crate-hashes.json | 6 +++--- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4afe807c..bbc2b094 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2153,7 +2153,7 @@ dependencies = [ [[package]] name = "stackable-operator" version = "0.81.0" -source = "git+https://github.com/stackabletech//operator-rs.git?branch=fix/SUP-148#d04b987c75beecd5bc65d40a07084d9e991babf2" +source = "git+https://github.com/stackabletech//operator-rs.git?branch=fix/SUP-148#c219c2a0fd63ffac17738f9c869239f5772681cf" dependencies = [ "chrono", "clap", @@ -2191,7 +2191,7 @@ dependencies = [ [[package]] name = "stackable-operator-derive" version = "0.3.1" -source = "git+https://github.com/stackabletech//operator-rs.git?branch=fix/SUP-148#d04b987c75beecd5bc65d40a07084d9e991babf2" +source = "git+https://github.com/stackabletech//operator-rs.git?branch=fix/SUP-148#c219c2a0fd63ffac17738f9c869239f5772681cf" dependencies = [ "darling", "proc-macro2", @@ -2202,7 +2202,7 @@ dependencies = [ [[package]] name = "stackable-shared" version = "0.0.1" -source = "git+https://github.com/stackabletech//operator-rs.git?branch=fix/SUP-148#d04b987c75beecd5bc65d40a07084d9e991babf2" +source = "git+https://github.com/stackabletech//operator-rs.git?branch=fix/SUP-148#c219c2a0fd63ffac17738f9c869239f5772681cf" dependencies = [ "kube", "semver", diff --git a/Cargo.nix b/Cargo.nix index e93d2892..1fa5cad8 100644 --- a/Cargo.nix +++ b/Cargo.nix @@ -6680,8 +6680,8 @@ rec { workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech//operator-rs.git"; - rev = "d04b987c75beecd5bc65d40a07084d9e991babf2"; - sha256 = "126dij4q7gyjzj2654p0dzsb2gkpgsgf24qmbzvnwyy4vz2lybaw"; + rev = "c219c2a0fd63ffac17738f9c869239f5772681cf"; + sha256 = "0djimy0n07xsbf5kgz6ic6rvw9v7d47wfzliz26xb0x8zc47lpm3"; }; libName = "stackable_operator"; authors = [ @@ -6838,8 +6838,8 @@ rec { workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech//operator-rs.git"; - rev = "d04b987c75beecd5bc65d40a07084d9e991babf2"; - sha256 = "126dij4q7gyjzj2654p0dzsb2gkpgsgf24qmbzvnwyy4vz2lybaw"; + rev = "c219c2a0fd63ffac17738f9c869239f5772681cf"; + sha256 = "0djimy0n07xsbf5kgz6ic6rvw9v7d47wfzliz26xb0x8zc47lpm3"; }; procMacro = true; libName = "stackable_operator_derive"; @@ -6873,8 +6873,8 @@ rec { workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech//operator-rs.git"; - rev = "d04b987c75beecd5bc65d40a07084d9e991babf2"; - sha256 = "126dij4q7gyjzj2654p0dzsb2gkpgsgf24qmbzvnwyy4vz2lybaw"; + rev = "c219c2a0fd63ffac17738f9c869239f5772681cf"; + sha256 = "0djimy0n07xsbf5kgz6ic6rvw9v7d47wfzliz26xb0x8zc47lpm3"; }; libName = "stackable_shared"; authors = [ diff --git a/Cargo.toml b/Cargo.toml index 15164921..2430e1d3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -32,4 +32,5 @@ url = { version = "2.5.2" } xml-rs = "0.8" [patch."https://github.com/stackabletech/operator-rs.git"] +#stackable-operator = { path = "/home/sliebau/IdeaProjects/stackable/operator-rs/crates/stackable-operator" } stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "fix/SUP-148" } diff --git a/crate-hashes.json b/crate-hashes.json index a9482aa5..3000f993 100644 --- a/crate-hashes.json +++ b/crate-hashes.json @@ -1,6 +1,6 @@ { - "git+https://github.com/stackabletech//operator-rs.git?branch=fix%2FSUP-148#stackable-operator-derive@0.3.1": "126dij4q7gyjzj2654p0dzsb2gkpgsgf24qmbzvnwyy4vz2lybaw", - "git+https://github.com/stackabletech//operator-rs.git?branch=fix%2FSUP-148#stackable-operator@0.81.0": "126dij4q7gyjzj2654p0dzsb2gkpgsgf24qmbzvnwyy4vz2lybaw", - "git+https://github.com/stackabletech//operator-rs.git?branch=fix%2FSUP-148#stackable-shared@0.0.1": "126dij4q7gyjzj2654p0dzsb2gkpgsgf24qmbzvnwyy4vz2lybaw", + "git+https://github.com/stackabletech//operator-rs.git?branch=fix%2FSUP-148#stackable-operator-derive@0.3.1": "0djimy0n07xsbf5kgz6ic6rvw9v7d47wfzliz26xb0x8zc47lpm3", + "git+https://github.com/stackabletech//operator-rs.git?branch=fix%2FSUP-148#stackable-operator@0.81.0": "0djimy0n07xsbf5kgz6ic6rvw9v7d47wfzliz26xb0x8zc47lpm3", + "git+https://github.com/stackabletech//operator-rs.git?branch=fix%2FSUP-148#stackable-shared@0.0.1": "0djimy0n07xsbf5kgz6ic6rvw9v7d47wfzliz26xb0x8zc47lpm3", "git+https://github.com/stackabletech/product-config.git?tag=0.7.0#product-config@0.7.0": "0gjsm80g6r75pm3824dcyiz4ysq1ka4c1if6k1mjm9cnd5ym0gny" } \ No newline at end of file From 85465e7057adcc1896544162050146259a4728f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6nke=20Liebau?= Date: Sat, 23 Nov 2024 12:53:01 +0100 Subject: [PATCH 5/7] Update to use released version of operator-rs and add Changelog entry. --- CHANGELOG.md | 2 ++ Cargo.lock | 8 ++++---- Cargo.nix | 16 ++++++++-------- Cargo.toml | 6 +++--- crate-hashes.json | 6 +++--- 5 files changed, 20 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index aed35e0c..26a1281c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,6 +30,7 @@ All notable changes to this project will be documented in this file. - Switch from `flow.xml.gz` to `flow.json.gz` to allow seamless upgrades to version 2.0 ([#675]). - Failing to parse one `NifiCluster`/`AuthenticationClass` should no longer cause the whole operator to stop functioning ([#662]). - NiFi will now use the JDK trust store when an OIDC provider uses WebPKI as CA ([#686], [#698]). +- BREAKING: Use distinct ServiceAccounts for the Stacklets, so that multiple Stacklets can be deployed in one namespace. Existing Stacklets will use the newly created ServiceAccounts after restart ([#717]). ### Removed @@ -50,6 +51,7 @@ All notable changes to this project will be documented in this file. [#698]: https://github.com/stackabletech/nifi-operator/pull/698 [#702]: https://github.com/stackabletech/nifi-operator/pull/702 [#708]: https://github.com/stackabletech/nifi-operator/pull/708 +[#717]: https://github.com/stackabletech/nifi-operator/pull/717 ## [24.7.0] - 2024-07-24 diff --git a/Cargo.lock b/Cargo.lock index bbc2b094..11e5b2cc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2152,8 +2152,8 @@ dependencies = [ [[package]] name = "stackable-operator" -version = "0.81.0" -source = "git+https://github.com/stackabletech//operator-rs.git?branch=fix/SUP-148#c219c2a0fd63ffac17738f9c869239f5772681cf" +version = "0.82.0" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.82.0#415bbd031bd52e9c0c5392060235030e9930b46b" dependencies = [ "chrono", "clap", @@ -2191,7 +2191,7 @@ dependencies = [ [[package]] name = "stackable-operator-derive" version = "0.3.1" -source = "git+https://github.com/stackabletech//operator-rs.git?branch=fix/SUP-148#c219c2a0fd63ffac17738f9c869239f5772681cf" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.82.0#415bbd031bd52e9c0c5392060235030e9930b46b" dependencies = [ "darling", "proc-macro2", @@ -2202,7 +2202,7 @@ dependencies = [ [[package]] name = "stackable-shared" version = "0.0.1" -source = "git+https://github.com/stackabletech//operator-rs.git?branch=fix/SUP-148#c219c2a0fd63ffac17738f9c869239f5772681cf" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.82.0#415bbd031bd52e9c0c5392060235030e9930b46b" dependencies = [ "kube", "semver", diff --git a/Cargo.nix b/Cargo.nix index 1fa5cad8..bdc026a2 100644 --- a/Cargo.nix +++ b/Cargo.nix @@ -6680,8 +6680,8 @@ rec { workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech//operator-rs.git"; - rev = "c219c2a0fd63ffac17738f9c869239f5772681cf"; - sha256 = "0djimy0n07xsbf5kgz6ic6rvw9v7d47wfzliz26xb0x8zc47lpm3"; + rev = "ad2dd708836428942058ac72b225fa27ea130fc4"; + sha256 = "126dij4q7gyjzj2654p0dzsb2gkpgsgf24qmbzvnwyy4vz2lybaw"; }; libName = "stackable_operator"; authors = [ @@ -6837,9 +6837,9 @@ rec { edition = "2021"; workspace_member = null; src = pkgs.fetchgit { - url = "https://github.com/stackabletech//operator-rs.git"; - rev = "c219c2a0fd63ffac17738f9c869239f5772681cf"; - sha256 = "0djimy0n07xsbf5kgz6ic6rvw9v7d47wfzliz26xb0x8zc47lpm3"; + url = "https://github.com/stackabletech/operator-rs.git"; + rev = "6fbe32300b60f95e0baa2ab0ff2daf961b06531c"; + sha256 = "16jrq3wdwz63210jgmqbx3snrr15wxw6l1smqhzv7b7jpq8qvya3"; }; procMacro = true; libName = "stackable_operator_derive"; @@ -6872,9 +6872,9 @@ rec { edition = "2021"; workspace_member = null; src = pkgs.fetchgit { - url = "https://github.com/stackabletech//operator-rs.git"; - rev = "c219c2a0fd63ffac17738f9c869239f5772681cf"; - sha256 = "0djimy0n07xsbf5kgz6ic6rvw9v7d47wfzliz26xb0x8zc47lpm3"; + url = "https://github.com/stackabletech/operator-rs.git"; + rev = "6fbe32300b60f95e0baa2ab0ff2daf961b06531c"; + sha256 = "16jrq3wdwz63210jgmqbx3snrr15wxw6l1smqhzv7b7jpq8qvya3"; }; libName = "stackable_shared"; authors = [ diff --git a/Cargo.toml b/Cargo.toml index 2430e1d3..237ea84c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,13 +24,13 @@ serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" serde_yaml = "0.9" snafu = "0.8" -stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.80.0" } +stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.82.0" } strum = { version = "0.26", features = ["derive"] } tokio = { version = "1.40", features = ["full"] } tracing = "0.1" url = { version = "2.5.2" } xml-rs = "0.8" -[patch."https://github.com/stackabletech/operator-rs.git"] +#[patch."https://github.com/stackabletech/operator-rs.git"] #stackable-operator = { path = "/home/sliebau/IdeaProjects/stackable/operator-rs/crates/stackable-operator" } -stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "fix/SUP-148" } +#stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "fix/SUP-148" } diff --git a/crate-hashes.json b/crate-hashes.json index 3000f993..a9482aa5 100644 --- a/crate-hashes.json +++ b/crate-hashes.json @@ -1,6 +1,6 @@ { - "git+https://github.com/stackabletech//operator-rs.git?branch=fix%2FSUP-148#stackable-operator-derive@0.3.1": "0djimy0n07xsbf5kgz6ic6rvw9v7d47wfzliz26xb0x8zc47lpm3", - "git+https://github.com/stackabletech//operator-rs.git?branch=fix%2FSUP-148#stackable-operator@0.81.0": "0djimy0n07xsbf5kgz6ic6rvw9v7d47wfzliz26xb0x8zc47lpm3", - "git+https://github.com/stackabletech//operator-rs.git?branch=fix%2FSUP-148#stackable-shared@0.0.1": "0djimy0n07xsbf5kgz6ic6rvw9v7d47wfzliz26xb0x8zc47lpm3", + "git+https://github.com/stackabletech//operator-rs.git?branch=fix%2FSUP-148#stackable-operator-derive@0.3.1": "126dij4q7gyjzj2654p0dzsb2gkpgsgf24qmbzvnwyy4vz2lybaw", + "git+https://github.com/stackabletech//operator-rs.git?branch=fix%2FSUP-148#stackable-operator@0.81.0": "126dij4q7gyjzj2654p0dzsb2gkpgsgf24qmbzvnwyy4vz2lybaw", + "git+https://github.com/stackabletech//operator-rs.git?branch=fix%2FSUP-148#stackable-shared@0.0.1": "126dij4q7gyjzj2654p0dzsb2gkpgsgf24qmbzvnwyy4vz2lybaw", "git+https://github.com/stackabletech/product-config.git?tag=0.7.0#product-config@0.7.0": "0gjsm80g6r75pm3824dcyiz4ysq1ka4c1if6k1mjm9cnd5ym0gny" } \ No newline at end of file From 3ce54706cbbbce9579c5d554048b0aa225892e05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6nke=20Liebau?= Date: Sun, 24 Nov 2024 17:29:44 +0100 Subject: [PATCH 6/7] Change test condition to look for 'succeeded' instead of 'ready', as ready only becomes 1 for a brief moment and apparently kuttl can miss that.. --- tests/templates/kuttl/oidc/20-assert.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/templates/kuttl/oidc/20-assert.yaml b/tests/templates/kuttl/oidc/20-assert.yaml index ce21f771..47c18ad2 100644 --- a/tests/templates/kuttl/oidc/20-assert.yaml +++ b/tests/templates/kuttl/oidc/20-assert.yaml @@ -8,4 +8,4 @@ kind: Job metadata: name: oidc-login-test status: - ready: 1 # wait for the test job to start before streaming its logs in the next test step + succeeded: 1 # wait for the test job to start before streaming its logs in the next test step From e4a8e4efe94014ccca0ffb4ceb9397df06c2c95e Mon Sep 17 00:00:00 2001 From: Siegfried Weber Date: Mon, 25 Nov 2024 15:55:52 +0100 Subject: [PATCH 7/7] Run pre-commit --- tests/templates/kuttl/oidc/12_nifi.yaml.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/templates/kuttl/oidc/12_nifi.yaml.j2 b/tests/templates/kuttl/oidc/12_nifi.yaml.j2 index 957bbbf1..764ab8bf 100644 --- a/tests/templates/kuttl/oidc/12_nifi.yaml.j2 +++ b/tests/templates/kuttl/oidc/12_nifi.yaml.j2 @@ -30,7 +30,7 @@ spec: clusterConfig: authentication: - authenticationClass: nifi-oidc-auth-class-$NAMESPACE - oidc: + oidc: clientCredentialsSecret: nifi-oidc-client sensitiveProperties: keySecret: nifi-sensitive-property-key