From 739e3ed8f6143460e6733bda14172cf924235255 Mon Sep 17 00:00:00 2001
From: Miciah Masters <miciah.masters@gmail.com>
Date: Thu, 17 Nov 2022 17:49:35 -0500
Subject: [PATCH] OCPBUGS-6701: ingressclass: Avoid spurious updates for scope

Specify spec.parameters.scope on ingressclasses that the operator creates.

Before this commit, the update logic would try to revert the default value
that the API set for an ingressclass's scope field.

* pkg/operator/controller/ingressclass/ingressclass.go
(desiredIngressClass): Specify spec.parameters.scope with the default
value: "Cluster".
* pkg/operator/controller/ingressclass/ingressclass_test.go
(Test_desiredIngressClass): Update test to expect spec.parameters.scope
to be set.
---
 pkg/operator/controller/ingressclass/ingressclass.go      | 2 ++
 pkg/operator/controller/ingressclass/ingressclass_test.go | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/pkg/operator/controller/ingressclass/ingressclass.go b/pkg/operator/controller/ingressclass/ingressclass.go
index 6a3d74305..8af32f4a4 100644
--- a/pkg/operator/controller/ingressclass/ingressclass.go
+++ b/pkg/operator/controller/ingressclass/ingressclass.go
@@ -78,6 +78,7 @@ func desiredIngressClass(haveIngressController bool, ingressControllerName strin
 	}
 
 	name := controller.IngressClassName(ingressControllerName)
+	scope := networkingv1.IngressClassParametersReferenceScopeCluster
 	class := &networkingv1.IngressClass{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: name.Name,
@@ -88,6 +89,7 @@ func desiredIngressClass(haveIngressController bool, ingressControllerName strin
 				APIGroup: &operatorv1.GroupName,
 				Kind:     "IngressController",
 				Name:     ingressControllerName,
+				Scope:    &scope,
 			},
 		},
 	}
diff --git a/pkg/operator/controller/ingressclass/ingressclass_test.go b/pkg/operator/controller/ingressclass/ingressclass_test.go
index 4d5bbb79e..b1e232d26 100644
--- a/pkg/operator/controller/ingressclass/ingressclass_test.go
+++ b/pkg/operator/controller/ingressclass/ingressclass_test.go
@@ -14,6 +14,7 @@ import (
 // TestDesiredIngressClass verifies that desiredIngressClass behaves as
 // expected.
 func TestDesiredIngressClass(t *testing.T) {
+	scope := "Cluster"
 	makeIngressClass := func(icName string, annotateAsDefault bool) *networkingv1.IngressClass {
 		apiGroup := "operator.openshift.io"
 		name := "openshift-" + icName
@@ -27,6 +28,7 @@ func TestDesiredIngressClass(t *testing.T) {
 					APIGroup: &apiGroup,
 					Kind:     "IngressController",
 					Name:     icName,
+					Scope:    &scope,
 				},
 			},
 		}