|
1 | 1 | use std::{collections::BTreeMap, str::FromStr}; |
2 | 2 |
|
3 | 3 | use stackable_operator::{ |
4 | | - client::Client, commons::opa::OpaApiVersion, k8s_openapi::api::core::v1::ConfigMap, |
5 | | - kube::ResourceExt, v2::types::kubernetes::SecretClassName, |
| 4 | + client::Client, |
| 5 | + commons::opa::OpaApiVersion, |
| 6 | + k8s_openapi::api::core::v1::ConfigMap, |
| 7 | + v2::types::kubernetes::{NamespaceName, SecretClassName}, |
6 | 8 | }; |
7 | 9 |
|
8 | 10 | use crate::crd::v1alpha1; |
@@ -41,6 +43,7 @@ impl TrinoOpaConfig { |
41 | 43 | pub async fn from_opa_config( |
42 | 44 | client: &Client, |
43 | 45 | trino: &v1alpha1::TrinoCluster, |
| 46 | + namespace: &NamespaceName, |
44 | 47 | opa_config: &v1alpha1::TrinoAuthorizationOpaConfig, |
45 | 48 | ) -> Result<Self, stackable_operator::commons::opa::Error> { |
46 | 49 | let non_batched_connection_string = opa_config |
@@ -86,10 +89,7 @@ impl TrinoOpaConfig { |
86 | 89 | }; |
87 | 90 |
|
88 | 91 | let tls_secret_class = client |
89 | | - .get::<ConfigMap>( |
90 | | - &opa_config.opa.config_map_name, |
91 | | - trino.namespace().as_deref().unwrap_or("default"), |
92 | | - ) |
| 92 | + .get::<ConfigMap>(&opa_config.opa.config_map_name, namespace.as_ref()) |
93 | 93 | .await |
94 | 94 | .ok() |
95 | 95 | .and_then(|cm| cm.data) |
|
0 commit comments