Skip to content

OCPBUGS-6701: Avoid spurious updates for scope in IngressClass #879

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Feb 1, 2023
Merged

OCPBUGS-6701: Avoid spurious updates for scope in IngressClass #879

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions pkg/operator/controller/ingressclass/ingressclass.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -88,6 +89,7 @@ func desiredIngressClass(haveIngressController bool, ingressControllerName strin
APIGroup: &operatorv1.GroupName,
Kind: "IngressController",
Name: ingressControllerName,
Scope: &scope,
},
},
}
Expand Down
2 changes: 2 additions & 0 deletions pkg/operator/controller/ingressclass/ingressclass_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -27,6 +28,7 @@ func TestDesiredIngressClass(t *testing.T) {
APIGroup: &apiGroup,
Kind: "IngressController",
Name: icName,
Scope: &scope,
},
},
}
Expand Down