Merge pull request #1942 from awgreene/operatorcondition-controller-watch-deps

Bug 1910160: Update OperatorCondition controller to watch deps

Author: openshift-merge-robot

pkg/controller/operators/operatorcondition_controller.go

@@ -38,6 +38,7 @@ type OperatorConditionReconciler struct {
 
 // SetupWithManager adds the OperatorCondition Reconciler reconciler to the given controller manager.
 func (r *OperatorConditionReconciler) SetupWithManager(mgr ctrl.Manager) error {
+	deploymentHandler := handler.EnqueueRequestsFromMapFunc(r.mapToOperatorCondition)
 	handler := &handler.EnqueueRequestForOwner{
 		IsController: true,
 		OwnerType:    &operatorsv1.OperatorCondition{},
@@ -47,9 +48,30 @@ func (r *OperatorConditionReconciler) SetupWithManager(mgr ctrl.Manager) error {
 		For(&operatorsv1.OperatorCondition{}).
 		Watches(&source.Kind{Type: &rbacv1.Role{}}, handler).
 		Watches(&source.Kind{Type: &rbacv1.RoleBinding{}}, handler).
+		Watches(&source.Kind{Type: &appsv1.Deployment{}}, deploymentHandler).
 		Complete(r)
 }
 
+func (r *OperatorConditionReconciler) mapToOperatorCondition(obj client.Object) (requests []reconcile.Request) {
+	if obj == nil {
+		return nil
+	}
+
+	owner := ownerutil.GetOwnerByKind(obj, operatorsv1alpha1.ClusterServiceVersionKind)
+	if owner == nil {
+		return nil
+	}
+
+	return []reconcile.Request{
+		{
+			NamespacedName: types.NamespacedName{
+				Name:      owner.Name,
+				Namespace: obj.GetNamespace(),
+			},
+		},
+	}
+}
+
 // NewOperatorConditionReconciler constructs and returns an OperatorConditionReconciler.
 // As a side effect, the given scheme has operator discovery types added to it.
 func NewOperatorConditionReconciler(cli client.Client, log logr.Logger, scheme *runtime.Scheme) (*OperatorConditionReconciler, error) {

pkg/controller/operators/operatorcondition_controller_test.go

@@ -287,7 +287,7 @@ var _ = Describe("OperatorCondition", func() {
 					Expect(k8sClient.Create(ctx, operatorCondition)).To(Succeed())
 				})
 
-				It("injects the OperatorCondition name into the deployment's Environment Variables", func() {
+				It("should always inject the OperatorCondition Environment Variable into containers defined in the deployment", func() {
 					deployment := &appsv1.Deployment{}
 					Eventually(func() error {
 						err := k8sClient.Get(ctx, types.NamespacedName{Name: operatorCondition.Spec.Deployments[0], Namespace: namespace.GetName()}, deployment)
@@ -313,6 +313,42 @@ var _ = Describe("OperatorCondition", func() {
 							Value: operatorCondition.GetName(),
 						}))
 					}
+
+					// Remove the container's Environment Variables defined in the deployment
+					Eventually(func() error {
+						err := k8sClient.Get(ctx, types.NamespacedName{Name: operatorCondition.Spec.Deployments[0], Namespace: namespace.GetName()}, deployment)
+						if err != nil {
+							return err
+						}
+						deployment.Spec.Template.Spec.Containers[0].Env = nil
+						return k8sClient.Update(ctx, deployment)
+					}, timeout, interval).Should(BeNil())
+
+					// Ensure that the OPERATOR_CONDITION_NAME Environment Variable is recreated
+					Eventually(func() error {
+						err := k8sClient.Get(ctx, types.NamespacedName{Name: operatorCondition.Spec.Deployments[0], Namespace: namespace.GetName()}, deployment)
+						if err != nil {
+							return err
+						}
+						if len(deployment.Spec.Template.Spec.Containers) != 1 {
+							return fmt.Errorf("Deployment should contain a single container")
+						}
+						for _, container := range deployment.Spec.Template.Spec.Containers {
+							if len(container.Env) == 0 {
+								return fmt.Errorf("env vars should exist")
+							}
+						}
+						return nil
+					}, timeout, interval).Should(BeNil())
+
+					Expect(len(deployment.Spec.Template.Spec.Containers)).Should(Equal(1))
+					for _, container := range deployment.Spec.Template.Spec.Containers {
+						Expect(len(container.Env)).Should(Equal(1))
+						Expect(container.Env).Should(ContainElement(corev1.EnvVar{
+							Name:  "OPERATOR_CONDITION_NAME",
+							Value: operatorCondition.GetName(),
+						}))
+					}
 				})
 			})
 		})