Rename ResolutionSucceeded to InstallSucceeded

Signed-off-by: Varsha Prasad Narsing <[email protected]>

Author: varshaprasad96

api/v1alpha1/operator_types.go

@@ -33,7 +33,7 @@ const (
 	// TODO(user): add more Types, here and into init()
 	TypeReady = "Ready"
 
-	ReasonResolutionSucceeded    = "ResolutionSucceeded"
+	ReasonInstallationSucceeded  = "InstallSucceeded"
 	ReasonResolutionFailed       = "ResolutionFailed"
 	ReasonBundleLookupFailed     = "BundleLookupFailed"
 	ReasonBundleDeploymentFailed = "BundleDeploymentFailed"
@@ -46,7 +46,7 @@ func init() {
 	)
 	// TODO(user): add Reasons from above
 	operatorutil.ConditionReasons = append(operatorutil.ConditionReasons,
-		ReasonResolutionSucceeded,
+		ReasonInstallationSucceeded,
 		ReasonResolutionFailed,
 		ReasonBundleLookupFailed,
 		ReasonBundleDeploymentFailed,

config/samples/operators_v1alpha1_operator.yaml

@@ -10,4 +10,4 @@ metadata:
   name: operator-sample
 spec:
   # TODO(user): Add fields here
-  packageName: lightbend-console-operator
+  packageName: prometheus

controllers/operator_controller.go

@@ -168,7 +168,7 @@ func (r *OperatorReconciler) reconcile(ctx context.Context, op *operatorsv1alpha
 		apimeta.SetStatusCondition(&op.Status.Conditions, metav1.Condition{
 			Type:               operatorsv1alpha1.TypeReady,
 			Status:             metav1.ConditionUnknown,
-			Reason:             operatorsv1alpha1.ReasonResolutionSucceeded,
+			Reason:             operatorsv1alpha1.ReasonInstallationSucceeded,
 			Message:            err.Error(),
 			ObservedGeneration: op.GetGeneration(),
 		})
@@ -307,7 +307,7 @@ func verifyBDStatus(dep *rukpakv1alpha1.BundleDeployment) (metav1.ConditionStatu
 	}
 
 	if isInstalledCond != nil && isInstalledCond.Status == metav1.ConditionTrue {
-		return metav1.ConditionTrue, "resolution was successful"
+		return metav1.ConditionTrue, "install was successful"
 	}
 	return metav1.ConditionUnknown, fmt.Sprintf("waiting for rukpak to install bundleDeployment successfully %s", dep.Name)
 }
@@ -321,7 +321,7 @@ func mapBDStatusToReadyCondition(existingBD *rukpakv1alpha1.BundleDeployment, ob
 	status, message := verifyBDStatus(existingBD)
 	var reason string
 	if status == metav1.ConditionTrue || status == metav1.ConditionUnknown {
-		reason = operatorsv1alpha1.ReasonResolutionSucceeded
+		reason = operatorsv1alpha1.ReasonInstallationSucceeded
 	} else {
 		reason = operatorsv1alpha1.ReasonBundleDeploymentFailed
 	}

controllers/operator_controller_test.go

@@ -116,8 +116,8 @@ var _ = Describe("Reconcile Test", func() {
 						cond := apimeta.FindStatusCondition(operator.Status.Conditions, operatorsv1alpha1.TypeReady)
 						Expect(cond).NotTo(BeNil())
 						Expect(cond.Status).To(Equal(metav1.ConditionTrue))
-						Expect(cond.Reason).To(Equal(operatorsv1alpha1.ReasonResolutionSucceeded))
-						Expect(cond.Message).To(Equal("resolution was successful"))
+						Expect(cond.Reason).To(Equal(operatorsv1alpha1.ReasonInstallationSucceeded))
+						Expect(cond.Message).To(Equal("install was successful"))
 					})
 				})
 			})
@@ -181,8 +181,8 @@ var _ = Describe("Reconcile Test", func() {
 						cond := apimeta.FindStatusCondition(operator.Status.Conditions, operatorsv1alpha1.TypeReady)
 						Expect(cond).NotTo(BeNil())
 						Expect(cond.Status).To(Equal(metav1.ConditionTrue))
-						Expect(cond.Reason).To(Equal(operatorsv1alpha1.ReasonResolutionSucceeded))
-						Expect(cond.Message).To(Equal("resolution was successful"))
+						Expect(cond.Reason).To(Equal(operatorsv1alpha1.ReasonInstallationSucceeded))
+						Expect(cond.Message).To(Equal("install was successful"))
 					})
 				})
 			})
