Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Correct the secret name where the URL encoded connection string is located #1116

Merged
merged 1 commit into from
Jan 3, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tembo-operator/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion tembo-operator/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "controller"
description = "Tembo Operator for Postgres"
version = "0.54.0"
version = "0.54.1"
edition = "2021"
default-run = "controller"
license = "Apache-2.0"
Expand Down
10 changes: 9 additions & 1 deletion tembo-operator/src/app_service/manager.rs
Original file line number Diff line number Diff line change
Expand Up @@ -465,6 +465,7 @@ fn generate_deployment(

// set any user provided env vars last
// including the valueFromX values
let encoded_connection_secret_name = format!("{}-connection", coredb_name);
if let Some(envs) = appsvc.env.clone() {
for env in envs {
let evar: Option<EnvVar> = match (env.value, env.value_from_platform) {
Expand All @@ -482,11 +483,18 @@ fn generate_deployment(
EnvVarRef::EncodedReadOnlyConnection => "encoded_ro_uri",
EnvVarRef::EncodedReadWriteConnection => "encoded_rw_uri",
};
let secret_name = match e {
EnvVarRef::EncodedReadOnlyConnection
| EnvVarRef::EncodedReadWriteConnection => {
encoded_connection_secret_name.clone()
}
_ => apps_connection_secret_name.clone(),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it not safe to always use the url encoded secret name?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

most likely, but I didn't want to risk breaking anything. There are several places in Mahout that encode passwords using the current secret.

};
Some(EnvVar {
name: env.name,
value_from: Some(EnvVarSource {
secret_key_ref: Some(SecretKeySelector {
name: Some(apps_connection_secret_name.clone()),
name: Some(secret_name),
key: secret_key.to_string(),
..SecretKeySelector::default()
}),
Expand Down