Merge pull request #730 from HumairAK/fix_pa_path

correct pa config path
opendatahub-io · Oct 24, 2024 · cac89c8 · cac89c8
2 parents 134a96d + c50abad
commit cac89c8
Show file tree

Hide file tree

Showing 12 changed files with 27 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -578,7 +578,7 @@ Images:
   ApiServer: quay.io/opendatahub/ds-pipelines-api-server:latest
   Artifact: quay.io/opendatahub/ds-pipelines-artifact-manager:latest
   OAuthProxy: registry.redhat.io/openshift4/ose-oauth-proxy:v4.12.0
-  PersistentAgent: quay.io/opendatahub/ds-pipelines-persistenceagent:latest
+  PersistenceAgent: quay.io/opendatahub/ds-pipelines-persistenceagent:latest
   ScheduledWorkflow: quay.io/opendatahub/ds-pipelines-scheduledworkflow:latest
   Cache: registry.access.redhat.com/ubi8/ubi-minimal
   MoveResultsImage: registry.access.redhat.com/ubi8/ubi-micro

diff --git a/config/configmaps/files/config.yaml b/config/configmaps/files/config.yaml
@@ -1,6 +1,6 @@
 Images:
   ApiServer: $(IMAGES_APISERVER)
-  PersistentAgent: $(IMAGES_PERSISTENCEAGENT)
+  PersistenceAgent: $(IMAGES_PERSISTENCEAGENT)
   ScheduledWorkflow: $(IMAGES_SCHEDULEDWORKFLOW)
   MlmdEnvoy: $(IMAGES_MLMDENVOY)
   MlmdGRPC: $(IMAGES_MLMDGRPC)

diff --git a/controllers/config/defaults.go b/controllers/config/defaults.go
@@ -90,7 +90,7 @@ const (
 const (
 	// Images
 	APIServerImagePath              = "Images.ApiServer"
-	PersistenceAgentImagePath       = "Images.PersistentAgent"
+	PersistenceAgentImagePath       = "Images.PersistenceAgent"
 	ScheduledWorkflowImagePath      = "Images.ScheduledWorkflow"
 	MlmdEnvoyImagePath              = "Images.MlmdEnvoy"
 	MlmdGRPCImagePath               = "Images.MlmdGRPC"

diff --git a/controllers/testdata/README.md b/controllers/testdata/README.md
@@ -83,7 +83,7 @@ Each case requires a configmap, we can add one like this:
 Images:
   ApiServer: api-server:test4
   Artifact: artifact-manager:test4
-  PersistentAgent: persistenceagent:test4
+  PersistenceAgent: persistenceagent:test4
   ScheduledWorkflow: scheduledworkflow:test4
   Cache: ubi-minimal:test4
   MoveResultsImage: busybox:test4

diff --git a/controllers/testdata/declarative/case_0/config.yaml b/controllers/testdata/declarative/case_0/config.yaml
@@ -1,7 +1,7 @@
 # When a minimal DSPA is deployed
 Images:
   ApiServer: api-server:test0
-  PersistentAgent: persistenceagent:test0
+  PersistenceAgent: persistenceagent:test0
   ScheduledWorkflow: scheduledworkflow:test0
   MlmdEnvoy: mlmdenvoy:test0
   MlmdGRPC: mlmdgrpc:test0

diff --git a/controllers/testdata/declarative/case_1/config.yaml b/controllers/testdata/declarative/case_1/config.yaml
@@ -1,6 +1,6 @@
 Images:
   ApiServer: api-server:test1
-  PersistentAgent: persistenceagent:test1
+  PersistenceAgent: persistenceagent:test1
   ScheduledWorkflow: scheduledworkflow:test1
   MlmdEnvoy: mlmdenvoy:test1
   MlmdGRPC: mlmdgrpc:test1

diff --git a/controllers/testdata/declarative/case_2/config.yaml b/controllers/testdata/declarative/case_2/config.yaml
@@ -1,6 +1,6 @@
 Images:
   ApiServer: api-server:test2
-  PersistentAgent: persistenceagent:test2
+  PersistenceAgent: persistenceagent:test2
   ScheduledWorkflow: scheduledworkflow:test2
   MlmdEnvoy: mlmdenvoy:test2
   MlmdGRPC: mlmdgrpc:test2

diff --git a/controllers/testdata/declarative/case_3/config.yaml b/controllers/testdata/declarative/case_3/config.yaml
@@ -1,6 +1,6 @@
 Images:
   ApiServer: api-server:test3
-  PersistentAgent: persistenceagent:test3
+  PersistenceAgent: persistenceagent:test3
   ScheduledWorkflow: scheduledworkflow:test3
   MlmdEnvoy: mlmdenvoy:test3
   MlmdGRPC: mlmdgrpc:test3

diff --git a/controllers/testdata/declarative/case_4/config.yaml b/controllers/testdata/declarative/case_4/config.yaml
@@ -1,6 +1,6 @@
 Images:
   ApiServer: api-server:test4
-  PersistentAgent: persistenceagent:test4
+  PersistenceAgent: persistenceagent:test4
   ScheduledWorkflow: scheduledworkflow:test4
   MlmdEnvoy: mlmdenvoy:test4
   MlmdGRPC: mlmdgrpc:test4

diff --git a/controllers/testdata/declarative/case_5/config.yaml b/controllers/testdata/declarative/case_5/config.yaml
@@ -1,6 +1,6 @@
 Images:
   ApiServer: api-server:test5
-  PersistentAgent: persistenceagent:test5
+  PersistenceAgent: persistenceagent:test5
   ScheduledWorkflow: scheduledworkflow:test5
   MlmdEnvoy: mlmdenvoy:test5
   MlmdGRPC: mlmdgrpc:test5

diff --git a/controllers/testdata/declarative/case_6/config.yaml b/controllers/testdata/declarative/case_6/config.yaml
@@ -1,6 +1,6 @@
 Images:
   ApiServer: api-server:test6
-  PersistentAgent: persistenceagent:test6
+  PersistenceAgent: persistenceagent:test6
   ScheduledWorkflow: scheduledworkflow:test6
   MlmdEnvoy: mlmdenvoy:test6
   MlmdGRPC: mlmdgrpc:test6

diff --git a/tests/dspa_v2_test.go b/tests/dspa_v2_test.go
@@ -59,7 +59,22 @@ func (suite *IntegrationTestSuite) TestDSPADeployment() {
 			}
 			err := suite.Clientmgr.k8sClient.List(suite.Ctx, podList, listOpts...)
 			require.NoError(t, err)
-			assert.Equal(t, podCount, len(podList.Items))
+			actualPodCount := len(podList.Items)
+			assert.Equal(t, podCount, actualPodCount)
+
+			// Print out pod statuses for troubleshooting
+			if podCount != actualPodCount {
+				t.Log(fmt.Sprintf("expected %d pods to successfully deploy, got %d instead. Pods in the namespace:", podCount, actualPodCount))
+				totalPodList := &corev1.PodList{}
+				listOpts1 := []client.ListOption{
+					client.InNamespace(suite.DSPANamespace),
+				}
+				err1 := suite.Clientmgr.k8sClient.List(suite.Ctx, totalPodList, listOpts1...)
+				require.NoError(t, err1)
+				for _, pod := range totalPodList.Items {
+					t.Log(fmt.Sprintf("Pod Name: %s, Status: %s", pod.Name, pod.Status.Phase))
+				}
+			}
 		})
 		for _, deployment := range deployments {
 			t.Run(fmt.Sprintf("should have a ready %s deployment", deployment), func(t *testing.T) {