From 2a815e5a8c0380105d12d1cbccfe28ae6c8e894b Mon Sep 17 00:00:00 2001 From: Siegfried Weber Date: Tue, 20 Dec 2022 13:00:18 +0100 Subject: [PATCH 1/2] Set stackable-operator to branch disable_vector_agent_by_default --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- examples/simple-zookeeper-tls-cluster.yaml | 5 +---- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 78be5a67..b0d9ac21 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2110,7 +2110,7 @@ dependencies = [ [[package]] name = "stackable-operator" version = "0.30.1" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=0.30.1#34cc76200b6432f7b143ca1350e665ddb169df88" +source = "git+https://github.com/stackabletech//operator-rs.git?branch=disable_vector_agent_by_default#f6faff7dd8b074aa9e9d65adb1b6442266a9b99c" dependencies = [ "chrono", "clap", @@ -2144,7 +2144,7 @@ dependencies = [ [[package]] name = "stackable-operator-derive" version = "0.30.1" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=0.30.1#34cc76200b6432f7b143ca1350e665ddb169df88" +source = "git+https://github.com/stackabletech//operator-rs.git?branch=disable_vector_agent_by_default#f6faff7dd8b074aa9e9d65adb1b6442266a9b99c" dependencies = [ "darling", "proc-macro2", diff --git a/Cargo.toml b/Cargo.toml index 0a0a4ddf..03ef55d9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,4 +3,4 @@ members = ["rust/crd", "rust/operator-binary"] [patch."https://github.com/stackabletech/operator-rs.git"] # stackable-operator = { path = "vendor/operator-rs" } -# stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "main" } +stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "disable_vector_agent_by_default" } diff --git a/examples/simple-zookeeper-tls-cluster.yaml b/examples/simple-zookeeper-tls-cluster.yaml index 16fbd99a..4105a688 100644 --- a/examples/simple-zookeeper-tls-cluster.yaml +++ b/examples/simple-zookeeper-tls-cluster.yaml @@ -6,7 +6,7 @@ metadata: spec: image: productVersion: 3.8.0 - stackableVersion: 0.8.0 + stackableVersion: 0.9.0 config: tls: secretClass: tls @@ -14,9 +14,6 @@ spec: authenticationClass: zk-client-tls quorumTlsSecretClass: tls servers: - config: - logging: - enableVectorAgent: false roleGroups: default: replicas: 3 From eae6d8cf5b039a9aaa1922939dcfd719b274c8e4 Mon Sep 17 00:00:00 2001 From: Siegfried Weber Date: Tue, 20 Dec 2022 14:52:59 +0100 Subject: [PATCH 2/2] Upgrade stackable-operator to version 0.30.2 --- Cargo.lock | 8 ++++---- Cargo.toml | 2 +- rust/crd/Cargo.toml | 2 +- rust/operator-binary/Cargo.toml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b0d9ac21..f9aa76cd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2109,8 +2109,8 @@ dependencies = [ [[package]] name = "stackable-operator" -version = "0.30.1" -source = "git+https://github.com/stackabletech//operator-rs.git?branch=disable_vector_agent_by_default#f6faff7dd8b074aa9e9d65adb1b6442266a9b99c" +version = "0.30.2" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=0.30.2#133db3918fb3af191a4203106a5056d77cc9579f" dependencies = [ "chrono", "clap", @@ -2143,8 +2143,8 @@ dependencies = [ [[package]] name = "stackable-operator-derive" -version = "0.30.1" -source = "git+https://github.com/stackabletech//operator-rs.git?branch=disable_vector_agent_by_default#f6faff7dd8b074aa9e9d65adb1b6442266a9b99c" +version = "0.30.2" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=0.30.2#133db3918fb3af191a4203106a5056d77cc9579f" dependencies = [ "darling", "proc-macro2", diff --git a/Cargo.toml b/Cargo.toml index 03ef55d9..0a0a4ddf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,4 +3,4 @@ members = ["rust/crd", "rust/operator-binary"] [patch."https://github.com/stackabletech/operator-rs.git"] # stackable-operator = { path = "vendor/operator-rs" } -stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "disable_vector_agent_by_default" } +# stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "main" } diff --git a/rust/crd/Cargo.toml b/rust/crd/Cargo.toml index 43f7286e..8b962b99 100644 --- a/rust/crd/Cargo.toml +++ b/rust/crd/Cargo.toml @@ -12,7 +12,7 @@ publish = false serde = "1.0.138" serde_json = "1.0.82" snafu = "0.7.1" -stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.30.1" } +stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.30.2" } strum = { version = "0.24.1", features = ["derive"] } [dev-dependencies] diff --git a/rust/operator-binary/Cargo.toml b/rust/operator-binary/Cargo.toml index 6842bdb3..429a49c3 100644 --- a/rust/operator-binary/Cargo.toml +++ b/rust/operator-binary/Cargo.toml @@ -24,10 +24,10 @@ tokio-executor = "0.1.10" tokio-zookeeper = "0.1.3" tracing = "0.1.35" pin-project = "1.0.11" -stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.30.1" } +stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.30.2" } stackable-zookeeper-crd = { path = "../crd" } [build-dependencies] built = { version = "0.5.1", features = ["chrono", "git2"] } -stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.30.1" } +stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.30.2" } stackable-zookeeper-crd = { path = "../crd" }