From ced01811b2c3f13dccba62dc5d431c6bdad1192c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6nke=20Liebau?= Date: Fri, 22 Nov 2024 11:11:56 +0100 Subject: [PATCH 1/6] Patch operator-rs to use a PR version which fixes SUP-148 --- Cargo.lock | 8 ++++---- Cargo.toml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 645815c7..350aa838 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2225,8 +2225,8 @@ checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" [[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%2FSUP-148#154ce7e8de746aa43e120cb839f9494089c620ef" dependencies = [ "chrono", "clap", @@ -2264,7 +2264,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%2FSUP-148#154ce7e8de746aa43e120cb839f9494089c620ef" dependencies = [ "darling", "proc-macro2", @@ -2275,7 +2275,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%2FSUP-148#154ce7e8de746aa43e120cb839f9494089c620ef" dependencies = [ "kube", "semver", diff --git a/Cargo.toml b/Cargo.toml index 118c741d..d4c1f30e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -30,6 +30,6 @@ strum = { version = "0.26", features = ["derive"] } tokio = { version = "1.40", features = ["full"] } tracing = "0.1" -# [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" } # stackable-operator = { path = "../operator-rs/crates/stackable-operator" } From ce171a396049afd693d06735aa6df8f416992138 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6nke=20Liebau?= Date: Fri, 22 Nov 2024 11:49:50 +0100 Subject: [PATCH 2/6] Update PR revision --- Cargo.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 350aa838..afa4ae6d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2226,7 +2226,7 @@ checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" [[package]] name = "stackable-operator" version = "0.81.0" -source = "git+https://github.com/stackabletech//operator-rs.git?branch=fix%2FSUP-148#154ce7e8de746aa43e120cb839f9494089c620ef" +source = "git+https://github.com/stackabletech//operator-rs.git?branch=fix%2FSUP-148#d04b987c75beecd5bc65d40a07084d9e991babf2" dependencies = [ "chrono", "clap", @@ -2264,7 +2264,7 @@ dependencies = [ [[package]] name = "stackable-operator-derive" version = "0.3.1" -source = "git+https://github.com/stackabletech//operator-rs.git?branch=fix%2FSUP-148#154ce7e8de746aa43e120cb839f9494089c620ef" +source = "git+https://github.com/stackabletech//operator-rs.git?branch=fix%2FSUP-148#d04b987c75beecd5bc65d40a07084d9e991babf2" dependencies = [ "darling", "proc-macro2", @@ -2275,7 +2275,7 @@ dependencies = [ [[package]] name = "stackable-shared" version = "0.0.1" -source = "git+https://github.com/stackabletech//operator-rs.git?branch=fix%2FSUP-148#154ce7e8de746aa43e120cb839f9494089c620ef" +source = "git+https://github.com/stackabletech//operator-rs.git?branch=fix%2FSUP-148#d04b987c75beecd5bc65d40a07084d9e991babf2" dependencies = [ "kube", "semver", From 57b3d50e3ad053cfd2c89ae7c7886db7e63882a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6nke=20Liebau?= Date: Sun, 24 Nov 2024 17:36:57 +0100 Subject: [PATCH 3/6] Updated changelog Removed patched version of op-rs and pulled in 0.82 --- CHANGELOG.md | 2 ++ Cargo.lock | 8 ++++---- Cargo.toml | 6 +++--- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a1f72c51..61503138 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,7 @@ All notable changes to this project will be documented in this file. - Don't ignore envOverrides ([#633]). - Don't print credentials to STDOUT during startup. Ideally we should use [config-utils](https://github.com/stackabletech/config-utils), but that's not easy (see [here](https://github.com/stackabletech/trino-operator/tree/fix/secret-printing)) ([#634]). - Invalid `TrinoCluster`, `TrinoCatalog` or `AuthenticationClass` objects don't stop the operator from reconciliation ([#657]) +- 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 ([#672]). ### Removed @@ -36,6 +37,7 @@ All notable changes to this project will be documented in this file. [#646]: https://github.com/stackabletech/trino-operator/pull/646 [#655]: https://github.com/stackabletech/trino-operator/pull/655 [#657]: https://github.com/stackabletech/trino-operator/pull/657 +[#672]: https://github.com/stackabletech/trino-operator/pull/672 ## [24.7.0] - 2024-07-24 diff --git a/Cargo.lock b/Cargo.lock index afa4ae6d..9eccdf12 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2225,8 +2225,8 @@ checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" [[package]] name = "stackable-operator" -version = "0.81.0" -source = "git+https://github.com/stackabletech//operator-rs.git?branch=fix%2FSUP-148#d04b987c75beecd5bc65d40a07084d9e991babf2" +version = "0.82.0" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.82.0#415bbd031bd52e9c0c5392060235030e9930b46b" dependencies = [ "chrono", "clap", @@ -2264,7 +2264,7 @@ dependencies = [ [[package]] name = "stackable-operator-derive" version = "0.3.1" -source = "git+https://github.com/stackabletech//operator-rs.git?branch=fix%2FSUP-148#d04b987c75beecd5bc65d40a07084d9e991babf2" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.82.0#415bbd031bd52e9c0c5392060235030e9930b46b" dependencies = [ "darling", "proc-macro2", @@ -2275,7 +2275,7 @@ dependencies = [ [[package]] name = "stackable-shared" version = "0.0.1" -source = "git+https://github.com/stackabletech//operator-rs.git?branch=fix%2FSUP-148#d04b987c75beecd5bc65d40a07084d9e991babf2" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.82.0#415bbd031bd52e9c0c5392060235030e9930b46b" dependencies = [ "kube", "semver", diff --git a/Cargo.toml b/Cargo.toml index d4c1f30e..feb3b239 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,12 +24,12 @@ 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" } product-config = { git = "https://github.com/stackabletech/product-config.git", tag = "0.7.0" } strum = { version = "0.26", features = ["derive"] } tokio = { version = "1.40", features = ["full"] } tracing = "0.1" - [patch."https://github.com/stackabletech/operator-rs.git"] - stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "fix/SUP-148" } +# [patch."https://github.com/stackabletech/operator-rs.git"] +# stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "fix/SUP-148" } # stackable-operator = { path = "../operator-rs/crates/stackable-operator" } From 5524aab850bd17ac143de16078c28abf9ce632a4 Mon Sep 17 00:00:00 2001 From: Siegfried Weber Date: Mon, 25 Nov 2024 12:53:43 +0100 Subject: [PATCH 4/6] Regenerate Nix files --- Cargo.nix | 14 +++++++------- crate-hashes.json | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Cargo.nix b/Cargo.nix index f1cef947..47c80888 100644 --- a/Cargo.nix +++ b/Cargo.nix @@ -6816,13 +6816,13 @@ rec { }; "stackable-operator" = rec { crateName = "stackable-operator"; - version = "0.80.0"; + version = "0.82.0"; edition = "2021"; workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "6fbe32300b60f95e0baa2ab0ff2daf961b06531c"; - sha256 = "16jrq3wdwz63210jgmqbx3snrr15wxw6l1smqhzv7b7jpq8qvya3"; + rev = "415bbd031bd52e9c0c5392060235030e9930b46b"; + sha256 = "0phasjwb64rxgn5hs8vks92icmx9255bd5v9dms280clrfpcg4hy"; }; libName = "stackable_operator"; authors = [ @@ -6979,8 +6979,8 @@ rec { workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "6fbe32300b60f95e0baa2ab0ff2daf961b06531c"; - sha256 = "16jrq3wdwz63210jgmqbx3snrr15wxw6l1smqhzv7b7jpq8qvya3"; + rev = "415bbd031bd52e9c0c5392060235030e9930b46b"; + sha256 = "0phasjwb64rxgn5hs8vks92icmx9255bd5v9dms280clrfpcg4hy"; }; procMacro = true; libName = "stackable_operator_derive"; @@ -7014,8 +7014,8 @@ rec { workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "6fbe32300b60f95e0baa2ab0ff2daf961b06531c"; - sha256 = "16jrq3wdwz63210jgmqbx3snrr15wxw6l1smqhzv7b7jpq8qvya3"; + rev = "415bbd031bd52e9c0c5392060235030e9930b46b"; + sha256 = "0phasjwb64rxgn5hs8vks92icmx9255bd5v9dms280clrfpcg4hy"; }; libName = "stackable_shared"; authors = [ diff --git a/crate-hashes.json b/crate-hashes.json index 562fb18b..0ca37e6e 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?tag=stackable-operator-0.82.0#stackable-operator-derive@0.3.1": "0phasjwb64rxgn5hs8vks92icmx9255bd5v9dms280clrfpcg4hy", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.82.0#stackable-operator@0.82.0": "0phasjwb64rxgn5hs8vks92icmx9255bd5v9dms280clrfpcg4hy", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.82.0#stackable-shared@0.0.1": "0phasjwb64rxgn5hs8vks92icmx9255bd5v9dms280clrfpcg4hy", "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 a518ea17394bfa67acc01de4586f249b8a173619 Mon Sep 17 00:00:00 2001 From: Siegfried Weber Date: Mon, 25 Nov 2024 13:48:01 +0100 Subject: [PATCH 5/6] Update Cargo.toml --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index feb3b239..b9c57ba9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -31,5 +31,5 @@ tokio = { version = "1.40", features = ["full"] } tracing = "0.1" # [patch."https://github.com/stackabletech/operator-rs.git"] -# 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 = "main" } # stackable-operator = { path = "../operator-rs/crates/stackable-operator" } From 646787db4c042def2d104bf9f068b6a28c30913f Mon Sep 17 00:00:00 2001 From: Siegfried Weber Date: Mon, 25 Nov 2024 14:17:38 +0100 Subject: [PATCH 6/6] Run pre-commit --- tests/templates/kuttl/opa-authorization/03-install-hive.yaml.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/templates/kuttl/opa-authorization/03-install-hive.yaml.j2 b/tests/templates/kuttl/opa-authorization/03-install-hive.yaml.j2 index 4563414b..9eff5093 100644 --- a/tests/templates/kuttl/opa-authorization/03-install-hive.yaml.j2 +++ b/tests/templates/kuttl/opa-authorization/03-install-hive.yaml.j2 @@ -32,4 +32,4 @@ metadata: type: Opaque stringData: username: hive - password: hive + password: hive