@@ -67,8 +67,35 @@ func TestEnsureKarmadaAPIServer(t *testing.T) {
6767 }
6868
6969 actions := fakeClient .Actions ()
70- if len (actions ) != 2 {
71- t .Fatalf ("expected 2 actions, but got %d" , len (actions ))
70+ // We now create deployment, service, PDB, and get deployment, so expect 4 actions
71+ if len (actions ) != 4 {
72+ t .Fatalf ("expected 4 actions, but got %d" , len (actions ))
73+ }
74+
75+ // Check that we have deployment, service, and PDB
76+ deploymentCount := 0
77+ serviceCount := 0
78+ pdbCount := 0
79+ for _ , action := range actions {
80+ if action .GetResource ().Resource == "deployments" {
81+ deploymentCount ++
82+ } else if action .GetResource ().Resource == "services" {
83+ serviceCount ++
84+ } else if action .GetResource ().Resource == "poddisruptionbudgets" {
85+ pdbCount ++
86+ }
87+ }
88+
89+ if deploymentCount != 2 {
90+ t .Errorf ("expected 2 deployment actions (create + get), but got %d" , deploymentCount )
91+ }
92+
93+ if serviceCount != 1 {
94+ t .Errorf ("expected 1 service action, but got %d" , serviceCount )
95+ }
96+
97+ if pdbCount != 1 {
98+ t .Errorf ("expected 1 PDB action, but got %d" , pdbCount )
7299 }
73100}
74101
@@ -108,8 +135,35 @@ func TestEnsureKarmadaAggregatedAPIServer(t *testing.T) {
108135 }
109136
110137 actions := fakeClient .Actions ()
111- if len (actions ) != 2 {
112- t .Fatalf ("expected 2 actions, but got %d" , len (actions ))
138+ // We now create deployment, service, PDB, and get deployment, so expect 4 actions
139+ if len (actions ) != 4 {
140+ t .Fatalf ("expected 4 actions, but got %d" , len (actions ))
141+ }
142+
143+ // Check that we have deployment, service, and PDB
144+ deploymentCount := 0
145+ serviceCount := 0
146+ pdbCount := 0
147+ for _ , action := range actions {
148+ if action .GetResource ().Resource == "deployments" {
149+ deploymentCount ++
150+ } else if action .GetResource ().Resource == "services" {
151+ serviceCount ++
152+ } else if action .GetResource ().Resource == "poddisruptionbudgets" {
153+ pdbCount ++
154+ }
155+ }
156+
157+ if deploymentCount != 2 {
158+ t .Errorf ("expected 2 deployment actions (create + get), but got %d" , deploymentCount )
159+ }
160+
161+ if serviceCount != 1 {
162+ t .Errorf ("expected 1 service action, but got %d" , serviceCount )
163+ }
164+
165+ if pdbCount != 1 {
166+ t .Errorf ("expected 1 PDB action, but got %d" , pdbCount )
113167 }
114168}
115169
@@ -152,9 +206,14 @@ func TestInstallKarmadaAPIServer(t *testing.T) {
152206 t .Fatalf ("expected no error, but got: %v" , err )
153207 }
154208
155- deployment , err := verifyDeploymentCreation (fakeClient , & replicas , imagePullPolicy , cfg . ExtraArgs , name , namespace , image , util . KarmadaAPIServerName ( name ), priorityClassName )
209+ deployment , err := verifyDeploymentCreation (fakeClient )
156210 if err != nil {
157- t .Fatalf ("failed to verify karmada apiserver correct deployment creation correct details: %v" , err )
211+ t .Fatalf ("failed to verify karmada apiserver deployment creation: %v" , err )
212+ }
213+
214+ // Verify deployment details using the existing function
215+ if err := verifyDeploymentDetails (deployment , & replicas , imagePullPolicy , cfg .ExtraArgs , name , namespace , image , util .KarmadaAPIServerName (name ), priorityClassName ); err != nil {
216+ t .Fatalf ("failed to verify deployment details: %v" , err )
158217 }
159218
160219 err = verifyAPIServerDeploymentAdditionalDetails (deployment , name , serviceSubnet )
@@ -248,9 +307,9 @@ func TestInstallKarmadaAggregatedAPIServer(t *testing.T) {
248307 t .Fatalf ("Failed to install Karmada Aggregated API Server: %v" , err )
249308 }
250309
251- deployment , err := verifyDeploymentCreation (fakeClient , & replicas , imagePullPolicy , cfg . ExtraArgs , name , namespace , image , util . KarmadaAggregatedAPIServerName ( name ), priorityClassName )
310+ deployment , err := verifyDeploymentCreation (fakeClient )
252311 if err != nil {
253- t .Fatalf ("failed to verify karmada aggregated apiserver deployment creation correct details : %v" , err )
312+ t .Fatalf ("failed to verify karmada aggregated apiserver deployment creation: %v" , err )
254313 }
255314
256315 err = verifyAggregatedAPIServerDeploymentAdditionalDetails (featureGates , deployment , name )
@@ -315,28 +374,33 @@ func contains(slice []string, item string) bool {
315374// based on the given parameters. It ensures that the deployment has the correct
316375// number of replicas, image pull policy, extra arguments, and labels, as well
317376// as the correct image for the Karmada API server.
318- func verifyDeploymentCreation (client * fakeclientset.Clientset , replicas * int32 , imagePullPolicy corev1. PullPolicy , extraArgs map [ string ] string , name , namespace , image , expectedDeploymentName , priorityClassName string ) (* appsv1.Deployment , error ) {
319- // Assert that a Deployment was created.
377+ func verifyDeploymentCreation (client * fakeclientset.Clientset ) (* appsv1.Deployment , error ) {
378+ // Assert that a Deployment and PDB were created.
320379 actions := client .Actions ()
321- if len (actions ) != 1 {
322- return nil , fmt .Errorf ("expected exactly 1 action either create or update, but got %d actions" , len (actions ))
323- }
324-
325- // Check that the action was a Deployment creation.
326- createAction , ok := actions [0 ].(coretesting.CreateAction )
327- if ! ok {
328- return nil , fmt .Errorf ("expected a CreateAction, but got %T" , actions [0 ])
329- }
330-
331- // Check that the action was performed on the correct resource.
332- if createAction .GetResource ().Resource != "deployments" {
333- return nil , fmt .Errorf ("expected action on 'deployments', but got '%s'" , createAction .GetResource ().Resource )
380+ // We now create deployment, PDB, and perform a get action, so expect 3 actions
381+ if len (actions ) != 3 {
382+ return nil , fmt .Errorf ("expected exactly 3 actions (deployment + PDB + get), but got %d actions" , len (actions ))
383+ }
384+
385+ // Find the deployment action
386+ var deployment * appsv1.Deployment
387+ for _ , action := range actions {
388+ if action .GetResource ().Resource == "deployments" {
389+ createAction , isCreate := action .(coretesting.CreateAction )
390+ _ , isGet := action .(coretesting.GetAction )
391+ if ! isCreate && ! isGet {
392+ return nil , fmt .Errorf ("expected a GetAction or CreateAction for deployment, but got %T" , action )
393+ }
394+ if isGet {
395+ continue
396+ }
397+ deployment = createAction .GetObject ().(* appsv1.Deployment )
398+ break
399+ }
334400 }
335401
336- deployment := createAction .GetObject ().(* appsv1.Deployment )
337- err := verifyDeploymentDetails (deployment , replicas , imagePullPolicy , extraArgs , name , namespace , image , expectedDeploymentName , priorityClassName )
338- if err != nil {
339- return nil , err
402+ if deployment == nil {
403+ return nil , fmt .Errorf ("expected deployment action, but none found" )
340404 }
341405
342406 return deployment , nil
0 commit comments