UPSTREAM: <carry>: OCPBUGS-66965 rollout stall for webhook installs

Author: bandrade

internal/operator-controller/applier/phase.go

@@ -120,10 +120,10 @@ var (
 		PhaseInfrastructure: {
 			{Kind: "Service"},
 			{Kind: "Issuer", Group: "cert-manager.io"},
+			{Kind: "Certificate", Group: "cert-manager.io"},
 		},
 
 		PhaseDeploy: {
-			{Kind: "Certificate", Group: "cert-manager.io"},
 			{Kind: "Deployment", Group: "apps"},
 		},
 

internal/operator-controller/applier/phase_test.go

@@ -165,6 +165,17 @@ func Test_PhaseSort(t *testing.T) {
 						},
 					},
 				},
+				{
+					Object: &unstructured.Unstructured{
+						Object: map[string]interface{}{
+							"apiVersion": "cert-manager.io/v1",
+							"kind":       "Certificate",
+							"metadata": map[string]interface{}{
+								"name": "test",
+							},
+						},
+					},
+				},
 				{
 					Object: &unstructured.Unstructured{
 						Object: map[string]interface{}{
@@ -314,6 +325,17 @@ func Test_PhaseSort(t *testing.T) {
 								},
 							},
 						},
+						{
+							Object: &unstructured.Unstructured{
+								Object: map[string]interface{}{
+									"apiVersion": "cert-manager.io/v1",
+									"kind":       "Certificate",
+									"metadata": map[string]interface{}{
+										"name": "test",
+									},
+								},
+							},
+						},
 					},
 				},
 				{
@@ -454,7 +476,7 @@ func Test_PhaseSort(t *testing.T) {
 			want: []*ocv1ac.ClusterExtensionRevisionPhaseApplyConfiguration{},
 		},
 		{
-			name: "sort by group within same phase",
+			name: "sort by group across infrastructure and deploy phases",
 			objs: []ocv1ac.ClusterExtensionRevisionObjectApplyConfiguration{
 				{
 					Object: &unstructured.Unstructured{
@@ -481,24 +503,29 @@ func Test_PhaseSort(t *testing.T) {
 			},
 			want: []*ocv1ac.ClusterExtensionRevisionPhaseApplyConfiguration{
 				{
-					Name: ptr.To(string(applier.PhaseDeploy)),
+					Name: ptr.To(string(applier.PhaseInfrastructure)),
 					Objects: []ocv1ac.ClusterExtensionRevisionObjectApplyConfiguration{
 						{
 							Object: &unstructured.Unstructured{
 								Object: map[string]interface{}{
-									"apiVersion": "apps/v1",
-									"kind":       "Deployment",
+									"apiVersion": "cert-manager.io/v1",
+									"kind":       "Certificate",
 									"metadata": map[string]interface{}{
 										"name": "test",
 									},
 								},
 							},
 						},
+					},
+				},
+				{
+					Name: ptr.To(string(applier.PhaseDeploy)),
+					Objects: []ocv1ac.ClusterExtensionRevisionObjectApplyConfiguration{
 						{
 							Object: &unstructured.Unstructured{
 								Object: map[string]interface{}{
-									"apiVersion": "cert-manager.io/v1",
-									"kind":       "Certificate",
+									"apiVersion": "apps/v1",
+									"kind":       "Deployment",
 									"metadata": map[string]interface{}{
 										"name": "test",
 									},