@@ -231,8 +231,8 @@ var _ = Describe("Reconcile Test", func() {
 						cond := apimeta.FindStatusCondition(operator.Status.Conditions, operatorsv1alpha1.TypeReady)
 						Expect(cond).NotTo(BeNil())
 						Expect(cond.Status).To(Equal(metav1.ConditionTrue))
-						Expect(cond.Reason).To(Equal(operatorsv1alpha1.ReasonResolutionSucceeded))
-						Expect(cond.Message).To(Equal("resolution was successful"))
+						Expect(cond.Reason).To(Equal(operatorsv1alpha1.ReasonInstallationSucceeded))
+						Expect(cond.Message).To(Equal("install was successful"))
 					})
 
 				})
@@ -353,7 +353,7 @@ var _ = Describe("Reconcile Test", func() {
 				cond := apimeta.FindStatusCondition(op.Status.Conditions, operatorsv1alpha1.TypeReady)
 				Expect(cond).NotTo(BeNil())
 				Expect(cond.Status).To(Equal(metav1.ConditionUnknown))
-				Expect(cond.Reason).To(Equal(operatorsv1alpha1.ReasonResolutionSucceeded))
+				Expect(cond.Reason).To(Equal(operatorsv1alpha1.ReasonInstallationSucceeded))
 				Expect(cond.Message).To(ContainSubstring(`waiting for bundleDeployment`))
 			})
 
@@ -452,8 +452,8 @@ var _ = Describe("Reconcile Test", func() {
 				cond := apimeta.FindStatusCondition(op.Status.Conditions, operatorsv1alpha1.TypeReady)
 				Expect(cond).NotTo(BeNil())
 				Expect(cond.Status).To(Equal(metav1.ConditionTrue))
-				Expect(cond.Reason).To(Equal(operatorsv1alpha1.ReasonResolutionSucceeded))
-				Expect(cond.Message).To(ContainSubstring(`resolution was successful`))
+				Expect(cond.Reason).To(Equal(operatorsv1alpha1.ReasonInstallationSucceeded))
+				Expect(cond.Message).To(ContainSubstring(`install was successful`))
 			})
 
 			It("verify any other unknown status of bundledeployment", func() {
@@ -492,7 +492,7 @@ var _ = Describe("Reconcile Test", func() {
 				cond := apimeta.FindStatusCondition(op.Status.Conditions, operatorsv1alpha1.TypeReady)
 				Expect(cond).NotTo(BeNil())
 				Expect(cond.Status).To(Equal(metav1.ConditionUnknown))
-				Expect(cond.Reason).To(Equal(operatorsv1alpha1.ReasonResolutionSucceeded))
+				Expect(cond.Reason).To(Equal(operatorsv1alpha1.ReasonInstallationSucceeded))
 				Expect(cond.Message).To(ContainSubstring(`waiting for rukpak to install bundleDeployment successfully`))
 			})
 
@@ -525,7 +525,7 @@ var _ = Describe("Reconcile Test", func() {
 				cond := apimeta.FindStatusCondition(op.Status.Conditions, operatorsv1alpha1.TypeReady)
 				Expect(cond).NotTo(BeNil())
 				Expect(cond.Status).To(Equal(metav1.ConditionUnknown))
-				Expect(cond.Reason).To(Equal(operatorsv1alpha1.ReasonResolutionSucceeded))
+				Expect(cond.Reason).To(Equal(operatorsv1alpha1.ReasonInstallationSucceeded))
 				Expect(cond.Message).To(ContainSubstring(`waiting for rukpak to install bundleDeployment successfully`))
 			})
 		})

test/e2e/install_test.go

@@ -51,7 +51,7 @@ var _ = Describe("Operator Install", func() {
 			err = c.Get(ctx, types.NamespacedName{Name: operator.Name}, operator)
 			g.Expect(err).ToNot(HaveOccurred())
 			g.Expect(len(operator.Status.Conditions)).To(Equal(1))
-			g.Expect(operator.Status.Conditions[0].Message).To(Equal("resolution was successful"))
+			g.Expect(operator.Status.Conditions[0].Message).To(Equal("install was successful"))
 		}).WithTimeout(defaultTimeout).WithPolling(defaultPoll).Should(Succeed())
 
 		By("eventually installing the package successfully")