diff --git a/charts/tembo-operator/Chart.yaml b/charts/tembo-operator/Chart.yaml index 1bff5aefd..540edb9c9 100644 --- a/charts/tembo-operator/Chart.yaml +++ b/charts/tembo-operator/Chart.yaml @@ -3,7 +3,7 @@ name: tembo-operator description: "Helm chart to deploy the tembo-operator" type: application icon: https://cloud.tembo.io/images/TemboElephant.png -version: 0.9.0 +version: 0.9.1 home: https://tembo.io sources: - https://github.com/tembo-io/tembo diff --git a/charts/tembo-operator/templates/crd.yaml b/charts/tembo-operator/templates/crd.yaml index e978f2e1b..63eb5b978 100644 --- a/charts/tembo-operator/templates/crd.yaml +++ b/charts/tembo-operator/templates/crd.yaml @@ -645,8 +645,6 @@ spec: enum: - ReadOnlyConnection - ReadWriteConnection - - EncodedReadOnlyConnection - - EncodedReadWriteConnection nullable: true type: string required: diff --git a/conductor/Cargo.lock b/conductor/Cargo.lock index 07a99a23d..096d39974 100644 --- a/conductor/Cargo.lock +++ b/conductor/Cargo.lock @@ -1102,7 +1102,7 @@ checksum = "373e9fafaa20882876db20562275ff58d50e0caa2590077fe7ce7bef90211d0d" [[package]] name = "controller" -version = "0.54.2" +version = "0.54.3" dependencies = [ "actix-web", "anyhow", diff --git a/tembo-operator/Cargo.lock b/tembo-operator/Cargo.lock index d61f0f386..c61e1c75f 100644 --- a/tembo-operator/Cargo.lock +++ b/tembo-operator/Cargo.lock @@ -505,7 +505,7 @@ dependencies = [ [[package]] name = "controller" -version = "0.54.2" +version = "0.54.3" dependencies = [ "actix-web", "anyhow", diff --git a/tembo-operator/Cargo.toml b/tembo-operator/Cargo.toml index d13c89008..b51ac0736 100644 --- a/tembo-operator/Cargo.toml +++ b/tembo-operator/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "controller" description = "Tembo Operator for Postgres" -version = "0.54.2" +version = "0.54.3" edition = "2021" default-run = "controller" license = "Apache-2.0" diff --git a/tembo-operator/src/app_service/manager.rs b/tembo-operator/src/app_service/manager.rs index 844b5ea0a..b3baa3f51 100644 --- a/tembo-operator/src/app_service/manager.rs +++ b/tembo-operator/src/app_service/manager.rs @@ -479,8 +479,6 @@ fn generate_deployment( let secret_key = match e { EnvVarRef::ReadOnlyConnection => "ro_uri", EnvVarRef::ReadWriteConnection => "rw_uri", - EnvVarRef::EncodedReadOnlyConnection => "encoded_ro_uri", - EnvVarRef::EncodedReadWriteConnection => "encoded_rw_uri", }; Some(EnvVar { name: env.name, @@ -1061,7 +1059,7 @@ pub async fn prepare_apps_connection_secret(client: Client, cdb: &CoreDB) -> Res let mut new_secret_data = BTreeMap::new(); for (key, value) in original_secret_data { match key.as_str() { - "r_uri" | "ro_uri" | "rw_uri" | "encoded_ro_uri" | "encoded_rw_uri" => { + "r_uri" | "ro_uri" | "rw_uri" => { let new_value = format!("{}?application_name=tembo-apps", value); new_secret_data.insert(key, new_value); } diff --git a/tembo-operator/src/app_service/types.rs b/tembo-operator/src/app_service/types.rs index 809c5fc6f..3773036f4 100644 --- a/tembo-operator/src/app_service/types.rs +++ b/tembo-operator/src/app_service/types.rs @@ -174,8 +174,6 @@ pub struct EnvVar { pub enum EnvVarRef { ReadOnlyConnection, ReadWriteConnection, - EncodedReadOnlyConnection, - EncodedReadWriteConnection, } /// Routing is used if there is a routing port, then a service is created using diff --git a/tembo-operator/src/secret.rs b/tembo-operator/src/secret.rs index f139bc6a4..987365256 100644 --- a/tembo-operator/src/secret.rs +++ b/tembo-operator/src/secret.rs @@ -156,25 +156,6 @@ fn secret_data(cdb: &CoreDB, ns: &str, password: String) -> BTreeMap String { }; pg.generate_one().unwrap() } - -#[cfg(test)] -mod tests { - use super::*; - use crate::apis::coredb_types::{CoreDB, CoreDBSpec}; - - #[test] - fn test_secret_data_url_encoding() { - let cdb = CoreDB::new("test-db", CoreDBSpec::default()); - - let password = "TestingPasswd12345@#".to_string(); - let data = secret_data(&cdb, "default", password); - - let encoded_rw = data.get("encoded_rw_uri").unwrap(); - // The string is already a URL, just need to convert bytes to string - let decoded_rw = String::from_utf8(encoded_rw.0.clone()).unwrap(); - assert!(decoded_rw.contains("TestingPasswd12345%40%23")); - - let encoded_ro = data.get("encoded_ro_uri").unwrap(); - let decoded_ro = String::from_utf8(encoded_ro.0.clone()).unwrap(); - assert!(decoded_ro.contains("TestingPasswd12345%40%23")); - } -} diff --git a/tembo-stacks/Cargo.toml b/tembo-stacks/Cargo.toml index a5418e388..38ef7dd72 100644 --- a/tembo-stacks/Cargo.toml +++ b/tembo-stacks/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "tembo-stacks" description = "Tembo Stacks for Postgres" -version = "0.23.4" +version = "0.23.5" authors = ["tembo.io"] edition = "2021" license = "Apache-2.0" @@ -29,7 +29,7 @@ serde_json = "1.0.114" serde_yaml = "0.9.21" strum = "0.26.2" strum_macros = "0.26.2" -tembo-controller = { package = "controller", version = "0.54.0" } +tembo-controller = { package = "controller", version = "0.53.0" } tracing = "0.1" utoipa = { version = "3", features = ["actix_extras", "chrono"] } diff --git a/tembo-stacks/src/apps/sql-runner.yaml b/tembo-stacks/src/apps/sql-runner.yaml index 1aa6de7b4..0ef482261 100644 --- a/tembo-stacks/src/apps/sql-runner.yaml +++ b/tembo-stacks/src/apps/sql-runner.yaml @@ -14,4 +14,4 @@ appServices: ingressPath: "/sql/v1" env: - name: CONNECTION_STRING - valueFromPlatform: EncodedReadWriteConnection + valueFromPlatform: ReadWriteConnection