Update tests

opendatahub-io · Dec 13, 2024 · 93706b9 · 93706b9
1 parent 083a2ee
commit 93706b9
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 50 deletions.
diff --git a/controllers/common_test.go b/controllers/common_test.go
@@ -47,10 +47,6 @@ func TestDeployCommonPolicies(t *testing.T) {
 					Image:  "someimage",
 				},
 			},
-			APIServer: &dspav1.APIServer{
-				EnableSamplePipeline:  false,
-				EnableIlabKFPPipeline: false,
-			},
 		},
 	}
 

diff --git a/controllers/database_test.go b/controllers/database_test.go
@@ -46,10 +46,6 @@ func TestDeployDatabase(t *testing.T) {
 					Image:  "someimage",
 				},
 			},
-			APIServer: &dspav1.APIServer{
-				EnableSamplePipeline:  false,
-				EnableIlabKFPPipeline: false,
-			},
 		},
 	}
 
@@ -100,10 +96,6 @@ func TestDontDeployDatabase(t *testing.T) {
 					Image:  "someimage",
 				},
 			},
-			APIServer: &dspav1.APIServer{
-				EnableSamplePipeline:  false,
-				EnableIlabKFPPipeline: false,
-			},
 		},
 	}
 

diff --git a/controllers/dspipeline_params.go b/controllers/dspipeline_params.go
@@ -581,8 +581,6 @@ func (p *DSPAParams) ExtractParams(ctx context.Context, dsp *dspa.DataSciencePip
 	p.CustomCABundleRootMountPath = config.CustomCABundleRootMountPath
 	p.PiplinesCABundleMountPath = config.GetCABundleFileMountPath()
 	p.PodToPodTLS = false
-	p.EnableSamplePipeline = dsp.Spec.APIServer.EnableSamplePipeline
-	p.EnableIlabKFPPipeline = dsp.Spec.APIServer.EnableIlabKFPPipeline
 	dspTrustedCAConfigMapKey := config.CustomDSPTrustedCAConfigMapKey
 
 	// by default it's enabled when omitted
@@ -599,6 +597,9 @@ func (p *DSPAParams) ExtractParams(ctx context.Context, dsp *dspa.DataSciencePip
 		argoLauncherImageFromConfig := config.GetStringConfigWithDefault(config.LauncherImagePath, config.DefaultImageValue)
 		argoDriverImageFromConfig := config.GetStringConfigWithDefault(config.DriverImagePath, config.DefaultImageValue)
 
+		p.EnableSamplePipeline = dsp.Spec.APIServer.EnableSamplePipeline
+		p.EnableIlabKFPPipeline = dsp.Spec.APIServer.EnableIlabKFPPipeline
+
 		setStringDefault(serverImageFromConfig, &p.APIServer.Image)
 		setStringDefault(argoLauncherImageFromConfig, &p.APIServer.ArgoLauncherImage)
 		setStringDefault(argoDriverImageFromConfig, &p.APIServer.ArgoDriverImage)

diff --git a/controllers/mlpipeline_ui_test.go b/controllers/mlpipeline_ui_test.go
@@ -50,10 +50,6 @@ func TestDeployUI(t *testing.T) {
 					Image:  "someimage",
 				},
 			},
-			APIServer: &dspav1.APIServer{
-				EnableSamplePipeline:  false,
-				EnableIlabKFPPipeline: false,
-			},
 		},
 	}
 
@@ -108,10 +104,6 @@ func TestDontDeployUI(t *testing.T) {
 					Image:  "someimage",
 				},
 			},
-			APIServer: &dspav1.APIServer{
-				EnableSamplePipeline:  false,
-				EnableIlabKFPPipeline: false,
-			},
 		},
 	}
 
@@ -162,10 +154,6 @@ func TestDefaultDeployBehaviorUI(t *testing.T) {
 					Image:  "someimage",
 				},
 			},
-			APIServer: &dspav1.APIServer{
-				EnableSamplePipeline:  false,
-				EnableIlabKFPPipeline: false,
-			},
 		},
 	}
 

diff --git a/controllers/persistence_agent_test.go b/controllers/persistence_agent_test.go
@@ -51,10 +51,6 @@ func TestDeployPersistenceAgent(t *testing.T) {
 					Image:  "someimage",
 				},
 			},
-			APIServer: &dspav1.APIServer{
-				EnableSamplePipeline:  false,
-				EnableIlabKFPPipeline: false,
-			},
 		},
 	}
 

diff --git a/controllers/scheduled_workflow_test.go b/controllers/scheduled_workflow_test.go
@@ -51,10 +51,6 @@ func TestDeployScheduledWorkflow(t *testing.T) {
 					Image:  "someimage",
 				},
 			},
-			APIServer: &dspav1.APIServer{
-				EnableSamplePipeline:  false,
-				EnableIlabKFPPipeline: false,
-			},
 		},
 	}
 

diff --git a/controllers/storage_test.go b/controllers/storage_test.go
@@ -65,10 +65,6 @@ func TestDeployStorage(t *testing.T) {
 					},
 				},
 			},
-			APIServer: &dspav1.APIServer{
-				EnableSamplePipeline:  false,
-				EnableIlabKFPPipeline: false,
-			},
 		},
 	}
 
@@ -136,10 +132,6 @@ func TestDeployStorageWithExternalRouteEnabled(t *testing.T) {
 					},
 				},
 			},
-			APIServer: &dspav1.APIServer{
-				EnableSamplePipeline:  false,
-				EnableIlabKFPPipeline: false,
-			},
 		},
 	}
 
@@ -202,10 +194,6 @@ func TestDontDeployStorage(t *testing.T) {
 					Image:  "someimage",
 				},
 			},
-			APIServer: &dspav1.APIServer{
-				EnableSamplePipeline:  false,
-				EnableIlabKFPPipeline: false,
-			},
 		},
 	}
 
@@ -252,10 +240,6 @@ func TestDefaultDeployBehaviorStorage(t *testing.T) {
 			ObjectStorage: &dspav1.ObjectStorage{
 				DisableHealthCheck: false,
 			},
-			APIServer: &dspav1.APIServer{
-				EnableSamplePipeline:  false,
-				EnableIlabKFPPipeline: false,
-			},
 		},
 	}