Skip to content

OCPBUGS-74627: Fix infrastructure resource name filtering in watch predicate #985

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

Open
jstuever wants to merge 1 commit into
base: master
Choose a base branch
from
+214 −3
Open

OCPBUGS-74627: Fix infrastructure resource name filtering in watch predicate #985

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
8 changes: 5 additions & 3 deletions pkg/operator/credentialsrequest/credentialsrequest_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,16 +254,18 @@ func add(mgr, adminMgr manager.Manager, r reconcile.Reconciler) error {
return requests
})

// predicate functions to filter the events based on the AWS resourceTags presence.
// predicate functions to filter events for the "cluster" infrastructure resource based on AWS resourceTags presence.
// Only the infrastructure resource named "cluster" should be processed; other infrastructure resources like
// "cloud-provider-config" must be ignored to prevent incorrect behavior.
infraResourcePredicate := predicate.TypedFuncs[*configv1.Infrastructure]{
CreateFunc: func(e event.TypedCreateEvent[*configv1.Infrastructure]) bool {
return hasResourceTags(e.Object)
return e.Object.GetName() == "cluster" && hasResourceTags(e.Object)
},
DeleteFunc: func(e event.TypedDeleteEvent[*configv1.Infrastructure]) bool {
return false
},
UpdateFunc: func(e event.TypedUpdateEvent[*configv1.Infrastructure]) bool {
return areTagsUpdated(e.ObjectOld, e.ObjectNew)
return e.ObjectNew.GetName() == "cluster" && areTagsUpdated(e.ObjectOld, e.ObjectNew)
},
}
// Watch for the changes happening to Infrastructure Resource
Expand Down
209 changes: 209 additions & 0 deletions pkg/operator/credentialsrequest/credentialsrequest_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2074,3 +2074,212 @@ func testOperatorConfig(mode operatorv1.CloudCredentialsMode) *operatorv1.CloudC

return conf
}

func TestHasResourceTags(t *testing.T) {
tests := []struct {
name string
infra *configv1.Infrastructure
expected bool
}{
{
name: "infrastructure with resource tags",
infra: &configv1.Infrastructure{
ObjectMeta: metav1.ObjectMeta{
Name: "cluster",
},
Status: configv1.InfrastructureStatus{
PlatformStatus: &configv1.PlatformStatus{
Type: configv1.AWSPlatformType,
AWS: &configv1.AWSPlatformStatus{
ResourceTags: []configv1.AWSResourceTag{
{Key: "key1", Value: "value1"},
},
},
},
},
},
expected: true,
},
{
name: "infrastructure without resource tags",
infra: &configv1.Infrastructure{
ObjectMeta: metav1.ObjectMeta{
Name: "cluster",
},
Status: configv1.InfrastructureStatus{
PlatformStatus: &configv1.PlatformStatus{
Type: configv1.AWSPlatformType,
AWS: &configv1.AWSPlatformStatus{},
},
},
},
expected: false,
},
{
name: "infrastructure with nil status",
infra: &configv1.Infrastructure{
ObjectMeta: metav1.ObjectMeta{
Name: "cluster",
},
},
expected: false,
},
{
name: "nil infrastructure",
infra: nil,
expected: false,
},
}

for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
result := hasResourceTags(tt.infra)
assert.Equal(t, tt.expected, result)
})
}
}

func TestAreTagsUpdated(t *testing.T) {
tests := []struct {
name string
oldInfra *configv1.Infrastructure
newInfra *configv1.Infrastructure
expected bool
}{
{
name: "tags updated",
oldInfra: &configv1.Infrastructure{
ObjectMeta: metav1.ObjectMeta{
Name: "cluster",
},
Status: configv1.InfrastructureStatus{
PlatformStatus: &configv1.PlatformStatus{
Type: configv1.AWSPlatformType,
AWS: &configv1.AWSPlatformStatus{
ResourceTags: []configv1.AWSResourceTag{
{Key: "key1", Value: "value1"},
},
},
},
},
},
newInfra: &configv1.Infrastructure{
ObjectMeta: metav1.ObjectMeta{
Name: "cluster",
},
Status: configv1.InfrastructureStatus{
PlatformStatus: &configv1.PlatformStatus{
Type: configv1.AWSPlatformType,
AWS: &configv1.AWSPlatformStatus{
ResourceTags: []configv1.AWSResourceTag{
{Key: "key1", Value: "value2"},
},
},
},
},
},
expected: true,
},
{
name: "tags not updated",
oldInfra: &configv1.Infrastructure{
ObjectMeta: metav1.ObjectMeta{
Name: "cluster",
},
Status: configv1.InfrastructureStatus{
PlatformStatus: &configv1.PlatformStatus{
Type: configv1.AWSPlatformType,
AWS: &configv1.AWSPlatformStatus{
ResourceTags: []configv1.AWSResourceTag{
{Key: "key1", Value: "value1"},
},
},
},
},
},
newInfra: &configv1.Infrastructure{
ObjectMeta: metav1.ObjectMeta{
Name: "cluster",
},
Status: configv1.InfrastructureStatus{
PlatformStatus: &configv1.PlatformStatus{
Type: configv1.AWSPlatformType,
AWS: &configv1.AWSPlatformStatus{
ResourceTags: []configv1.AWSResourceTag{
{Key: "key1", Value: "value1"},
},
},
},
},
},
expected: false,
},
{
name: "new tags added",
oldInfra: &configv1.Infrastructure{
ObjectMeta: metav1.ObjectMeta{
Name: "cluster",
},
Status: configv1.InfrastructureStatus{
PlatformStatus: &configv1.PlatformStatus{
Type: configv1.AWSPlatformType,
AWS: &configv1.AWSPlatformStatus{},
},
},
},
newInfra: &configv1.Infrastructure{
ObjectMeta: metav1.ObjectMeta{
Name: "cluster",
},
Status: configv1.InfrastructureStatus{
PlatformStatus: &configv1.PlatformStatus{
Type: configv1.AWSPlatformType,
AWS: &configv1.AWSPlatformStatus{
ResourceTags: []configv1.AWSResourceTag{
{Key: "key1", Value: "value1"},
},
},
},
},
},
expected: true,
},
{
name: "new infra without tags",
oldInfra: &configv1.Infrastructure{
ObjectMeta: metav1.ObjectMeta{
Name: "cluster",
},
Status: configv1.InfrastructureStatus{
PlatformStatus: &configv1.PlatformStatus{
Type: configv1.AWSPlatformType,
AWS: &configv1.AWSPlatformStatus{
ResourceTags: []configv1.AWSResourceTag{
{Key: "key1", Value: "value1"},
},
},
},
},
},
newInfra: &configv1.Infrastructure{
ObjectMeta: metav1.ObjectMeta{
Name: "cluster",
},
Status: configv1.InfrastructureStatus{
PlatformStatus: &configv1.PlatformStatus{
Type: configv1.AWSPlatformType,
AWS: &configv1.AWSPlatformStatus{},
},
},
},
expected: false,
},
}

for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
result := areTagsUpdated(tt.oldInfra, tt.newInfra)
assert.Equal(t, tt.expected, result)
})
}
}