@@ -317,7 +317,7 @@ pub struct OperatorEnvironmentOptions {
317
317
318
318
#[ cfg( test) ]
319
319
mod tests {
320
- use std:: { env , fs:: File } ;
320
+ use std:: fs:: File ;
321
321
322
322
use clap:: Parser ;
323
323
use rstest:: * ;
@@ -328,10 +328,6 @@ mod tests {
328
328
const USER_PROVIDED_PATH : & str = "user_provided_path_properties.yaml" ;
329
329
const DEPLOY_FILE_PATH : & str = "deploy_config_spec_properties.yaml" ;
330
330
const DEFAULT_FILE_PATH : & str = "default_file_path_properties.yaml" ;
331
- const WATCH_NAMESPACE : & str = "WATCH_NAMESPACE" ;
332
- const OPERATOR_NAMESPACE : & str = "OPERATOR_NAMESPACE" ;
333
- const OPERATOR_SERVICE_NAME : & str = "OPERATOR_SERVICE_NAME" ;
334
- const KUBERNETES_NODE_NAME : & str = "KUBERNETES_NODE_NAME" ;
335
331
336
332
#[ test]
337
333
fn verify_cli ( ) {
@@ -418,9 +414,6 @@ mod tests {
418
414
419
415
#[ test]
420
416
fn product_operator_run_watch_namespace ( ) {
421
- // clean env var to not interfere if already set
422
- unsafe { env:: remove_var ( WATCH_NAMESPACE ) } ;
423
-
424
417
// cli with namespace
425
418
let opts = ProductOperatorRun :: parse_from ( [
426
419
"run" ,
@@ -480,29 +473,5 @@ mod tests {
480
473
}
481
474
}
482
475
) ;
483
-
484
- // env with namespace
485
- unsafe { env:: set_var ( WATCH_NAMESPACE , "foo" ) } ;
486
- unsafe { env:: set_var ( OPERATOR_SERVICE_NAME , "foo-operator" ) } ;
487
- unsafe { env:: set_var ( OPERATOR_NAMESPACE , "stackable-operators" ) } ;
488
- unsafe { env:: set_var ( KUBERNETES_NODE_NAME , "baz" ) } ;
489
-
490
- let opts = ProductOperatorRun :: parse_from ( [ "run" , "--product-config" , "bar" ] ) ;
491
- assert_eq ! (
492
- opts,
493
- ProductOperatorRun {
494
- product_config: ProductConfigPath :: from( "bar" . as_ref( ) ) ,
495
- watch_namespace: WatchNamespace :: One ( "foo" . to_string( ) ) ,
496
- cluster_info: KubernetesClusterInfoOptions {
497
- kubernetes_cluster_domain: None ,
498
- kubernetes_node_name: "baz" . to_string( )
499
- } ,
500
- telemetry: Default :: default ( ) ,
501
- operator_environment: OperatorEnvironmentOptions {
502
- operator_namespace: "stackable-operators" . to_string( ) ,
503
- operator_service_name: "foo-operator" . to_string( ) ,
504
- }
505
- }
506
- ) ;
507
476
}
508
477
}
0 commit comments